rapids 24.06

nv-morpheus · Aug 15, 2024 · 116317e · 116317e
1 parent 28dabd6
commit 116317e
Show file tree

Hide file tree

Showing 12 changed files with 134 additions and 96 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -68,7 +68,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.06
     with:
       enable_check_generated_files: false
 
@@ -100,4 +100,4 @@ 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.06
diff --git a/CMakeLists.txt b/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)
 

diff --git a/ci/conda/recipes/morpheus/conda_build_config.yaml b/ci/conda/recipes/morpheus/conda_build_config.yaml
@@ -29,4 +29,4 @@ python:
   - 3.10
 
 rapids_version:
-  - 24.02
+  - 24.06
diff --git a/...nvironments/all_cuda-124_arch-x86_64.yaml → ...nvironments/all_cuda-125_arch-x86_64.yaml b/...nvironments/all_cuda-124_arch-x86_64.yaml → ...nvironments/all_cuda-125_arch-x86_64.yaml
@@ -21,18 +21,18 @@ dependencies:
 - clangdev=16
 - click>=8
 - cmake=3.27
-- cuda-cudart-dev=12.4
-- cuda-cudart=12.4
-- cuda-nvcc=12.4
-- cuda-nvml-dev=12.4
-- cuda-nvrtc-dev=12.4
-- cuda-nvrtc=12.4
-- cuda-nvtx-dev=12.4
-- cuda-nvtx=12.4
-- cuda-tools=12.4
-- cuda-version=12.4
-- cudf=24.08
-- cuml=24.08.*
+- 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
@@ -56,7 +56,8 @@ dependencies:
 - isort
 - jsonpatch>=1.33
 - kfp
-- libcudf=24.08
+- libcudf=24.06
+- libcufft-dev
 - librdkafka>=1.9.2,<1.10.0a0
 - libtool
 - libwebp=1.3.2
@@ -90,11 +91,9 @@ dependencies:
 - python-confluent-kafka>=1.9.2,<1.10.0a0
 - python-docx==1.1.0
 - python-graphviz
-- python=3.11
-- pytorch-cuda
-- pytorch=*=*cuda*
+- python=3.10
 - rapidjson=1.1.0
-- rapids-dask-dependency=24.08
+- rapids-dask-dependency=24.06
 - rdma-core>=48
 - requests
 - requests-cache=1.1
@@ -117,6 +116,7 @@ dependencies:
 - websockets
 - yapf=0.40.1
 - 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
   - PyMuPDF==1.23.*
@@ -132,4 +132,5 @@ dependencies:
   - nemollm==0.3.5
   - pymilvus==2.3.6
   - pytest-kafka==0.6.0
-name: all_cuda-124_arch-x86_64
+  - torch==2.4.0+cu124
+name: all_cuda-125_arch-x86_64
diff --git a/...nvironments/dev_cuda-124_arch-x86_64.yaml → ...nvironments/dev_cuda-125_arch-x86_64.yaml b/...nvironments/dev_cuda-124_arch-x86_64.yaml → ...nvironments/dev_cuda-125_arch-x86_64.yaml
@@ -18,14 +18,14 @@ dependencies:
 - clangdev=16
 - click>=8
 - cmake=3.27
-- cuda-cudart-dev=12.4
-- cuda-nvcc=12.4
-- cuda-nvml-dev=12.4
-- cuda-nvrtc-dev=12.4
-- cuda-nvtx-dev=12.4
-- cuda-tools=12.4
-- cuda-version=12.4
-- cudf=24.08
+- 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
@@ -46,7 +46,8 @@ dependencies:
 - include-what-you-use=0.20
 - ipython
 - isort
-- libcudf=24.08
+- libcudf=24.06
+- libcufft-dev
 - librdkafka>=1.9.2,<1.10.0a0
 - libtool
 - libwebp=1.3.2
@@ -74,11 +75,9 @@ dependencies:
 - python-confluent-kafka>=1.9.2,<1.10.0a0
 - python-docx==1.1.0
 - python-graphviz
-- python=3.11
-- pytorch-cuda
-- pytorch=*=*cuda*
+- python=3.10
 - rapidjson=1.1.0
-- rapids-dask-dependency=24.08
+- rapids-dask-dependency=24.06
 - rdma-core>=48
 - requests
 - requests-cache=1.1
@@ -97,10 +96,12 @@ dependencies:
 - websockets
 - yapf=0.40.1
 - pip:
