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 23.12 Upgrade #1456

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM rapidsai/devcontainers:23.10-cpp-cuda11.8-mambaforge-ubuntu22.04 AS base
FROM rapidsai/devcontainers:23.12-cpp-cuda12.0-mambaforge-ubuntu22.04 AS base

ENV PATH="${PATH}:/workspaces/morpheus/.devcontainer/bin"
4 changes: 2 additions & 2 deletions .devcontainer/opt/morpheus/bin/post-attach-command.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ ENV_NAME=${ENV_NAME:-morpheus}
sed -ri "s/conda activate base/conda activate $ENV_NAME/g" ~/.bashrc;

if conda_env_find "${ENV_NAME}" ; \
then mamba env update --name ${ENV_NAME} -f ${MORPHEUS_ROOT}/conda/environments/all_cuda-118_arch-x86_64.yaml --prune; \
else mamba env create --name ${ENV_NAME} -f ${MORPHEUS_ROOT}/conda/environments/all_cuda-118_arch-x86_64.yaml; \
then mamba env update --name ${ENV_NAME} -f ${MORPHEUS_ROOT}/conda/environments/all_cuda-120_arch-x86_64.yaml --prune; \
else mamba env create --name ${ENV_NAME} -f ${MORPHEUS_ROOT}/conda/environments/all_cuda-120_arch-x86_64.yaml; \
fi
2 changes: 1 addition & 1 deletion .github/workflows/ci_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ on:
env:
CHANGE_TARGET: "${{ github.base_ref }}"
CUDA_PATH: "/usr/local/cuda/"
CUDA_VER: "11.8"
CUDA_VER: "12.0"
GH_TOKEN: "${{ github.token }}"
GIT_COMMIT: "${{ github.sha }}"
MORPHEUS_ROOT: "${{ github.workspace }}/morpheus"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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 "23.06" CACHE STRING "Sets default versions for RAPIDS libraries.")
set(MORPHEUS_RAPIDS_VERSION "23.12" 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
4 changes: 2 additions & 2 deletions ci/conda/recipes/morpheus/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cuda_compiler:
- cuda-nvcc

cuda_compiler_version:
- 11.8
- 12.0

python:
- 3.10
Expand All @@ -32,4 +32,4 @@ boost:
- 1.82

rapids_version:
- 23.06
- 23.08
2 changes: 1 addition & 1 deletion ci/conda/recipes/run_conda_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ fi

# And default channels (with optional channel alias)
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}rapidsai")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia/label/cuda-11.8.0")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia/label/cuda-12.0.0")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia/label/dev")
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}pytorch")
Expand Down
6 changes: 3 additions & 3 deletions ci/runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

# Args used in FROM commands must come first
ARG FROM_IMAGE="rapidsai/ci"
ARG CUDA_PKG_VER=11-8
ARG CUDA_SHORT_VER=11.8
ARG CUDA_VER=11.8.0
ARG CUDA_PKG_VER=12-0
ARG CUDA_SHORT_VER=12.0
ARG CUDA_VER=12.0.0
ARG LINUX_DISTRO=ubuntu
ARG LINUX_VER=20.04
ARG PROJ_NAME=morpheus
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/run_ci_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ GIT_COMMIT=$(git log -n 1 --pretty=format:%H)

LOCAL_CI_TMP=${LOCAL_CI_TMP:-${MORPHEUS_ROOT}/.tmp/local_ci_tmp}
CONTAINER_VER=${CONTAINER_VER:-230913}
CUDA_VER=${CUDA_VER:-11.8}
CUDA_VER=${CUDA_VER:-12.0}
DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}

BUILD_CONTAINER="nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-${CONTAINER_VER}"
Expand Down
116 changes: 0 additions & 116 deletions conda/environments/all_cuda-118_arch-x86_64.yaml

This file was deleted.

118 changes: 118 additions & 0 deletions conda/environments/all_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
# This file is generated by `rapids-dependency-file-generator`.
# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
channels:
- conda-forge
- huggingface
- rapidsai
- nvidia/label/cuda-12.1.0
- nvidia
- rapidsai-nightly
- nvidia/label/dev
- pytorch
- defaults
dependencies:
- appdirs
- arxiv>=1.4
- benchmark>=1.6.0
- boost-cpp>=1.82
- boto3
- breathe>=4.34.0
- clangdev=16
- click >=8
- click>=8
- cmake=3.26.4
- cuda-cudart-dev=12.1
- cuda-nvcc
- cuda-nvml-dev=12.1
- cuda-nvrtc-dev=12.1
- cuda-nvtx-dev=12.1
- cuda-tools=12.1
- cuda-version=12.1
- cudf=23.12
- cuml=23.12.*
- cxx-compiler
- cython>=3.0.3
- dask>=2023.1.1
- datacompy>=0.8
- dill
- dill>=0.3.6
- distributed>=2023.1.1
- doxygen>=1.9.2
- elasticsearch==8.9.0
- environs>=9.5
- exhale>=0.3.6
- feedparser>=6.0.10
- flake8
- gcc_linux-64=11.2
- git-lfs
- gputil
- grpcio
- gxx_linux-64=11.2
- huggingface_hub>=0.10.1
- include-what-you-use=0.20
- ipython
- isort
- langchain>=0.0.190
- librdkafka>=1.9.2
- libwebp>=1.3.2
- minio>=7.1
- mlflow>=2.2.1,<3
- mrc=24.03
- myst-parser>=0.17.2
- nbsphinx
- newspaper3k>=0.2
- ninja>=1.10
- nlohmann_json=3.9
- nodejs=18.*
- numpydoc>=1.4
- nvtabular>=23.08
- openai>=0.28
- papermill>=2.3.4
- pip
- pluggy>=1.0
- pre-commit
- protobuf>=4.21.*
- pybind11-stubgen=0.10
- pylint>=2.17.4
- pypdf>=3.16
- pytest
- pytest-asyncio
- pytest-benchmark>=4.0
- pytest-cov
- python-confluent-kafka>=1.9.2
- python-dotenv>=1.0
- python-graphviz
- python=3.10
- pytorch-cuda
- pytorch=*=*cuda*
- rapidjson>=1.1.0
- requests-cache>=1.1
- s3fs>=2023.6
- scikit-build>=0.17.1
- scikit-learn>=1.2.2
- sentence-transformers
- sphinx
- sphinx_rtd_theme
- sqlalchemy
- tqdm>=4
- transformers>=4.30.2
- tritonclient>=2.26
- typing_utils>=0.1
- ucx>=1.15
- ujson>=5.8
- watchdog>=2.1
- websockets
- yapf>=0.40.1
- pip:
- --find-links https://data.dgl.ai/wheels-test/repo.html
- --find-links https://data.dgl.ai/wheels/cu121/repo.html
- databricks-connect
- dgl
- dglgo
- google-search-results==2.4
- grpcio-status==1.58
- milvus==2.3.2
- nemollm
- pymilvus==2.3.2
- pytest-kafka==0.6.0
name: all_cuda-121_arch-x86_64
Loading