Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to RAPIDS 24.10 #1874

Merged
merged 44 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
62a81b9
rm nvtabular from dependencies
cwharris Jul 24, 2024
70948e1
rm nvtabular
cwharris Jul 26, 2024
76bb589
fix styles
cwharris Jul 29, 2024
bd2fcf7
change rapids to 24.08
cwharris Jul 31, 2024
81646cf
update dependencies for rapids 24.08
cwharris Aug 1, 2024
28dabd6
update 121_arch to 124_arch
cwharris Aug 1, 2024
116317e
rapids 24.06
cwharris Aug 15, 2024
c8361fe
Merge branch 'branch-24.10' of github.com:nv-morpheus/Morpheus into r…
cwharris Aug 15, 2024
472f0b9
fix merge conflict
cwharris Aug 15, 2024
03ee92a
Updating build to work with new packages.
mdemoret-nv Aug 16, 2024
422b797
fix windows event log parsing
cwharris Aug 21, 2024
7bb3ad9
Merge branch 'branch-24.10' of github.com:nv-morpheus/Morpheus into r…
cwharris Aug 22, 2024
3114285
add temporary cudf string copy_range workaround
cwharris Aug 22, 2024
4e4d2a6
change 12.1 references to 12.5
cwharris Aug 28, 2024
bfc7e94
remove pytest launch workaround code
cwharris Aug 28, 2024
2a38c1f
Merge branch 'branch-24.10' of github.com:nv-morpheus/Morpheus into r…
cwharris Aug 28, 2024
c2e2697
update rapids deps to 24.10
cwharris Aug 28, 2024
b8500b2
update to rapids 24.10
cwharris Aug 28, 2024
c0afb2d
update ip conversion
cwharris Aug 28, 2024
504786d
fix pr.yaml
cwharris Aug 28, 2024
562e318
update test_autoencoder.py to use new convergence tolerence
cwharris Aug 30, 2024
8d8e635
use rapids_cpm_* for gbench and gtest
cwharris Aug 30, 2024
13fcf9f
Merge branch 'branch-24.10' into rapids-24.10
cwharris Oct 1, 2024
6eb32c2
fix pandas is_string_dtype check for mlflow
cwharris Oct 2, 2024
92b1c9d
fix pandas is_string_dtype check for mlflow
cwharris Oct 2, 2024
480fd83
remove badly merged file
cwharris Oct 2, 2024
955a84a
styles
cwharris Oct 2, 2024
59f79a0
remove sys import from conftest.py
cwharris Oct 2, 2024
b7700dc
Merge remote-tracking branch 'upstream/branch-24.10' into rapids-24.10
cwharris Oct 2, 2024
20b29cf
update utilities submodule commit
cwharris Oct 2, 2024
600726a
styles
cwharris Oct 2, 2024
372470c
update ci image
cwharris Oct 4, 2024
e041699
Merge branch 'branch-24.10' of github.com:nv-morpheus/Morpheus into r…
cwharris Oct 4, 2024
8546540
add matx cuda dependencies
cwharris Oct 7, 2024
5f33192
update utilities submodule
cwharris Oct 7, 2024
3cc7bd3
update utilities submodule
cwharris Oct 7, 2024
7af1ad7
update utilities submodule
cwharris Oct 7, 2024
e6c3d9a
update meta.yaml, etc
cwharris Oct 8, 2024
8af23e7
add newline to trigger conda build in ci
cwharris Oct 8, 2024
f2b2e06
fix glog version constraint
cwharris Oct 8, 2024
7ec3116
set CONDA_VERBOSITY=3 in run_conda_build.sh
cwharris Oct 8, 2024
1b91339
fix grpcio version in meta.yaml files
cwharris Oct 8, 2024
1756aba
fix cuda version in env filename references and remove unpinned pytho…
cwharris Oct 8, 2024
ba6f9cd
remove CONDA_VERBOSITY setting in run_conda_build.sh
cwharris Oct 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/cuda12.1-conda/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"args": {
"CUDA": "12.1",
"PYTHON_PACKAGE_MANAGER": "conda",
"BASE": "rapidsai/devcontainers:24.06-cpp-mambaforge-ubuntu22.04"
"BASE": "rapidsai/devcontainers:24.10-cpp-mambaforge-ubuntu22.04"
}
},
"privileged": true,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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.10" 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)

Expand Down
8 changes: 4 additions & 4 deletions ci/conda/recipes/morpheus/conda_build_config.yaml
cwharris marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
4 changes: 2 additions & 2 deletions ci/conda/recipes/morpheus/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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 }}.*
Expand All @@ -69,7 +69,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 }}
Expand Down
4 changes: 2 additions & 2 deletions ci/runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,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.10
- cuml=24.10.*
- cupy
- cxx-compiler
- cython=3.0
Expand All @@ -45,23 +45,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.10
- 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.10
- myst-parser=0.18.1
- nbsphinx
Expand All @@ -81,6 +83,7 @@ dependencies:
- pre-commit
- pybind11-stubgen=0.10.5
- pydantic
- pylibcudf=24.10
- pylint=3.0.3
- pypdf=3.17.4
- pypdfium2=4.30
Expand All @@ -92,22 +95,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.10
- 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
Expand All @@ -120,20 +121,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
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,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.10
- cupy
- cxx-compiler
- cython=3.0
Expand All @@ -38,20 +38,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.10
- 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.10
- myst-parser=0.18.1
- nbsphinx
Expand All @@ -66,6 +68,7 @@ dependencies:
- pre-commit
- pybind11-stubgen=0.10.5
- pydantic
- pylibcudf=24.10
- pylint=3.0.3
- pypdfium2=4.30
- pytest-asyncio
Expand All @@ -76,10 +79,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.10
- rdma-core>=48
- requests
- requests-cache=1.1
Expand All @@ -88,7 +89,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
Expand All @@ -100,11 +101,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
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ dependencies:
- beautifulsoup4=4.12
- boto3
- click>=8
- cudf=24.02
- cuml=24.02.*
- cudf=24.10
- cuml=24.10.*
- cupy
- datacompy=0.10
- dill=0.3.7
- docker-py=5.0
- elasticsearch==8.9.0
- feedparser=6.0
- grpcio-status=1.59
- grpcio=1.59
- grpcio
- grpcio-status
- huggingface_hub=0.20.2
- jsonpatch>=1.33
- kfp
- libwebp=1.3.2
- mlflow>=2.10.0,<3
- mlflow
- mrc=24.10
- networkx=2.8.8
- newspaper3k=0.2
Expand All @@ -48,13 +48,11 @@ dependencies:
- python-docx==1.1.0
- python-graphviz
- python=3.10
- pytorch-cuda
- pytorch=*=*cuda*
- rapids-dask-dependency=24.02
- rapids-dask-dependency=24.10
- requests
- requests-cache=1.1
- requests-toolbelt=1.0
- s3fs=2023.12.2
- s3fs
- scikit-learn=1.3.2
- sentence-transformers=2.7
- sqlalchemy<2.0
Expand All @@ -65,17 +63,19 @@ 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
- 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
name: examples_cuda-121_arch-x86_64
- torch==2.4.0+cu124
name: examples_cuda-125_arch-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channels:
- nvidia/label/dev
- pytorch
dependencies:
- cuml=24.02.*
- cuml=24.10.*
- jupyterlab
- matplotlib
- onnx
Expand All @@ -20,4 +20,4 @@ dependencies:
- seqeval=1.2.2
- transformers=4.36.2
- xgboost
name: model-utils_cuda-121_arch-x86_64
name: model-utils_cuda-125_arch-x86_64
Loading
Loading