Skip to content

Commit

Permalink
Remove defaults specification; debug: add -vv to conda
Browse files Browse the repository at this point in the history
Signed-off-by: Will Killian <wkillian@nvidia.com>
  • Loading branch information
willkill07 committed Feb 28, 2025
1 parent 1a05ee6 commit 8fe9db0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ci/conda/recipes/morpheus-libs/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ outputs:
- rapidjson 1.1.0
- scikit-build 0.17.6
- versioneer-518
- zlib 1.3.1 # required to build triton client
- zlib >=1.3.1,<2 # required to build triton client
run:
# Runtime only requirements. This + setup.py is the definitive runtime requirement list
# This should be synced with `runtime` in dependencies.yaml
Expand Down Expand Up @@ -222,7 +222,7 @@ outputs:
- rapidjson 1.1.0
- scikit-build 0.17.6
- versioneer-518
- zlib 1.3.1 # required to build triton client
- zlib >=1.3.1,<2 # required to build triton client
run:
- {{ pin_subpackage('morpheus-core', exact=True) }}

Expand Down
2 changes: 1 addition & 1 deletion ci/conda/recipes/morpheus/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ outputs:
- rdma-core >=48 # Needed for DOCA.
- scikit-build 0.17.6
- versioneer-518
- zlib 1.3.1 # required to build triton client
- zlib >=1.3.1,<2 # required to build triton client
run:
# Runtime only requirements. This + setup.py is the definitive runtime requirement list
# This should be synced with `runtime` in dependencies.yaml
Expand Down
2 changes: 1 addition & 1 deletion ci/conda/recipes/run_conda_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}rapi
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia/label/dev")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}pytorch")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}defaults")
CONDA_ARGS_ARRAY+=("-vv")

if [[ ${NUMARGS} == 0 ]]; then
echo -e "${r}ERROR: No arguments were provided. Please provide at least one package to build. Available packages:${x}"
Expand Down
2 changes: 0 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ RUN --mount=type=cache,id=workspace_cache,target=/workspace/.cache,sharing=locke
-c nvidia \
-c nvidia/label/dev \
-c pytorch \
-c defaults \
morpheus && \
# Change to the morpheus directory and build the docs
cd ${MORPHEUS_ROOT_HOST} &&\
Expand Down Expand Up @@ -338,7 +337,6 @@ RUN --mount=type=bind,from=conda_bld_morpheus,source=/opt/conda/conda-bld,target
-c nvidia \
-c nvidia/label/dev \
-c pytorch \
-c defaults \
morpheus && \
/opt/conda/bin/conda env update --solver=libmamba -n morpheus --file \
conda/environments/runtime_cuda-${CUDA_MAJOR_VER}${CUDA_MINOR_VER}_arch-${REAL_ARCH}.yaml
Expand Down

0 comments on commit 8fe9db0

Please sign in to comment.