From 6c2399a857b12ecfaeb0ca08a03d7848ac01673b Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 6 Apr 2023 10:21:20 -0500 Subject: [PATCH 1/2] update to rmm 23.02 --- CMakeLists.txt | 4 ++-- Dockerfile | 4 ++-- ci/conda/environments/dev_env.yml | 12 +++++------ .../recipes/libmrc/conda_build_config.yaml | 21 ++++++++++--------- ci/conda/recipes/libmrc/meta.yaml | 10 ++++----- ci/conda/recipes/run_conda_build.sh | 4 ++-- docs/quickstart/environment_cpp.yml | 6 +++--- external/utilities | 2 +- 8 files changed, 32 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0966a26a1..45a080fe7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ option(MRC_USE_CONDA "Enables finding dependencies via conda. All dependencies m environment" ON) option(MRC_USE_IWYU "Enable running include-what-you-use as part of the build process" OFF) -set(MRC_RAPIDS_VERSION "22.10" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.") +set(MRC_RAPIDS_VERSION "23.02" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.") set(MRC_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data") mark_as_advanced(MRC_CACHE_DIR) @@ -63,7 +63,7 @@ list(PREPEND CMAKE_MODULE_PATH "${MRC_CMAKE_MODULE_PATH_EXTENSIONS}") list(PREPEND CMAKE_PREFIX_PATH "${MRC_CMAKE_PREFIX_PATH_EXTENSIONS}") # Load morpheus utils and update CMake paths -set(MORPHEUS_UTILS_RAPIDS_CMAKE_VERSION ${MRC_RAPIDS_VERSION}) +set(MORPHEUS_UTILS_RAPIDS_VERSION ${MRC_RAPIDS_VERSION}) set(MORPHEUS_UTILS_RAPIDS_CPM_INIT_OVERRIDE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/rapids_cpm_package_overrides.json") include(morpheus_utils/load) diff --git a/Dockerfile b/Dockerfile index 266d514c4..c82fb7a3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ ARG FROM_IMAGE="rapidsai/ci" -ARG CUDA_VER=11.4.1 +ARG CUDA_VER=11.8.0 ARG LINUX_DISTRO=ubuntu ARG LINUX_VER=20.04 ARG PYTHON_VER=3.8 # ============= base =================== -FROM ${FROM_IMAGE}:cuda11.4.1-ubuntu20.04-py3.8 AS base +FROM ${FROM_IMAGE}:cuda11.8.0-ubuntu20.04-py3.8 AS base ARG PROJ_NAME=mrc diff --git a/ci/conda/environments/dev_env.yml b/ci/conda/environments/dev_env.yml index 5bc4f0498..c0d3e590f 100644 --- a/ci/conda/environments/dev_env.yml +++ b/ci/conda/environments/dev_env.yml @@ -10,8 +10,8 @@ dependencies: - boost-cpp=1.74 - ccache - cmake=3.24 - - cuda-nvml-dev=11.4 - - cudatoolkit=11.4 + - cuda-nvml-dev=11.8 + - cudatoolkit=11.8 - cython=0.29.24 - doxygen=1.9.2 - flatbuffers=2.0 @@ -23,21 +23,21 @@ dependencies: - glog=0.6 - gmock=1.10 - graphviz=3.0 - - grpc-cpp=1.46 + - grpc-cpp=1.48 - gtest=1.10 - gxx_linux-64=11.2 - isort - jinja2=3.0 - lcov=1.15 - libhwloc=2.5 - - libprotobuf=3.20 - - librmm=22.10 + - libprotobuf=3.21 + - librmm=23.02 - libtool - ninja=1.10 - nlohmann_json=3.9 - numactl-libs-cos7-x86_64 - numpy=1.21.2 - - nvcc_linux-64=11.4 + - nvcc_linux-64=11.8 - pip - pkg-config=0.29 - pybind11-stubgen=0.10 diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml index 11ef76893..90de529da 100644 --- a/ci/conda/recipes/libmrc/conda_build_config.yaml +++ b/ci/conda/recipes/libmrc/conda_build_config.yaml @@ -23,7 +23,7 @@ cuda_compiler: - nvcc cuda_compiler_version: - - 11.4 + - 11.8 python: - 3.8 @@ -31,37 +31,40 @@ python: # Setup the dependencies to build with multiple versions of RAPIDS rapids_version: # Keep around compatibility with current version -1 - - 22.08 - 22.08 - 22.10 - + - 23.02 # Multiple versions of abseil are required to satisfy the solver for some # environments. RAPIDS 22.06 only works with gRPC 1.45 and 22.08 only works with # 1.46. For each version of gRPC, support 2 abseil versions. Zip all of the keys # together to avoid impossible combinations -abseil_cpp: - - 20211102.0 +libabseil: - 20220623.0 - 20220623.0 + - 20230125.0 grpc_cpp: - 1.46 - 1.46 - - 1.46 + - 1.51 -# UCX 1.12 is required for RAPIDS 22.06 ucx: - 1.13 - 1.13 - 1.13 +libprotobuf: + - 3.20 + - 3.20 + - 3.21 zip_keys: - rapids_version - - abseil_cpp + - libabseil - grpc_cpp - ucx + - libprotobuf # The following mimic what is available in the pinning feedstock: # https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml @@ -73,8 +76,6 @@ gflags: - 2.2 glog: - 0.6 -libprotobuf: - - 3.20 pin_run_as_build: diff --git a/ci/conda/recipes/libmrc/meta.yaml b/ci/conda/recipes/libmrc/meta.yaml index 60b0e7545..f60e301a4 100644 --- a/ci/conda/recipes/libmrc/meta.yaml +++ b/ci/conda/recipes/libmrc/meta.yaml @@ -16,7 +16,7 @@ {% set version = environ.get('GIT_VERSION', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set py_version = environ.get('CONDA_PY', '3.8') %} -{% set cuda_version = '.'.join(environ.get('CUDA', '11.4').split('.')[:2]) %} +{% set cuda_version = '.'.join(environ.get('CUDA', '11.8').split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} package: @@ -50,7 +50,7 @@ requirements: - sysroot_linux-64 >=2.17 host: # Libraries necessary to build. Keep sorted! - - abseil-cpp + - libaseil - boost-cpp - cuda-nvml-dev {{ cuda_version }}.* - cudatoolkit {{ cuda_version }}.* @@ -92,7 +92,7 @@ outputs: - sysroot_linux-64 2.17 host: # Any libraries with weak run_exports need to go here to be added to the run. Keep sorted! - - abseil-cpp # Needed for transitive run_exports from grpc-cpp. Does not need a version + - libaseil # Needed for transitive run_exports from grpc-cpp. Does not need a version - boost-cpp - flatbuffers 2.0.* - gflags @@ -127,7 +127,7 @@ outputs: host: # Only should need libmrc and python. Keep sorted! - {{ pin_subpackage('libmrc', exact=True) }} - - abseil-cpp # mrc does not require abseil at build time. See https://github.com/conda-forge/arrow-cpp-feedstock/issues/814 + - libaseil # mrc does not require abseil at build time. See https://github.com/conda-forge/arrow-cpp-feedstock/issues/814 - python {{ python }} run: - {{ pin_subpackage('libmrc', exact=True) }} @@ -146,7 +146,7 @@ outputs: - numpy - nvtx - pytest - - cuml {{ rapids_version }}.* # Ensure we can install cuml. This can cause issues solving abseil-cpp + - cuml {{ rapids_version }}.* # Ensure we can install cuml. This can cause issues solving libaseil about: home: https://www.nvidia.com/ diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh index 3b3d65727..e0ed9ab94 100755 --- a/ci/conda/recipes/run_conda_build.sh +++ b/ci/conda/recipes/run_conda_build.sh @@ -42,7 +42,7 @@ export MRC_ROOT=${MRC_ROOT:-$(git rev-parse --show-toplevel)} export CUDA="$(conda list | grep cudatoolkit | egrep -o "[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+")" export PYTHON_VER="$(python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")" -export CUDA=11.4.1 +export CUDA=11.8.0 echo "CUDA : ${CUDA}" echo "PYTHON_VER : ${PYTHON_VER}" echo "" @@ -99,7 +99,7 @@ fi # Choose default variants if hasArg quick; then # For quick build, just do most recent version of rapids - CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8, rapids_version: 22.10}") + CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8, rapids_version: 23.02}") else CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8}") fi diff --git a/docs/quickstart/environment_cpp.yml b/docs/quickstart/environment_cpp.yml index 9c83b05fc..d81c1dbc2 100644 --- a/docs/quickstart/environment_cpp.yml +++ b/docs/quickstart/environment_cpp.yml @@ -12,8 +12,8 @@ dependencies: - benchmark=1.6.0 - ccache - cmake=3.22 - - cuda-nvml-dev=11.4 - - cudatoolkit=11.4 + - cuda-nvml-dev=11.8 + - cudatoolkit=11.8 - cython=0.29.24 - doxygen=1.9.2 - gcc_linux-64=11.2 @@ -26,7 +26,7 @@ dependencies: - ninja=1.10 - numactl-libs-cos7-x86_64 - numpy=1.21.2 - - nvcc_linux-64=11.4 + - nvcc_linux-64=11.8 - pkg-config=0.29 - python=3.8 - scikit-build>=0.12 diff --git a/external/utilities b/external/utilities index 22ee75be7..67a1cca12 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit 22ee75be7fa6f6e2efc288a2ee9047d5ad49a11c +Subproject commit 67a1cca120498a3eb3765ad8cc6e1d89656176a3 From fc80780be1a9dc9a41acd6b68510e4597d82216b Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 6 Apr 2023 10:30:27 -0500 Subject: [PATCH 2/2] update utilities submodule --- external/utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/utilities b/external/utilities index 67a1cca12..e0f496baa 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit 67a1cca120498a3eb3765ad8cc6e1d89656176a3 +Subproject commit e0f496baab032f08a230c37253a792cf1817fe46