Merge branch 'branch-25.04' into update_cbc_rapids_ucx_ver

rapidsai · Feb 27, 2025 · 01403d8 · 01403d8
2 parents 801408f + 0b244c4
commit 01403d8
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 41 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -5,20 +5,21 @@ cpp/               @rapidsai/raft-cpp-codeowners
 python/            @rapidsai/raft-python-codeowners
 
 #cmake code owners
-**/CMakeLists.txt  @rapidsai/raft-cmake-codeowners
+CMakeLists.txt     @rapidsai/raft-cmake-codeowners
 **/cmake/          @rapidsai/raft-cmake-codeowners
+*.cmake            @rapidsai/raft-cmake-codeowners
 python/setup.py    @rapidsai/raft-cmake-codeowners
 build.sh           @rapidsai/raft-cmake-codeowners
 **/build.sh        @rapidsai/raft-cmake-codeowners
 
 #CI code owners
 /.github/                @rapidsai/ci-codeowners
 /ci/                     @rapidsai/ci-codeowners
-/.pre-commit-config.yaml @rapidsai/ci-codeowners
 
 #packaging code owners
-/.devcontainer/    @rapidsai/packaging-codeowners
-/conda/            @rapidsai/packaging-codeowners
-/dependencies.yaml @rapidsai/packaging-codeowners
-/build.sh          @rapidsai/packaging-codeowners
-pyproject.toml     @rapidsai/packaging-codeowners
+/.pre-commit-config.yaml @rapidsai/packaging-codeowners
+/.devcontainer/          @rapidsai/packaging-codeowners
+/conda/                  @rapidsai/packaging-codeowners
+dependencies.yaml        @rapidsai/packaging-codeowners
+/build.sh                @rapidsai/packaging-codeowners
+pyproject.toml           @rapidsai/packaging-codeowners
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -107,7 +107,7 @@ repos:
         hooks:
               - id: check-json
       - repo: https://github.com/rapidsai/pre-commit-hooks
-        rev: v0.4.0
+        rev: v0.5.0
         hooks:
           - id: verify-copyright
             files: |
@@ -122,6 +122,8 @@ repos:
                   cpp/include/raft/thirdparty/|
                   docs/source/sphinxext/github_link[.]py|
           - id: verify-alpha-spec
+          - id: verify-codeowners
+            args: [--fix, --project-prefix=raft]
       - repo: https://github.com/rapidsai/dependency-file-generator
         rev: v1.17.0
         hooks:

diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -17,7 +17,7 @@ rapids-logger "Begin cpp build"
 
 sccache --zero-stats
 
-RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \
+RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry build \
   conda/recipes/libraft
 
 sccache --show-adv-stats

diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -25,15 +25,15 @@ sccache --zero-stats
 
 # TODO: Remove `--no-test` flags once importing on a CPU
 # node works correctly
-rapids-conda-retry mambabuild \
+rapids-conda-retry build \
   --no-test \
   --channel "${CPP_CHANNEL}" \
   conda/recipes/pylibraft
 
 sccache --show-adv-stats
 sccache --zero-stats
 
-rapids-conda-retry mambabuild \
+rapids-conda-retry build \
   --no-test \
   --channel "${CPP_CHANNEL}" \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \

diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -11,7 +11,7 @@ dependencies:
 - c-compiler
 - clang-tools=16.0.6
 - clang==16.0.6
-- cmake>=3.26.4,!=3.30.0
+- cmake>=3.30.4
 - cuda-nvtx=11.8
 - cuda-profiler-api=11.8.86
 - cuda-python>=11.8.5,<12.0a0
@@ -55,6 +55,7 @@ dependencies:
 - scipy
 - sphinx-copybutton
 - sphinx-markdown-tables
+- sphinx<8.2.0
 - sysroot_linux-aarch64==2.28
 - ucx-py==0.43.*,>=0.0.0a0
 name: all_cuda-118_arch-aarch64
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -11,7 +11,7 @@ dependencies:
 - c-compiler
 - clang-tools=16.0.6
 - clang==16.0.6
-- cmake>=3.26.4,!=3.30.0
+- cmake>=3.30.4
 - cuda-nvtx=11.8
 - cuda-profiler-api=11.8.86
 - cuda-python>=11.8.5,<12.0a0
@@ -55,6 +55,7 @@ dependencies:
 - scipy
 - sphinx-copybutton
 - sphinx-markdown-tables
