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 RMM 23.02 #309

Merged
merged 2 commits into from
Apr 10, 2023
Merged
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions ci/conda/environments/dev_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
21 changes: 11 additions & 10 deletions ci/conda/recipes/libmrc/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,45 +23,48 @@ cuda_compiler:
- nvcc

cuda_compiler_version:
- 11.4
- 11.8

python:
- 3.8
- 3.9

# 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
Expand All @@ -73,8 +76,6 @@ gflags:
- 2.2
glog:
- 0.6
libprotobuf:
- 3.20


pin_run_as_build:
Expand Down
10 changes: 5 additions & 5 deletions ci/conda/recipes/libmrc/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}.*
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) }}
Expand All @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions ci/conda/recipes/run_conda_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/quickstart/environment_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down