Merge branch 'upstream/branch-25.10' into chore/remove_pytest_pin

vyasr · vyasr · commit 7fd3f288ec1e · 2025-07-25T20:06:50.000Z
diff --git a/RAPIDS_BRANCH b/RAPIDS_BRANCH
@@ -0,0 +1 @@
+branch-25.10
diff --git a/cmake/RAPIDS.cmake b/cmake/RAPIDS.cmake
@@ -18,9 +18,9 @@
 cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 # Allow users to control which version is used
-if(NOT rapids-cmake-version OR NOT rapids-cmake-version MATCHES [[^([0-9][0-9])\.([0-9][0-9])$]])
+if(NOT rapids-cmake-branch OR NOT rapids-cmake-version)
   message(
-    FATAL_ERROR "The CMake variable rapids-cmake-version must be defined in the format MAJOR.MINOR."
+    FATAL_ERROR "The CMake variable `rapids-cmake-branch` or `rapids-cmake-version` must be defined"
   )
 endif()
 
@@ -33,7 +33,7 @@ endif()
 # Allow users to control which branch is fetched
 if(NOT rapids-cmake-branch)
   # Define a default branch if the user doesn't set one
-  set(rapids-cmake-branch "branch-${rapids-cmake-version}")
+  set(rapids-cmake-branch "release/${rapids-cmake-version}")
 endif()
 
 # Allow users to control the exact URL passed to FetchContent
diff --git a/cmake/rapids_config.cmake b/cmake/rapids_config.cmake
@@ -25,5 +25,15 @@ else()
       "Could not determine RAPIDS version. Contents of VERSION file:\n${_rapids_version_formatted}")
 endif()
 
+# Use STRINGS to trim whitespace/newlines
+file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../RAPIDS_BRANCH" _rapids_branch)
+if(NOT _rapids_branch)
+  message(
+    FATAL_ERROR
+      "Could not determine branch name to use for checking out rapids-cmake. The file \"${CMAKE_CURRENT_LIST_DIR}/../RAPIDS_BRANCH\" is missing."
+  )
+endif()
+
 set(rapids-cmake-version "${RAPIDS_VERSION_MAJOR_MINOR}")
+set(rapids-cmake-branch "${_rapids_branch}")
 include("${CMAKE_CURRENT_LIST_DIR}/RAPIDS.cmake")
diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml
@@ -22,7 +22,7 @@ dependencies:
 - dask-cudf==25.10.*,>=0.0.0a0
 - dask-ml
 - doxygen=1.9.1
-- gcc_linux-aarch64=13.*
+- gcc_linux-aarch64=14.*
 - graphviz
 - hdbscan>=0.8.39,<0.8.40
 - hypothesis>=6.0,<7
diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml
@@ -22,7 +22,7 @@ dependencies:
 - dask-cudf==25.10.*,>=0.0.0a0
 - dask-ml
 - doxygen=1.9.1
-- gcc_linux-64=13.*
+- gcc_linux-64=14.*
 - graphviz
 - hdbscan>=0.8.39,<0.8.40
 - hypothesis>=6.0,<7
diff --git a/conda/environments/clang_tidy_cuda-129_arch-x86_64.yaml b/conda/environments/clang_tidy_cuda-129_arch-x86_64.yaml
@@ -14,7 +14,7 @@ dependencies:
 - cuda-profiler-api
 - cuda-version=12.9
 - cxx-compiler
-- gcc_linux-64=13.*
+- gcc_linux-64=14.*
 - libcublas-dev
 - libcufft-dev
 - libcumlprims==25.10.*,>=0.0.0a0
diff --git a/conda/environments/cpp_all_cuda-129_arch-x86_64.yaml b/conda/environments/cpp_all_cuda-129_arch-x86_64.yaml
@@ -12,7 +12,7 @@ dependencies:
 - cuda-profiler-api
 - cuda-version=12.9
 - cxx-compiler
-- gcc_linux-64=13.*
+- gcc_linux-64=14.*
 - libcublas-dev
 - libcufft-dev
 - libcumlprims==25.10.*,>=0.0.0a0
diff --git a/conda/recipes/cuml/conda_build_config.yaml b/conda/recipes/cuml/conda_build_config.yaml
@@ -1,8 +1,8 @@
 c_compiler_version:
-  - 13
+  - 14
 
 cxx_compiler_version:
-  - 13
+  - 14
 
 cuda_compiler:
   - cuda-nvcc
diff --git a/conda/recipes/libcuml/conda_build_config.yaml b/conda/recipes/libcuml/conda_build_config.yaml
@@ -1,8 +1,8 @@
 c_compiler_version:
-  - 13
+  - 14
 
 cxx_compiler_version:
-  - 13
+  - 14
 
 cuda_compiler:
   - cuda-nvcc
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -522,7 +522,8 @@ if(BUILD_CUML_CPP_LIBRARY)
   if(all_algo OR spectralclustering_algo)
     target_sources(${CUML_CPP_TARGET}
       PRIVATE
-        src/spectral/spectral.cu)
+        src/spectral/spectral.cu
+        src/spectral/spectral_embedding.cu)
   endif()
 
   if(all_algo OR svm_algo)
