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

RAPIDS 24.02 Upgrade #1468

Merged
merged 60 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
1485b88
upgrade to cudf-23.10
cwharris Jan 2, 2024
082ec58
Merge branch 'branch-24.03' of github.com:nv-morpheus/Morpheus into c…
cwharris Jan 2, 2024
ddf2c4f
rapids 23.12
cwharris Jan 2, 2024
e03953b
unpin dep versions
cwharris Jan 5, 2024
d1d7789
fix sql password hiding breaking change
cwharris Jan 5, 2024
38f9e50
fix graph_sage_stage bug
cwharris Jan 9, 2024
fa54c64
pin dependencies
cwharris Jan 11, 2024
2122371
.
cwharris Jan 12, 2024
795645d
add all example deps to dependencies.yaml
cwharris Jan 16, 2024
045a1bc
remove unnecessary requirements files
cwharris Jan 17, 2024
978991e
expand *click in dependencies.yaml
cwharris Jan 17, 2024
25d0e32
cmake update and file formatting
cwharris Jan 18, 2024
a0cad2c
update conda channels
cwharris Jan 24, 2024
4365488
Merge branch 'branch-24.03' of github.com:nv-morpheus/Morpheus into c…
cwharris Jan 24, 2024
45fc8fe
update to cccl and fix matx
cwharris Jan 26, 2024
b0eaf09
get libcudacxx from cccl, fix matx usages
cwharris Jan 26, 2024
60d9c72
fix cudf api misuse, use correct column owners
cwharris Jan 29, 2024
e86de1f
try fix ci
cwharris Jan 29, 2024
d9a8a42
require cxx standard 20
cwharris Jan 30, 2024
9ecb19b
try fix ci
cwharris Jan 30, 2024
ffec30b
try fix ci
cwharris Jan 30, 2024
0345ef2
try fix ci
cwharris Jan 30, 2024
050fe69
try fix ci
cwharris Jan 30, 2024
d1811f5
get grpcio-status from conda
cwharris Jan 30, 2024
71415a8
try fix ci
cwharris Jan 31, 2024
d5d6fbe
pin pytest
cwharris Jan 31, 2024
8414ad8
always remove and re-add index when adding slices to multi_message
cwharris Jan 31, 2024
41ea18b
fix matx util bug
cwharris Jan 31, 2024
06d6913
cleanup
cwharris Jan 31, 2024
59ba379
address review feedback
cwharris Jan 31, 2024
9a20f88
Merge branch 'branch-24.03' of github.com:nv-morpheus/Morpheus into c…
cwharris Feb 2, 2024
66c3e7f
add set_meta error comments
cwharris Feb 2, 2024
d75f49a
update utilities
cwharris Feb 2, 2024
0f1a606
fix styles
cwharris Feb 2, 2024
a42e0ff
disable certain warnings-as-errors for clang
cwharris Feb 2, 2024
497a3dc
fix segfault
cwharris Feb 2, 2024
a19bf9c
use official utilities branch
cwharris Feb 2, 2024
1a8b24c
try fix ci
cwharris Feb 3, 2024
625324c
try fix ci
cwharris Feb 3, 2024
f92a959
add datacompy to sphinx mock modules
cwharris Feb 5, 2024
93ffd17
downgrade doxygen to 1.9.2
cwharris Feb 5, 2024
8cffa31
remove conda docs environment yaml
cwharris Feb 5, 2024
27f5f3d
try fix conda build
cwharris Feb 5, 2024
52a8a41
update docs year
cwharris Feb 5, 2024
356d753
conda build update to use partial cuda-toolkit
cwharris Feb 5, 2024
3bace0f
fix type in meta.yaml
cwharris Feb 5, 2024
a81ebd0
try fix conda-build
cwharris Feb 5, 2024
ae4fb4f
remote unnecessary restraints from meta.yaml
cwharris Feb 5, 2024
71cd3af
rm cudf_kafka, pin sysroot
cwharris Feb 5, 2024
e1478a5
make libmorpheus depend on zlib only for debug builds
cwharris Feb 5, 2024
dac6cf8
make zlib not required
cwharris Feb 5, 2024
cd48015
find zlib required only if debug build
cwharris Feb 5, 2024
b199ec4
fix incorrect syntax in dependencies.cmake
cwharris Feb 5, 2024
071674e
update utilities
cwharris Feb 5, 2024
ce7ab55
add cuda-nvtx-dev to meta.yaml
cwharris Feb 5, 2024
e636a29
add libcublas-dev to meta.yaml
cwharris Feb 5, 2024
57fcafc
add networkx to runtime dependencies
cwharris Feb 5, 2024
beb6716
add zlib to dependencies
cwharris Feb 5, 2024
e2f682f
add zlib to dependencies
cwharris Feb 5, 2024
0850bb7
remove unncessary source file pattern for test stage of conda build
cwharris Feb 5, 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
12 changes: 11 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@
# Disable modernize-use-trailing-return-type (too many hits)
# Disable modernize-use-nodiscard (why isnt [[nodiscard]] the default?)
# Enable identifier in TODO comments
Checks: -*,readability-identifier-naming,modernize-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard,google-readability-todo
Checks: >
-*,
readability-identifier-naming,
modernize-*,
-modernize-use-trailing-return-type,
-modernize-use-nodiscard,
google-readability-todo
WarningsAsErrors: >
*,
-clang-diagnostic-unused-command-line-argument
#WarningsAsErrors: '*'
HeaderFilterRegex: '.*\/include\/morpheus\/.*'
Expand Down
3 changes: 0 additions & 3 deletions ci/conda/recipes/morpheus/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,5 @@ cuda_compiler_version:
python:
- 3.10

