Branch 24.06 RAPIDS 24.06

.github/workflows/pr.yaml

@@ -49,7 +49,7 @@ jobs:
       - checks
       - ci_pipe
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10
 
   prepare:
     # Executes the get-pr-info action to determine if the PR has the skip-ci label, if the action fails we assume the
@@ -61,7 +61,7 @@ jobs:
     steps:
       - name: Get PR Info
         id: get-pr-info
-        uses: rapidsai/shared-action-workflows/get-pr-info@branch-23.08
+        uses: nv-gha-runners/get-pr-info@main
         if: ${{ startsWith(github.ref_name, 'pull-request/') }}
     outputs:
       is_pr: ${{ startsWith(github.ref_name, 'pull-request/') }}
@@ -76,7 +76,7 @@ jobs:
     # Only run the CI pipeline if the PR does not have the skip-ci label and we are on a PR branch
     if: ${{ !fromJSON(needs.prepare.outputs.has_skip_ci_label) && fromJSON(needs.prepare.outputs.is_pr )}}
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10
     with:
       enable_check_generated_files: false
 

CMakeLists.txt

@@ -36,7 +36,7 @@ option(MORPHEUS_USE_IWYU "Enable running include-what-you-use as part of the bui
 
 set(MORPHEUS_PY_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/wheel" CACHE STRING "Location to install the python directory")
 
-set(MORPHEUS_RAPIDS_VERSION "24.02" CACHE STRING "Sets default versions for RAPIDS libraries.")
+set(MORPHEUS_RAPIDS_VERSION "24.06" CACHE STRING "Sets default versions for RAPIDS libraries.")
 set(MORPHEUS_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data")
 mark_as_advanced(MORPHEUS_CACHE_DIR)
 

ci/conda/recipes/morpheus/conda_build_config.yaml

@@ -14,19 +14,19 @@
 # limitations under the License.
 
 c_compiler_version:
-  - 11.2
+  - 12.1
 
 cxx_compiler_version:
-  - 11.2
+  - 12.1
 
 cuda_compiler:
   - cuda-nvcc
 
 cuda_compiler_version:
-  - 12.1
+  - 12.5
 
 python:
   - 3.10
 
 rapids_version:
-  - 24.02
+  - 24.06

ci/conda/recipes/morpheus/meta.yaml

@@ -56,7 +56,7 @@ outputs:
         - libtool # Needed for DOCA build
         - ninja =1.11
         - pkg-config =0.29 # for mrc cmake
-        - sysroot_linux-64 =2.17
+        - sysroot_linux-64 =2.28
       host:
         # CUDA dependencies
         - cuda-cudart-dev {{ cuda_compiler_version }}.*
@@ -68,7 +68,7 @@ outputs:
         # Non-CUDA dependencies
         - cudf {{ rapids_version }}
         - cython 3.0.*
-        - glog 0.6.*
+        - glog >=0.7.1,<8
         - libcudf {{ rapids_version }}
         - librdkafka >=1.9.2,<1.10.0a0
         - mrc {{ minor_version }}
@@ -101,7 +101,6 @@ outputs:
         - mrc
         - networkx=2.8.8
         - numpydoc =1.5.*
-        - nvtabular =23.08.00
         - pydantic
         - pluggy =1.3.*
         - python

ci/runner/Dockerfile

@@ -16,8 +16,8 @@
 # Args used in FROM commands must come first
 ARG FROM_IMAGE="rapidsai/ci-conda"
 ARG CUDA_PKG_VER=12-0
-ARG CUDA_SHORT_VER=12.1
-ARG CUDA_VER=12.1.1
+ARG CUDA_SHORT_VER=12.5
+ARG CUDA_VER=12.5.1
 ARG LINUX_DISTRO=ubuntu
 ARG LINUX_VER=22.04
 ARG PROJ_NAME=morpheus

cmake/dependencies.cmake

@@ -43,12 +43,8 @@ if(MORPHEUS_BUILD_BENCHMARKS)
   # google benchmark
   # - Expects package to pre-exist in the build environment
   # ================
-  rapids_find_package(benchmark REQUIRED
-    GLOBAL_TARGETS benchmark::benchmark
-    BUILD_EXPORT_SET ${PROJECT_NAME}-core-exports
-    INSTALL_EXPORT_SET ${PROJECT_NAME}-core-exports
-    FIND_ARGS CONFIG
-  )
+  include(${rapids-cmake-dir}/cpm/gbench.cmake)
+  rapids_cpm_gbench(BUILD_STATIC)
 endif()
 
 # glog
@@ -59,12 +55,8 @@ if(MORPHEUS_BUILD_TESTS)
   # google test
   # - Expects package to pre-exist in the build environment
   # ===========
-  rapids_find_package(GTest REQUIRED
-    GLOBAL_TARGETS GTest::gtest GTest::gmock GTest::gtest_main GTest::gmock_main
-    BUILD_EXPORT_SET ${PROJECT_NAME}-core-exports
-    INSTALL_EXPORT_SET ${PROJECT_NAME}-core-exports
-    FIND_ARGS CONFIG
-  )
+  include(${rapids-cmake-dir}/cpm/gtest.cmake)
+  rapids_cpm_gtest(BUILD_STATIC)
 endif()
 
 # cccl -- get an explicit cccl build, matx tries to pull a tag that doesn't exist.

conda/environments/all_cuda-121_arch-x86_64.yaml → conda/environments/all_cuda-125_arch-x86_64.yaml

@@ -21,18 +21,18 @@ dependencies:
 - clangdev=16
 - click>=8
 - cmake=3.27
-- cuda-cudart-dev=12.1
-- cuda-cudart=12.1
-- cuda-nvcc=12.1
-- cuda-nvml-dev=12.1
-- cuda-nvrtc-dev=12.1
-- cuda-nvrtc=12.1
-- cuda-nvtx-dev=12.1
-- cuda-nvtx=12.1
-- cuda-tools=12.1
-- cuda-version=12.1
-- cudf=24.02
-- cuml=24.02.*
+- cuda-cudart-dev=12.5
+- cuda-cudart=12.5
+- cuda-nvcc=12.5
+- cuda-nvml-dev=12.5
+- cuda-nvrtc-dev=12.5
+- cuda-nvrtc=12.5
+- cuda-nvtx-dev=12.5
+- cuda-nvtx=12.5
+- cuda-sanitizer-api
+- cuda-version=12.5
+- cudf=24.06
+- cuml=24.06
 - cupy
 - cxx-compiler
 - cython=3.0
@@ -44,23 +44,25 @@ dependencies:
 - exhale=0.3.6
 - feedparser=6.0
 - flake8
-- gcc_linux-64=11.2
 - git-lfs
-- glog=0.6
-- grpcio-status=1.59
-- grpcio=1.59
-- gxx_linux-64=11.2
+- glog>=0.7.1,<0.8
+- grpcio
+- grpcio-status
+- gtest=1.14
+- gxx=12.1
 - huggingface_hub=0.20.2
 - include-what-you-use=0.20
 - ipython
 - isort
 - jsonpatch>=1.33
 - kfp
-- libcudf=24.02
+- libcudf=24.06
+- libcufft-dev
 - librdkafka>=1.9.2,<1.10.0a0
 - libtool
 - libwebp=1.3.2
-- mlflow>=2.10.0,<3
+- libzlib >=1.3.1,<2
+- mlflow
 - mrc=24.06
 - myst-parser=0.18.1
 - nbsphinx
@@ -71,7 +73,6 @@ dependencies:
 - nodejs=18.*
 - numexpr
 - numpydoc=1.5
-- nvtabular=23.08.00
 - onnx=1.15
 - openai=1.13
 - papermill=2.4.0
@@ -92,22 +93,20 @@ dependencies:
 - python-docx==1.1.0
 - python-graphviz
 - python=3.10
-- pytorch-cuda
-- pytorch=*=*cuda*
 - rapidjson=1.1.0
-- rapids-dask-dependency=24.02
+- rapids-dask-dependency=24.06
 - rdma-core>=48
 - requests
 - requests-cache=1.1
 - requests-toolbelt=1.0
-- s3fs=2023.12.2
+- s3fs
 - scikit-build=0.17.6
 - scikit-learn=1.3.2
 - sentence-transformers=2.7
 - sphinx
 - sphinx_rtd_theme
 - sqlalchemy<2.0
-- sysroot_linux-64=2.17
+- sysroot_linux-64>=2.28
 - tqdm=4
 - transformers=4.36.2
 - tritonclient=2.34
@@ -117,20 +116,21 @@ dependencies:
 - watchdog=3.0
 - websockets
 - yapf=0.40.1
-- zlib=1.2.13
 - pip:
+  - --extra-index-url https://download.pytorch.org/whl/cu124
   - --find-links https://data.dgl.ai/wheels-test/repo.html
   - --find-links https://data.dgl.ai/wheels/cu121/repo.html
   - databricks-cli < 0.100
   - databricks-connect
   - dgl==2.0.0
   - dglgo
-  - faiss-gpu==1.7.*
+  - faiss-cpu
   - google-search-results==2.4
   - langchain-nvidia-ai-endpoints==0.0.11
   - langchain==0.1.16
   - milvus==2.3.5
   - nemollm==0.3.5
   - pymilvus==2.3.6
   - pytest-kafka==0.6.0
-name: all_cuda-121_arch-x86_64
+  - torch==2.4.0+cu124
+name: all_cuda-125_arch-x86_64

conda/environments/dev_cuda-121_arch-x86_64.yaml → conda/environments/dev_cuda-125_arch-x86_64.yaml

@@ -18,14 +18,14 @@ dependencies:
 - clangdev=16
 - click>=8
 - cmake=3.27
-- cuda-cudart-dev=12.1
-- cuda-nvcc=12.1
-- cuda-nvml-dev=12.1
-- cuda-nvrtc-dev=12.1
-- cuda-nvtx-dev=12.1
-- cuda-tools=12.1
-- cuda-version=12.1
-- cudf=24.02
+- cuda-cudart-dev=12.5
+- cuda-nvcc=12.5
+- cuda-nvml-dev=12.5
+- cuda-nvrtc-dev=12.5
+- cuda-nvtx-dev=12.5
+- cuda-sanitizer-api
+- cuda-version=12.5
+- cudf=24.06
 - cupy
 - cxx-compiler
 - cython=3.0
@@ -37,20 +37,22 @@ dependencies:
 - exhale=0.3.6
 - feedparser=6.0
 - flake8
-- gcc_linux-64=11.2
 - git-lfs
-- glog=0.6
-- grpcio-status=1.59
-- grpcio=1.59
-- gxx_linux-64=11.2
+- glog>=0.7.1,<0.8
+- grpcio
+- grpcio-status
+- gtest=1.14
+- gxx=12.1
 - include-what-you-use=0.20
 - ipython
 - isort
-- libcudf=24.02
+- libcudf=24.06
+- libcufft-dev
 - librdkafka>=1.9.2,<1.10.0a0
 - libtool
 - libwebp=1.3.2
-- mlflow>=2.10.0,<3
+- libzlib >=1.3.1,<2
+- mlflow
 - mrc=24.06
 - myst-parser=0.18.1
 - nbsphinx
@@ -59,7 +61,6 @@ dependencies:
 - nlohmann_json=3.11
 - nodejs=18.*
 - numpydoc=1.5
-- nvtabular=23.08.00
 - pip
 - pkg-config=0.29
 - pluggy=1.3
@@ -76,10 +77,8 @@ dependencies:
 - python-docx==1.1.0
 - python-graphviz
 - python=3.10
-- pytorch-cuda
-- pytorch=*=*cuda*
 - rapidjson=1.1.0
-- rapids-dask-dependency=24.02
+- rapids-dask-dependency=24.06
 - rdma-core>=48
 - requests
 - requests-cache=1.1
@@ -88,7 +87,7 @@ dependencies:
 - sphinx
 - sphinx_rtd_theme
 - sqlalchemy<2.0
-- sysroot_linux-64=2.17
+- sysroot_linux-64>=2.28
 - tqdm=4
 - tritonclient=2.34
 - typing_utils=0.1
@@ -97,11 +96,12 @@ dependencies:
 - watchdog=3.0
 - websockets
 - yapf=0.40.1
-- zlib=1.2.13
 - pip:
+  - --extra-index-url https://download.pytorch.org/whl/cu124
   - databricks-cli < 0.100
   - databricks-connect
   - milvus==2.3.5
   - pymilvus==2.3.6
   - pytest-kafka==0.6.0
-name: dev_cuda-121_arch-x86_64
+  - torch==2.4.0+cu124
+name: dev_cuda-125_arch-x86_64