+- sphinx<8.2.0
 - sysroot_linux-64==2.28
 - ucx-py==0.43.*,>=0.0.0a0
 name: all_cuda-118_arch-x86_64
diff --git a/conda/environments/all_cuda-128_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml
@@ -11,7 +11,7 @@ dependencies:
 - c-compiler
 - clang-tools=16.0.6
 - clang==16.0.6
-- cmake>=3.26.4,!=3.30.0
+- cmake>=3.30.4
 - cuda-cudart-dev
 - cuda-nvcc
 - cuda-nvtx-dev
@@ -51,6 +51,7 @@ dependencies:
 - scipy
 - sphinx-copybutton
 - sphinx-markdown-tables
+- sphinx<8.2.0
 - sysroot_linux-aarch64==2.28
 - ucx-py==0.43.*,>=0.0.0a0
 name: all_cuda-128_arch-aarch64
diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml
@@ -11,7 +11,7 @@ dependencies:
 - c-compiler
 - clang-tools=16.0.6
 - clang==16.0.6
-- cmake>=3.26.4,!=3.30.0
+- cmake>=3.30.4
 - cuda-cudart-dev
 - cuda-nvcc
 - cuda-nvtx-dev
@@ -51,6 +51,7 @@ dependencies:
 - scipy
 - sphinx-copybutton
 - sphinx-markdown-tables
+- sphinx<8.2.0
 - sysroot_linux-64==2.28
 - ucx-py==0.43.*,>=0.0.0a0
 name: all_cuda-128_arch-x86_64
diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml
@@ -17,7 +17,7 @@ c_stdlib_version:
   - "2.28"
 
 cmake_version:
-  - ">=3.26.4,!=3.30.0"
+  - ">=3.30.4"
 
 # The CTK libraries below are missing from the conda-forge::cudatoolkit package
 # for CUDA 11. The "*_host_*" version specifiers correspond to `11.8` packages

diff --git a/conda/recipes/pylibraft/conda_build_config.yaml b/conda/recipes/pylibraft/conda_build_config.yaml
@@ -17,4 +17,4 @@ c_stdlib_version:
   - "2.28"
 
 cmake_version:
-  - ">=3.26.4,!=3.30.0"
+  - ">=3.30.4"
diff --git a/conda/recipes/raft-dask/conda_build_config.yaml b/conda/recipes/raft-dask/conda_build_config.yaml
@@ -23,7 +23,7 @@ ucxx_version:
   - "0.43.*"
 
 cmake_version:
-  - ">=3.26.4,!=3.30.0"
+  - ">=3.30.4"
 
 nccl_version:
   - ">=2.19"
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -10,7 +10,7 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 # or implied. See the License for the specific language governing permissions and limitations under
 # the License.
-cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 include(../rapids_config.cmake)
 include(rapids-cmake)
 include(rapids-cpm)

