diff --git a/ci/conda/recipes/morpheus/meta.yaml b/ci/conda/recipes/morpheus/meta.yaml index ebd0aae4b0..34d8101e45 100644 --- a/ci/conda/recipes/morpheus/meta.yaml +++ b/ci/conda/recipes/morpheus/meta.yaml @@ -61,7 +61,7 @@ outputs: - cudf {{ rapids_version }} - cython >=0.29,<0.30 - libcudf {{ rapids_version }} - - librdkafka 1.7 + - librdkafka 1.9.2 - mrc {{ minor_version }} - pip - pyarrow * *_cuda # Ensure we get a CUDA build. Version determined by cuDF @@ -92,6 +92,7 @@ outputs: - pluggy 1.0.* - pyarrow * *_cuda # Ensure we get a CUDA build. Version determined by cuDF - python + - python-confluent-kafka 1.9.2 - pytorch 2.0.1 - pytorch-cuda - scikit-learn 1.2.2.* diff --git a/ci/conda/recipes/morpheus/morpheus_build.sh b/ci/conda/recipes/morpheus/morpheus_build.sh index 43b9d41b89..f45aa3cc1b 100644 --- a/ci/conda/recipes/morpheus/morpheus_build.sh +++ b/ci/conda/recipes/morpheus/morpheus_build.sh @@ -42,7 +42,7 @@ CMAKE_ARGS="-DMORPHEUS_PYTHON_BUILD_STUBS=${MORPHEUS_PYTHON_BUILD_STUBS=-"ON"} $ CMAKE_ARGS="-DMORPHEUS_PYTHON_INPLACE_BUILD=ON ${CMAKE_ARGS}" 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="-DCMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES=-"RAPIDS"} ${CMAKE_ARGS}" CMAKE_ARGS="-DPython_EXECUTABLE=${PYTHON} ${CMAKE_ARGS}" CMAKE_ARGS="-DPYTHON_EXECUTABLE=${PYTHON} ${CMAKE_ARGS}" # for pybind11 diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh index 4aa428cbe5..8e3c12b7c2 100755 --- a/ci/conda/recipes/run_conda_build.sh +++ b/ci/conda/recipes/run_conda_build.sh @@ -44,7 +44,7 @@ export CONDA_COMMAND=${CONDA_COMMAND:-"mambabuild"} export MORPHEUS_ROOT=${MORPHEUS_ROOT:-$(git rev-parse --show-toplevel)} # Export script_env variables that must be set for conda build -export CMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES:-"ALL"} +export CMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES:-"RAPIDS"} export MORPHEUS_PYTHON_BUILD_STUBS=${MORPHEUS_PYTHON_BUILD_STUBS:-"ON"} export MORPHEUS_CACHE_DIR=${MORPHEUS_CACHE_DIR:-"${MORPHEUS_ROOT}/.cache"} export PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)} diff --git a/docker/conda/environments/cuda11.8_dev.yml b/docker/conda/environments/cuda11.8_dev.yml index df9594e29f..d5145c3411 100644 --- a/docker/conda/environments/cuda11.8_dev.yml +++ b/docker/conda/environments/cuda11.8_dev.yml @@ -59,7 +59,7 @@ dependencies: - gxx_linux-64=11.2 - include-what-you-use=0.18 - isort - - librdkafka=1.7.0 + - librdkafka=1.9.2 - mlflow>=2.2.1,<3 - mrc=23.07 - myst-parser==1.0.0 @@ -80,7 +80,7 @@ dependencies: - pytest - pytest-benchmark>=4.0 - pytest-cov - - python-confluent-kafka=1.7.0 + - python-confluent-kafka=1.9.2 - python-graphviz - python=3.10 - pytorch=2.0.1