diff --git a/cpp/include/cuml/manifold/spectral_embedding.hpp b/cpp/include/cuml/manifold/spectral_embedding.hpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2025, NVIDIA CORPORATION.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License 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.
+ */
+
+#include <raft/core/device_mdspan.hpp>
+#include <raft/core/resources.hpp>
+
+namespace cuvs::preprocessing::spectral_embedding {
+
+struct params;
+
+}  // end namespace cuvs::preprocessing::spectral_embedding
+
+namespace ML::SpectralEmbedding {
+
+/**
+ * @brief Parameters for spectral embedding algorithm
+ */
+struct params {
+  /** @brief The number of components to reduce the data to. */
+  int n_components;
+
+  /** @brief The number of neighbors to use for the nearest neighbors graph. */
+  int n_neighbors;
+
+  /** @brief Whether to normalize the Laplacian matrix. */
+  bool norm_laplacian;
+
+  /** @brief Whether to drop the first eigenvector. */
+  bool drop_first;
+
+  /** @brief Random seed for reproducibility */
+  uint64_t seed;
+};
+
+cuvs::preprocessing::spectral_embedding::params to_cuvs(ML::SpectralEmbedding::params& config);
+
+void transform(raft::resources const& handle,
+               ML::SpectralEmbedding::params config,
+               raft::device_matrix_view<float, int, raft::row_major> dataset,
+               raft::device_matrix_view<float, int, raft::col_major> embedding);
+
+}  // namespace ML::SpectralEmbedding
diff --git a/cpp/src/spectral/spectral_embedding.cu b/cpp/src/spectral/spectral_embedding.cu
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025, NVIDIA CORPORATION.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License 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.
+ */
+
+#include <cuml/manifold/spectral_embedding.hpp>
+
+#include <raft/core/device_mdspan.hpp>
+#include <raft/core/resources.hpp>
+
+#include <cuvs/preprocessing/spectral_embedding.hpp>
+
+namespace ML::SpectralEmbedding {
+
+cuvs::preprocessing::spectral_embedding::params to_cuvs(ML::SpectralEmbedding::params& config)
+{
+  cuvs::preprocessing::spectral_embedding::params params;
+
+  params.n_components   = config.n_components;
+  params.n_neighbors    = config.n_neighbors;
+  params.norm_laplacian = config.norm_laplacian;
+  params.drop_first     = config.drop_first;
+  params.seed           = config.seed;
+
+  return params;
+}
+
+void transform(raft::resources const& handle,
+               ML::SpectralEmbedding::params config,
+               raft::device_matrix_view<float, int, raft::row_major> dataset,
+               raft::device_matrix_view<float, int, raft::col_major> embedding)
+{
+  cuvs::preprocessing::spectral_embedding::transform(handle, to_cuvs(config), dataset, embedding);
+}
+
+}  // namespace ML::SpectralEmbedding
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -263,13 +263,13 @@ dependencies:
               cuda: "12.*"
             packages:
               - cuda-nvcc
-              - gcc_linux-64=13.*
+              - gcc_linux-64=14.*
           - matrix:
               arch: aarch64
               cuda: "12.*"
             packages:
               - cuda-nvcc
-              - gcc_linux-aarch64=13.*
+              - gcc_linux-aarch64=14.*
   py_build_cuml:
     common:
       - output_types: [conda, requirements, pyproject]
diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -476,6 +476,14 @@ TSNE
 .. autoclass:: cuml.TSNE
     :members:
 
+Spectral Embedding
+------------------
+
+.. autoclass:: cuml.manifold.SpectralEmbedding
+    :members:
+
+.. autofunction:: cuml.manifold.spectral_embedding
+
 Neighbors
 ==========
 
diff --git a/python/cuml/cuml/manifold/CMakeLists.txt b/python/cuml/cuml/manifold/CMakeLists.txt
@@ -19,6 +19,7 @@ add_module_gpu_default("simpl_set.pyx" ${simpl_set_algo} ${manifold_algo})
 add_module_gpu_default("t_sne.pyx" ${t_sne_algo} ${manifold_algo})
 add_module_gpu_default("umap.pyx" ${umap_algo} ${manifold_algo})
 add_module_gpu_default("umap_utils.pyx")
+add_module_gpu_default("spectral_embedding.pyx")
 
 rapids_cython_create_modules(
   CXX
diff --git a/python/cuml/cuml/manifold/__init__.py b/python/cuml/cuml/manifold/__init__.py
@@ -14,5 +14,9 @@
 # limitations under the License.
 #
 
+from cuml.manifold.spectral_embedding import (
+    SpectralEmbedding,
+    spectral_embedding,
+)
 from cuml.manifold.t_sne import TSNE
 from cuml.manifold.umap import UMAP
diff --git a/python/cuml/cuml/manifold/spectral_embedding.pyx b/python/cuml/cuml/manifold/spectral_embedding.pyx
diff --git a/python/cuml/cuml/tests/test_spectral_embedding.py b/python/cuml/cuml/tests/test_spectral_embedding.py