diff --git a/cpp/include/raft/linalg/detail/strided_reduction.cuh b/cpp/include/raft/linalg/detail/strided_reduction.cuh
@@ -35,19 +35,19 @@ namespace detail {
 // Note that the compensation will only be performed 'per-block' for performance
 // reasons and therefore not be equivalent to a sequential compensation.
 
-template <typename Type, typename MainLambda>
+template <typename Type, typename IdxType, typename MainLambda>
 RAFT_KERNEL stridedSummationKernel(
-  Type* out, const Type* data, int D, int N, Type init, MainLambda main_op)
+  Type* out, const Type* data, IdxType D, IdxType N, Type init, MainLambda main_op)
 {
   // Thread reduction
-  Type thread_sum = Type(init);
-  Type thread_c   = Type(0);
-  int colStart    = blockIdx.x * blockDim.x + threadIdx.x;
+  Type thread_sum  = Type(init);
+  Type thread_c    = Type(0);
+  IdxType colStart = blockIdx.x * blockDim.x + threadIdx.x;
   if (colStart < D) {
-    int rowStart = blockIdx.y * blockDim.y + threadIdx.y;
-    int stride   = blockDim.y * gridDim.y;
-    for (int j = rowStart; j < N; j += stride) {
-      int idx = colStart + j * D;
+    IdxType rowStart = blockIdx.y * blockDim.y + threadIdx.y;
+    IdxType stride   = blockDim.y * gridDim.y;
+    for (IdxType j = rowStart; j < N; j += stride) {
+      auto idx = colStart + j * D;
 
       // KahanBabushkaNeumaierSum
       const Type cur_value = main_op(data[idx], j);
@@ -97,8 +97,8 @@ template <typename InType,
           typename ReduceLambda>
 RAFT_KERNEL stridedReductionKernel(OutType* dots,
                                    const InType* data,
-                                   int D,
-                                   int N,
+                                   IdxType D,
+                                   IdxType N,
                                    OutType init,
                                    MainLambda main_op,
                                    ReduceLambda reduce_op)
@@ -167,7 +167,7 @@ void stridedReduction(OutType* dots,
                     raft::min((IdxType)MaxBlocksDimY, raft::ceildiv(N, (IdxType)MinRowsPerBlk)));
     const size_t shmemSize = sizeof(OutType) * Block.x * 2;
 
-    stridedSummationKernel<InType>
+    stridedSummationKernel<InType, IdxType>
       <<<grid, Block, shmemSize, stream>>>(dots, data, D, N, init, main_op);
   } else {
     // Arbitrary numbers for now, probably need to tune

diff --git a/cpp/include/raft/thirdparty/mdspan/CMakeLists.txt b/cpp/include/raft/thirdparty/mdspan/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 project(MDSpan
   VERSION 0.4.0

diff --git a/cpp/include/raft/thirdparty/mdspan/cmake/metabench.cmake b/cpp/include/raft/thirdparty/mdspan/cmake/metabench.cmake
@@ -8,7 +8,7 @@
 # benchmarks. For documentation, questions and other resources please
 # visit the home of the project at https://github.com/ldionne/metabench.
 
-cmake_minimum_required(VERSION 3.12...3.19)
+cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 find_package(Ruby 2.1 QUIET)
 if(NOT RUBY_EXECUTABLE)

diff --git a/cpp/include/raft/thirdparty/mdspan/examples/CMakeLists.txt b/cpp/include/raft/thirdparty/mdspan/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12...3.19)
+cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 project(example LANGUAGES CXX)
 

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -185,7 +185,7 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
-          - &cmake_ver cmake>=3.26.4,!=3.30.0
+          - &cmake_ver cmake>=3.30.4
           - ninja
       - output_types: [conda]
         packages:
@@ -441,6 +441,7 @@ dependencies:
           - recommonmark
           - sphinx-copybutton
           - sphinx-markdown-tables
+          - sphinx<8.2.0
   py_version:
     specific:
       - output_types: conda

diff --git a/python/libraft/CMakeLists.txt b/python/libraft/CMakeLists.txt
@@ -12,7 +12,7 @@
 # the License.
 # =============================================================================
 
-cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 include(../../rapids_config.cmake)
 

diff --git a/python/libraft/pyproject.toml b/python/libraft/pyproject.toml
@@ -103,7 +103,7 @@ regex = "(?P<value>.*)"
 [tool.rapids-build-backend]
 build-backend = "scikit_build_core.build"
 requires = [
-    "cmake>=3.26.4,!=3.30.0",
+    "cmake>=3.30.4",
     "librmm==25.4.*,>=0.0.0a0",
     "ninja",
     "rapids-logger==0.1.*,>=0.0.0a0",

diff --git a/python/pylibraft/CMakeLists.txt b/python/pylibraft/CMakeLists.txt
@@ -12,7 +12,7 @@
 # the License.
 # =============================================================================
 
-cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 include(../../rapids_config.cmake)
 

diff --git a/python/pylibraft/pyproject.toml b/python/pylibraft/pyproject.toml
@@ -118,7 +118,7 @@ regex = "(?P<value>.*)"
 [tool.rapids-build-backend]
 build-backend = "scikit_build_core.build"
 requires = [
-    "cmake>=3.26.4,!=3.30.0",
+    "cmake>=3.30.4",
     "cuda-python",
     "cython>=3.0.0,<3.1.0a0",
     "libraft==25.4.*,>=0.0.0a0",

diff --git a/python/raft-dask/CMakeLists.txt b/python/raft-dask/CMakeLists.txt
@@ -12,7 +12,7 @@
 # the License.
 # =============================================================================
 
-cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 include(../../rapids_config.cmake)
 include(rapids-cpm)

diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml
@@ -118,7 +118,7 @@ regex = "(?P<value>.*)"
 [tool.rapids-build-backend]
 build-backend = "scikit_build_core.build"
 requires = [
-    "cmake>=3.26.4,!=3.30.0",
+    "cmake>=3.30.4",
     "cython>=3.0.0,<3.1.0a0",
     "libraft==25.4.*,>=0.0.0a0",
     "librmm==25.4.*,>=0.0.0a0",