Merge branch 'branch-24.12' into 2412-fix-classmethod

rapidsai · Oct 8, 2024 · 1086f75 · 1086f75
2 parents 9eb0255 + 61f85a6
commit 1086f75
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/python/cuml/cuml/cluster/hdbscan/hdbscan.pyx b/python/cuml/cuml/cluster/hdbscan/hdbscan.pyx
@@ -42,7 +42,7 @@ IF GPUBUILD == 1:
     from libc.stdlib cimport free
     from cython.operator cimport dereference as deref
     from cuml.metrics.distance_type cimport DistanceType
-    from rmm._lib.device_uvector cimport device_uvector
+    from rmm.librmm.device_uvector cimport device_uvector
     from pylibraft.common.handle import Handle
     from pylibraft.common.handle cimport handle_t
 

diff --git a/python/cuml/cuml/fil/fil.pyx b/python/cuml/cuml/fil/fil.pyx
@@ -36,8 +36,10 @@ from cuml.common import input_to_cuml_array
 from cuml.internals import logger
 from cuml.internals.mixins import CMajorInputTagMixin
 from cuml.common.doc_utils import _parameters_docstrings
-from rmm._lib.memory_resource cimport DeviceMemoryResource
-from rmm._lib.memory_resource cimport get_current_device_resource
+from rmm.pylibrmm.memory_resource cimport (
+    DeviceMemoryResource,
+    get_current_device_resource,
+)
 
 import treelite.sklearn as tl_skl
 

diff --git a/python/cuml/cuml/manifold/umap_utils.pxd b/python/cuml/cuml/manifold/umap_utils.pxd
@@ -16,8 +16,8 @@
 
 # distutils: language = c++
 
-from rmm._lib.memory_resource cimport DeviceMemoryResource
-from rmm._lib.cuda_stream_view cimport cuda_stream_view
+from rmm.pylibrmm.memory_resource cimport DeviceMemoryResource
+from rmm.librmm.cuda_stream_view cimport cuda_stream_view
 from libcpp.memory cimport unique_ptr
 
 from libc.stdint cimport uint64_t, uintptr_t, int64_t

diff --git a/python/cuml/cuml/manifold/umap_utils.pyx b/python/cuml/cuml/manifold/umap_utils.pyx
@@ -16,7 +16,7 @@
 
 # distutils: language = c++
 
-from rmm._lib.memory_resource cimport get_current_device_resource
+from rmm.pylibrmm.memory_resource cimport get_current_device_resource
 from pylibraft.common.handle cimport handle_t
 from cuml.manifold.umap_utils cimport *
 from cuml.metrics.distance_type cimport DistanceType

diff --git a/python/cuml/cuml/random_projection/random_projection.pyx b/python/cuml/cuml/random_projection/random_projection.pyx
@@ -29,7 +29,7 @@ from pylibraft.common.handle cimport *
 from cuml.common import input_to_cuml_array
 from cuml.internals.mixins import FMajorInputTagMixin
 
-from rmm._lib.cuda_stream_view cimport cuda_stream_view
+from rmm.librmm.cuda_stream_view cimport cuda_stream_view
 
 cdef extern from "cuml/random_projection/rproj_c.h" namespace "ML":
 

diff --git a/python/cuml/cuml/svm/linear.pyx b/python/cuml/cuml/svm/linear.pyx
@@ -22,7 +22,7 @@ from cuml.internals.safe_imports import cpu_only_import
 np = cpu_only_import('numpy')
 import cuml
 
-from rmm._lib.cuda_stream_view cimport cuda_stream_view
+from rmm.librmm.cuda_stream_view cimport cuda_stream_view
 
 from collections import OrderedDict
 from cython.operator cimport dereference as deref