boost:
- 1.82

rapids_version:
- 24.02
85 changes: 43 additions & 42 deletions ci/conda/recipes/morpheus/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,81 +46,82 @@ outputs:
requirements:
build:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- {{ compiler("cuda") }}
- automake 1.16.5 # Needed for DOCA build
- {{ compiler("cxx") }}
- automake =1.16.5 # Needed for DOCA build
- ccache
- cmake 3.25
- cuda-cudart-dev {{ cuda_compiler_version }} # Needed by CMake to compile a test application
- cmake =3.27
- cuda-cudart-dev {{ cuda_compiler_version }}.* # Needed by CMake to compile a test application
- cuda-version {{ cuda_compiler_version }}.*
- libtool # Needed for DOCA build
- ninja
- pkg-config # for mrc cmake
- ninja =1.11
- pkg-config =0.29 # for mrc cmake
- sysroot_linux-64 =2.17
host:
- cuda-toolkit {{ cuda_compiler_version }}
- cuda-cudart-dev {{ cuda_compiler_version }}.*
- cuda-libraries-dev {{ cuda_compiler_version }}.* # required by matx for libcublas-dev
- cuda-nvml-dev {{ cuda_compiler_version }}.*
- cuda-nvrtc-dev {{ cuda_compiler_version }}.*
- cuda-nvtx-dev {{ cuda_compiler_version }}.*
- cuda-version {{ cuda_compiler_version }}.*
- cudf {{ rapids_version }}
- cython >=0.29,<0.30
- cython =3.0
- libcudf {{ rapids_version }}
- librdkafka 1.9.2
- librdkafka >=1.9.2,<1.10.0a0
- mrc {{ minor_version }}
- pip
- pyarrow * *_cuda # Ensure we get a CUDA build. Version determined by cuDF
- pyarrow-hotfix # CVE-2023-47248
- pybind11-stubgen 0.10.5
- pybind11-stubgen =0.10.5
- python {{ python }}
- rapidjson 1.1
- rdma-core >=48 # Needed for DOCA. Compatible with UCX 1.14.1
- scikit-build 0.17.1
- rapidjson =1.1.0
- rdma-core >=48 # Needed for DOCA.
- scikit-build =0.17.6
- versioneer-518
- zlib # required to build triton client
run:
# Runtime only requirements. This + setup.py is the definitive runtime requirement list
- {{ pin_compatible('cuda-cudart', min_pin='x.x', max_pin='x') }}
- click >=8
- configargparse 1.5.*
- configargparse =1.5.*
- cuda-version {{ cuda_compiler_version }}.*
- cudf
- cudf_kafka {{ rapids_version }}.*
- cupy # Version determined from cudf
- datacompy 0.8.*
- datacompy =0.10.*
- dill
- distributed
- docker-py 5.0.*
- docker-py =5.0.*
- grpcio # Version determined from cudf
- libmrc
- libwebp>=1.3.2 # Required for CVE mitigation: https://nvd.nist.gov/vuln/detail/CVE-2023-4863
- mlflow>=2.2.1,<3
- mrc
- networkx>=2.8
- numpydoc 1.4.*
- nvtabular {{ rapids_version }}.*
- pandas 1.3.*
- pluggy 1.0.*
- numpydoc =1.5.*
- nvtabular =23.08.00
- pandas
- pluggy =1.3.*
- pyarrow * *_cuda # Ensure we get a CUDA build. Version determined by cuDF
- pyarrow-hotfix # CVE-2023-47248
- python
- python-confluent-kafka 1.9.2
- pytorch 2.0.1
- python-confluent-kafka >=1.9.2,<1.10.0a0
- pytorch
- pytorch-cuda
- requests=2.31
- requests-cache=1.1
- scikit-learn 1.2.2.*
- requests
- requests-cache =1.1
- scikit-learn =1.3.2.*
- sqlalchemy <2.0 # 2.0 is incompatible with pandas=1.3
- tqdm 4.*
- tritonclient 2.26.*
- typing_utils 0.1.*
- watchdog 2.1.*
- tqdm =4.*
- tritonclient =2.34.*
- typing_utils =0.1.*
- watchdog =3.0.*
- websockets
run_constrained:
# Since we dont explicitly require this but other packages might, constrain the versions.
- {{ pin_compatible('cudatoolkit', min_pin='x.x', max_pin='x') }}
test:
requires:
- pynvml
- pytest
- pytest-cov
- pytest-benchmark
# test that cuml can be installed in the env
- cuml {{ rapids_version }}.*
- pynvml
- pytest-asyncio
- pytest-benchmark
- pytest-cov
- pytest =7.4.4
source_files:
- docker/conda/environments/*
- pyproject.toml
- scripts/fetch_data.py
- tests/*
Expand Down
6 changes: 1 addition & 5 deletions ci/scripts/run_clang_tidy_for_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@

# set -x

# Call clang-tidy adding warnings-as-errors option. Currently this is not
# possible with clang-tidy-diff.py until this is merged:
# https://reviews.llvm.org/D49864

# Also add -fno-caret-diagnostics to prevent clangs own compiler warnings from
# coming through:
# https://github.com/llvm/llvm-project/blob/3f3faa36ff3d84af3c3ed84772d7e4278bc44ff1/libc/cmake/modules/LLVMLibCObjectRules.cmake#L226
${CLANG_TIDY:-clang-tidy} --warnings-as-errors='*' --extra-arg=-fno-caret-diagnostics "$@"
${CLANG_TIDY:-clang-tidy} --extra-arg=-fno-caret-diagnostics "$@"
2 changes: 1 addition & 1 deletion cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ rapids_find_package(CUDAToolkit REQUIRED
INSTALL_EXPORT_SET ${PROJECT_NAME}-core-exports
)

rapids_find_package(ZLIB REQUIRED
rapids_find_package(ZLIB
BUILD_EXPORT_SET ${PROJECT_NAME}-core-exports
INSTALL_EXPORT_SET ${PROJECT_NAME}-core-exports
)
Expand Down
14 changes: 9 additions & 5 deletions conda/environments/all_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
- anyio>=3.7
- appdirs
- arxiv=1.4
- automake
- benchmark=1.8.3
- boost-cpp=1.84
- boto3
Expand All @@ -34,10 +35,9 @@ dependencies:
- cython=3.0
- dask=2023.12.1
- datacompy=0.10
- dill
- dill=0.3.7
- distributed=2023.12.1
- doxygen=1.10.0
- doxygen=1.9.2
- elasticsearch==8.9.0
- exhale=0.3.6
- feedparser=6.0.10
Expand All @@ -55,12 +55,14 @@ dependencies:
- jsonpatch>=1.33
- kfp
- langchain=0.0.190
- librdkafka=2.2
- librdkafka>=1.9.2,<1.10.0a0
- libtool
- libwebp=1.3.2
- mlflow=2.9.2
- mrc=24.03
- myst-parser=0.18.1
- nbsphinx
- networkx=2.8.8
- newspaper3k=0.2
- ninja=1.11
- nlohmann_json=3.9
Expand All @@ -75,19 +77,20 @@ dependencies:
- pluggy=1.3
- pre-commit
- protobuf=4.24
- pybind11-stubgen=0.10
- pybind11-stubgen=0.10.5
- pylint=3.0.3
- pypdf=3.17.4
- pytest-asyncio
- pytest-benchmark=4.0
- pytest-cov
- pytest=7.4.4
- python-confluent-kafka=2.2.0
- python-confluent-kafka>=1.9.2,<1.10.0a0
- python-graphviz
- python=3.10
- pytorch-cuda
- pytorch=*=*cuda*
- rapidjson=1.1.0
- rdma-core>=48
- requests-cache=1.1
- s3fs=2023.12.2
- scikit-build=0.17.6
Expand All @@ -106,6 +109,7 @@ dependencies:
- watchdog=3.0
- websockets
- yapf=0.40.1
- zlib=1.2.13
- pip:
- --find-links https://data.dgl.ai/wheels-test/repo.html
- --find-links https://data.dgl.ai/wheels/cu121/repo.html
Expand Down
12 changes: 7 additions & 5 deletions conda/environments/dev_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ dependencies:
- cxx-compiler
- cython=3.0
- datacompy=0.10
- dill
- doxygen=1.10.0
- dill=0.3.7
- doxygen=1.9.2
- elasticsearch==8.9.0
- exhale=0.3.6
- feedparser=6.0.10
Expand All @@ -43,11 +43,12 @@ dependencies:
- include-what-you-use=0.20
- ipython
- isort
- librdkafka=2.2
- librdkafka>=1.9.2,<1.10.0a0
- mlflow=2.9.2
- mrc=24.03
- myst-parser=0.18.1
- nbsphinx
- networkx=2.8.8
- ninja=1.11
- nlohmann_json=3.9
- nodejs=18.*
Expand All @@ -58,13 +59,13 @@ dependencies:
- pluggy=1.3
- pre-commit
- protobuf=4.24
- pybind11-stubgen=0.10
- pybind11-stubgen=0.10.5
- pylint=3.0.3
- pytest-asyncio
- pytest-benchmark=4.0
- pytest-cov
- pytest=7.4.4
- python-confluent-kafka=2.2.0
- python-confluent-kafka>=1.9.2,<1.10.0a0
- python-graphviz
- python=3.10
- pytorch-cuda
Expand All @@ -85,6 +86,7 @@ dependencies:
- watchdog=3.0
- websockets
- yapf=0.40.1
- zlib=1.2.13
- pip:
- databricks-connect
- milvus==2.3.5
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/examples_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ dependencies:
- cuml=24.02.*
- dask=2023.12.1
- datacompy=0.10
- dill
- dill=0.3.7
- distributed=2023.12.1
- elasticsearch==8.9.0
Expand All @@ -31,6 +30,7 @@ dependencies:
- langchain=0.0.190
- libwebp=1.3.2
- mlflow=2.9.2
- networkx=2.8.8
- newspaper3k=0.2
- nodejs=18.*
- numpydoc=1.5
Expand All @@ -40,7 +40,7 @@ dependencies:
- papermill=2.4.0
- pip
- pypdf=3.17.4
- python-confluent-kafka=2.2.0
- python-confluent-kafka>=1.9.2,<1.10.0a0
- python-graphviz
- python=3.10
- pytorch-cuda
Expand Down
Loading
Loading