+  - --extra-index-url https://download.pytorch.org/whl/cu124
   - PyMuPDF==1.23.*
   - databricks-cli < 0.100
   - databricks-connect
   - milvus==2.3.5
   - pymilvus==2.3.6
   - pytest-kafka==0.6.0
-name: dev_cuda-124_arch-x86_64
+  - torch==2.4.0+cu124
+name: dev_cuda-125_arch-x86_64
diff --git a/...nments/examples_cuda-124_arch-x86_64.yaml → ...nments/examples_cuda-125_arch-x86_64.yaml b/...nments/examples_cuda-124_arch-x86_64.yaml → ...nments/examples_cuda-125_arch-x86_64.yaml
@@ -15,8 +15,8 @@ dependencies:
 - beautifulsoup4=4.12
 - boto3
 - click>=8
-- cudf=24.08
-- cuml=24.08.*
+- cudf=24.06
+- cuml=24.06.*
 - cupy
 - datacompy=0.10
 - dill=0.3.7
@@ -46,10 +46,8 @@ dependencies:
 - python-confluent-kafka>=1.9.2,<1.10.0a0
 - python-docx==1.1.0
 - python-graphviz
-- python=3.11
-- pytorch-cuda
-- pytorch=*=*cuda*
-- rapids-dask-dependency=24.08
+- python=3.10
+- rapids-dask-dependency=24.06
 - requests
 - requests-cache=1.1
 - requests-toolbelt=1.0
@@ -64,6 +62,7 @@ dependencies:
 - watchdog=3.0
 - websockets
 - 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
   - PyMuPDF==1.23.*
@@ -78,4 +77,5 @@ dependencies:
   - milvus==2.3.5
   - nemollm==0.3.5
   - pymilvus==2.3.6
-name: examples_cuda-124_arch-x86_64
+  - torch==2.4.0+cu124
+name: examples_cuda-125_arch-x86_64
diff --git a/...nts/model-utils_cuda-124_arch-x86_64.yaml → ...nts/model-utils_cuda-125_arch-x86_64.yaml b/...nts/model-utils_cuda-124_arch-x86_64.yaml → ...nts/model-utils_cuda-125_arch-x86_64.yaml
@@ -9,15 +9,15 @@ channels:
 - nvidia/label/dev
 - pytorch
 dependencies:
-- cuml=24.08.*
+- cuml=24.06.*
 - jupyterlab
 - matplotlib
 - onnx
 - pandas
-- python=3.11
+- python=3.10
 - scikit-learn=1.3.2
 - seaborn
 - seqeval=1.2.2
 - transformers=4.36.2
 - xgboost
-name: model-utils_cuda-124_arch-x86_64
+name: model-utils_cuda-125_arch-x86_64
diff --git a/...onments/runtime_cuda-124_arch-x86_64.yaml → ...onments/runtime_cuda-125_arch-x86_64.yaml b/...onments/runtime_cuda-124_arch-x86_64.yaml → ...onments/runtime_cuda-125_arch-x86_64.yaml
@@ -12,11 +12,11 @@ dependencies:
 - appdirs
 - beautifulsoup4=4.12
 - click>=8
-- cuda-cudart=12.4
-- cuda-nvrtc=12.4
-- cuda-nvtx=12.4
-- cuda-version=12.4
-- cudf=24.08
+- cuda-cudart=12.5
+- cuda-nvrtc=12.5
+- cuda-nvtx=12.5
+- cuda-version=12.5
+- cudf=24.06
 - cupy
 - datacompy=0.10
 - dill=0.3.7
@@ -35,10 +35,8 @@ dependencies:
 - pydantic
 - python-confluent-kafka>=1.9.2,<1.10.0a0
 - python-graphviz
-- python=3.11
-- pytorch-cuda
-- pytorch=*=*cuda*
-- rapids-dask-dependency=24.08
+- python=3.10
+- rapids-dask-dependency=24.06
 - requests
 - requests-cache=1.1
 - scikit-learn=1.3.2
@@ -49,8 +47,10 @@ dependencies:
 - watchdog=3.0
 - websockets
 - pip:
+  - --extra-index-url https://download.pytorch.org/whl/cu124
   - databricks-cli < 0.100
   - databricks-connect
   - milvus==2.3.5
   - pymilvus==2.3.6
-name: runtime_cuda-124_arch-x86_64
+  - torch==2.4.0+cu124
+name: runtime_cuda-125_arch-x86_64
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,4 +29,4 @@ python: @@
       - 3.10
     rapids_version:
-      - 24.02
+      - 24.06