Skip to content

Commit

Permalink
Fix the conda build (#783)
Browse files Browse the repository at this point in the history
the conda-build specific fixes from #764

Authors:
  - Christopher Harris (https://github.com/cwharris)

Approvers:
  - Michael Demoret (https://github.com/mdemoret-nv)
  - David Gardner (https://github.com/dagardner-nv)

URL: #783
  • Loading branch information
cwharris authored Mar 21, 2023
1 parent 5b8f7b8 commit 241c926
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions ci/conda/recipes/morpheus/morpheus_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ CMAKE_ARGS="-DMORPHEUS_PYTHON_BUILD_WHEEL=ON ${CMAKE_ARGS}"
CMAKE_ARGS="-DCMAKE_BUILD_RPATH_USE_ORIGIN=ON ${CMAKE_ARGS}"
CMAKE_ARGS="-DCMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES=-"all"} ${CMAKE_ARGS}"
CMAKE_ARGS="-DPython_EXECUTABLE=${PYTHON} ${CMAKE_ARGS}"
CMAKE_ARGS="-DPYTHON_EXECUTABLE=${PYTHON} ${CMAKE_ARGS}" # for pybind11

if [[ "${USE_SCCACHE}" == "1" ]]; then
CMAKE_ARGS="-DCCACHE_PROGRAM_PATH=$(which sccache) ${CMAKE_ARGS}"
Expand Down
1 change: 1 addition & 0 deletions ci/conda/recipes/run_conda_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8}")
# And default channels (with optional channel alias)
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}rapidsai")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia/label/cuda-11.8.0")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia/label/dev")
CONDA_ARGS_ARRAY+=("-c" "conda-forge")

Expand Down
6 changes: 4 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ RUN apt-get update &&\
apt-get install --no-install-recommends -y \
bc \
build-essential \
cuda-gdb-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
cuda-compiler-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
cuda-cudart-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
cuda-cupti-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
cuda-gdb-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
curl \
git-lfs \
jq \
Expand Down Expand Up @@ -142,6 +143,7 @@ ARG CUDA_MINOR_VER
RUN apt update && \
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
apt install --no-install-recommends -y \
cuda-compiler-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
cuda-cudart-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
cuda-cupti-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
cuda-nvml-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
Expand Down Expand Up @@ -178,7 +180,7 @@ RUN --mount=type=bind,from=conda_bld_morpheus,source=/opt/conda/conda-bld,target
--mount=type=cache,id=conda_pkgs,target=/opt/conda/pkgs,sharing=locked \
source activate morpheus &&\
# Install morpheus
CONDA_ALWAYS_YES=true /opt/conda/bin/mamba install -n morpheus -c local -c rapidsai -c nvidia -c nvidia/label/dev -c conda-forge morpheus &&\
CONDA_ALWAYS_YES=true /opt/conda/bin/mamba install -n morpheus -c local -c rapidsai -c nvidia -c nvidia/label/cuda-11.8.0 -c nvidia/label/dev -c conda-forge morpheus &&\
# Install runtime dependencies that are pip-only
/opt/conda/bin/mamba env update -n morpheus --file docker/conda/environments/cuda${CUDA_MAJOR_VER}.${CUDA_MINOR_VER}_runtime.yml &&\
# Clean and activate
Expand Down
1 change: 1 addition & 0 deletions docker/conda/environments/cuda11.8_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ name: morpheus
channels:
- rapidsai
- nvidia
- nvidia/label/cuda-11.8.0
- nvidia/label/dev # For pre-releases of MRC. Should still default to full releases if available
- conda-forge
dependencies:
Expand Down

0 comments on commit 241c926

Please sign in to comment.