Move RMM C++ code into cpp directory. (#1883)

Restructures RMM to use a `cpp/` directory like most RAPIDS repos. Closes #1877.

rapidsai/devcontainers#490 should be merged just before this PR.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Rong Ou (https://github.com/rongou)
  - Mark Harris (https://github.com/harrism)
  - Matthew Murray (https://github.com/Matt711)
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

URL: #1883

Author: bdice

.github/workflows/pr.yaml

@@ -153,6 +153,7 @@ jobs:
       arch: '["amd64"]'
       cuda: '["12.8"]'
       build_command: |
+        mkdir -p telemetry-artifacts;
         sccache --zero-stats;
         build-all -DBUILD_BENCHMARKS=ON --verbose 2>&1 | tee telemetry-artifacts/build.log;
         sccache --show-adv-stats | tee telemetry-artifacts/sccache-stats.txt;

.gitignore

@@ -95,8 +95,8 @@ thirdparty/googletest/
 *.iws
 
 ## Doxygen
-doxygen/html
-doxygen/xml
+cpp/doxygen/html
+cpp/doxygen/xml
 
 #Java
 target

.pre-commit-config.yaml

@@ -36,7 +36,7 @@ repos:
       - id: fix-smartquotes
         exclude: |
           (?x)^(
-            ^benchmarks/utilities/cxxopts.hpp
+            ^cpp/benchmarks/utilities/cxxopts.hpp
           )
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.1
@@ -46,14 +46,14 @@ repos:
         args: ["--toml", "pyproject.toml"]
         exclude: |
           (?x)^(
-            pyproject.toml|
-            benchmarks/utilities/cxxopts.hpp
+            ^pyproject.toml|
+            ^cpp/benchmarks/utilities/cxxopts.hpp
           )
   - repo: local
     hooks:
       - id: cmake-format
         name: cmake-format
-        entry: ./scripts/run-cmake-format.sh cmake-format
+        entry: ./cpp/scripts/run-cmake-format.sh cmake-format
         language: python
         types: [cmake]
         # Note that pre-commit autoupdate does not update the versions
@@ -62,7 +62,7 @@ repos:
         - cmakelang==0.6.13
       - id: cmake-lint
         name: cmake-lint
-        entry: ./scripts/run-cmake-format.sh cmake-lint
+        entry: ./cpp/scripts/run-cmake-format.sh cmake-lint
         language: python
         types: [cmake]
         # Note that pre-commit autoupdate does not update the versions
@@ -71,7 +71,7 @@ repos:
         - cmakelang==0.6.13
       - id: doxygen-check
         name: doxygen-check
-        entry: ./scripts/doxygen.sh
+        entry: ./cpp/scripts/doxygen.sh
         types_or: [file]
         language: system
         pass_filenames: false

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2019-2024, NVIDIA CORPORATION.
+# Copyright (c) 2019-2025, NVIDIA CORPORATION.
 
 # rmm build script
 
@@ -35,7 +35,7 @@ HELP="$0 [clean] [librmm] [rmm] [-v] [-g] [-n] [-s] [--ptds] [--cmake-args=\"<ar
 
    default action (no args) is to build and install 'librmm' and 'rmm' targets
 "
-LIBRMM_BUILD_DIR=${LIBRMM_BUILD_DIR:=${REPODIR}/build}
+LIBRMM_BUILD_DIR=${LIBRMM_BUILD_DIR:=${REPODIR}/cpp/build}
 RMM_BUILD_DIR="${REPODIR}/python/rmm/build"
 BUILD_DIRS="${LIBRMM_BUILD_DIR} ${RMM_BUILD_DIR}"
 
@@ -88,7 +88,7 @@ function ensureCMakeRan {
     mkdir -p "${LIBRMM_BUILD_DIR}"
     if (( RAN_CMAKE == 0 )); then
         echo "Executing cmake for librmm..."
-        cmake -B "${LIBRMM_BUILD_DIR}" -S . \
+        cmake -S ${REPODIR}/cpp -B "${LIBRMM_BUILD_DIR}" \
               -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
               -DCUDA_STATIC_RUNTIME="${CUDA_STATIC_RUNTIME}" \
               -DPER_THREAD_DEFAULT_STREAM="${PER_THREAD_DEFAULT_STREAM}" \

ci/build_cpp.sh

@@ -40,6 +40,6 @@ rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache
 
 # Run the libcudacxx flag test at build time, since compilers are available
 rapids-logger "Run libcudacxx_flag_test"
-./tests/libcudacxx_flag_test/libcudacxx_flag_test.sh
+./cpp/tests/libcudacxx_flag_test/libcudacxx_flag_test.sh
 
 rapids-upload-conda-to-s3 cpp

ci/build_docs.sh

@@ -32,7 +32,7 @@ export RAPIDS_DOCS_DIR
 
 
 rapids-logger "Build CPP docs"
-pushd doxygen
+pushd cpp/doxygen
 doxygen Doxyfile
 mkdir -p "${RAPIDS_DOCS_DIR}/librmm/html"
 mv html/* "${RAPIDS_DOCS_DIR}/librmm/html"

ci/release/update-version.sh

@@ -33,7 +33,7 @@ function sed_runner() {
 echo "${NEXT_FULL_TAG}" > VERSION
 
 # Examples update
-sed_runner "s/RMM_TAG branch-[0-9.]*/RMM_TAG branch-${NEXT_SHORT_TAG}/" examples/versions.cmake
+sed_runner "s/RMM_TAG branch-[0-9.]*/RMM_TAG branch-${NEXT_SHORT_TAG}/" cpp/examples/versions.cmake
 
 # CI files
 for FILE in .github/workflows/*.yaml; do

conda/recipes/librmm/recipe.yaml

@@ -66,7 +66,7 @@ outputs:
     build:
       string: cuda${{ cuda_major }}_${{ date_string }}_${{ head_rev }}
       script:
-        - cmake --install build
+        - cmake --install cpp/build
       dynamic_linking:
         overlinking_behavior: "error"
     requirements:
@@ -99,7 +99,7 @@ outputs:
       version: ${{ version }}
     build:
       string: cuda${{ cuda_major }}_${{ date_string }}_${{ head_rev }}
-      script: cmake --install build --component testing
+      script: cmake --install cpp/build --component testing
       dynamic_linking:
         overlinking_behavior: "error"
         missing_dso_allowlist:
@@ -143,7 +143,7 @@ outputs:
       string: cuda${{ cuda_major }}_${{ date_string }}_${{ head_rev }}
       script:
         content: |
-          ./examples/build.sh --install
+          ./cpp/examples/build.sh --install
         env:
           CMAKE_C_COMPILER_LAUNCHER: ${{ env.get("CMAKE_C_COMPILER_LAUNCHER") }}
           CMAKE_CUDA_COMPILER_LAUNCHER: ${{ env.get("CMAKE_CUDA_COMPILER_LAUNCHER") }}

.clang-tidy renamed to cpp/.clang-tidy

@@ -14,7 +14,7 @@
 
 cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
-include(cmake/rapids_config.cmake)
+include(../cmake/rapids_config.cmake)
 
 include(rapids-cmake)
 include(rapids-cpm)

.clangd renamed to cpp/.clangd

@@ -13,12 +13,7 @@
 # =============================================================================
 
 include(${CMAKE_CURRENT_LIST_DIR}/versions.cmake)
-
-if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/librmm_cpp_examples_RAPIDS.cmake)
-  file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/${RMM_TAG}/RAPIDS.cmake
-       ${CMAKE_CURRENT_BINARY_DIR}/librmm_cpp_examples_RAPIDS.cmake)
-endif()
-include(${CMAKE_CURRENT_BINARY_DIR}/librmm_cpp_examples_RAPIDS.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../cmake/rapids_config.cmake)
 
 include(rapids-cmake)
 include(rapids-cpm)

CMakeLists.txt renamed to cpp/CMakeLists.txt

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION.
+# Copyright (c) 2023-2025, NVIDIA CORPORATION.
 ##############################
 # RMM doxygen warnings check #
 ##############################
@@ -27,7 +27,7 @@ export RAPIDS_VERSION_MAJOR_MINOR="$(sed -E -e 's/^([0-9]{2})\.([0-9]{2})\.([0-9
 # Run doxygen, ignore missing tag files error
 TAG_ERROR1="error: Tag file '.*.tag' does not exist or is not a file. Skipping it..."
 TAG_ERROR2="error: cannot open tag file .*.tag for writing"
-DOXYGEN_STDERR=`cd doxygen && { cat Doxyfile ; echo QUIET = YES; echo GENERATE_HTML = NO; }  | doxygen - 2>&1 | sed "/\($TAG_ERROR1\|$TAG_ERROR2\)/d"`
+DOXYGEN_STDERR=`cd cpp/doxygen && { cat Doxyfile ; echo QUIET = YES; echo GENERATE_HTML = NO; }  | doxygen - 2>&1 | sed "/\($TAG_ERROR1\|$TAG_ERROR2\)/d"`
 RETVAL=$?
 
 if [ "$RETVAL" != "0" ] || [ ! -z "$DOXYGEN_STDERR" ]; then

benchmarks/CMakeLists.txt renamed to cpp/benchmarks/CMakeLists.txt

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2024, NVIDIA CORPORATION.
+# Copyright (c) 2024-2025, NVIDIA CORPORATION.
 
 # This script is a wrapper for cmakelang that may be used with pre-commit. The
 # wrapping is necessary because RAPIDS libraries split configuration for
@@ -26,7 +26,7 @@
 
 status=0
 if [ -z ${RMM_ROOT:+PLACEHOLDER} ]; then
-    RMM_BUILD_DIR=$(git rev-parse --show-toplevel 2>&1)/build
+    RMM_BUILD_DIR=$(git rev-parse --show-toplevel 2>&1)/cpp/build
     status=$?
 else
     RMM_BUILD_DIR=${RMM_ROOT}
@@ -68,7 +68,7 @@ else
 fi
 
 if [[ $1 == "cmake-format" ]]; then
-  cmake-format -i --config-files cmake/config.json ${RAPIDS_CMAKE_FORMAT_FILE} -- ${@:2}
+  cmake-format -i --config-files cpp/cmake/config.json ${RAPIDS_CMAKE_FORMAT_FILE} -- ${@:2}
 elif [[ $1 == "cmake-lint" ]]; then
-  cmake-lint --config-files cmake/config.json ${RAPIDS_CMAKE_FORMAT_FILE} -- ${@:2}
+  cmake-lint --config-files cpp/cmake/config.json ${RAPIDS_CMAKE_FORMAT_FILE} -- ${@:2}
 fi

benchmarks/cuda_stream_pool/cuda_stream_pool_bench.cpp renamed to cpp/benchmarks/cuda_stream_pool/cuda_stream_pool_bench.cpp

@@ -1,9 +1,9 @@
-# Copyright (c) 2024, NVIDIA CORPORATION.
+# Copyright (c) 2024-2025, NVIDIA CORPORATION.
 
 [tool.codespell]
 # note: pre-commit passes explicit lists of files here, which this skip file list doesn't override -
 # this is only to allow you to run codespell interactively
-skip = "./.git,./build,./python/_skbuild/,.*egg-info.*,./.mypy_cache,./pyproject.toml,./benchmarks/utilities/cxxopts.hpp"
+skip = "./.git,./build,./python/_skbuild/,.*egg-info.*,./.mypy_cache,./pyproject.toml,./cpp/benchmarks/utilities/cxxopts.hpp"
 # ignore short words, and typename parameters like OffsetT
 ignore-regex = "\\b(.{1,4}|[A-Z]\\w*T)\\b"
 ignore-words-list = "thirdparty,couldn"

benchmarks/device_uvector/device_uvector_bench.cu renamed to cpp/benchmarks/device_uvector/device_uvector_bench.cu

@@ -35,4 +35,4 @@ set(BUILD_TESTS OFF)
 set(BUILD_BENCHMARKS OFF)
 set(CUDA_STATIC_RUNTIME ON)
 
-add_subdirectory(../.. rmm-cpp)
+add_subdirectory(../../cpp rmm-cpp)

benchmarks/multi_stream_allocations/multi_stream_allocations_bench.cu renamed to cpp/benchmarks/multi_stream_allocations/multi_stream_allocations_bench.cu

@@ -61,7 +61,7 @@
 ]
 
 # Breathe Configuration
-breathe_projects = {"librmm": "../../../doxygen/xml"}
+breathe_projects = {"librmm": "../../../cpp/doxygen/xml"}
 breathe_default_project = "librmm"
 
 copybutton_prompt_text = ">>> "