From d755c8e7b85f8508208f030c126498d0c06adac6 Mon Sep 17 00:00:00 2001 From: Matthew Murray Date: Wed, 25 Sep 2024 08:48:05 -0700 Subject: [PATCH 1/3] Update all rmm imports to use pylibrmm/librmm --- python/cuml/cuml/cluster/hdbscan/hdbscan.pyx | 4 ++-- python/cuml/cuml/fil/fil.pyx | 4 ++-- python/cuml/cuml/manifold/umap_utils.pxd | 4 ++-- python/cuml/cuml/manifold/umap_utils.pyx | 2 +- python/cuml/cuml/random_projection/random_projection.pyx | 2 +- python/cuml/cuml/svm/linear.pyx | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/python/cuml/cuml/cluster/hdbscan/hdbscan.pyx b/python/cuml/cuml/cluster/hdbscan/hdbscan.pyx index f7691c1684..0ef2fbe5c0 100644 --- a/python/cuml/cuml/cluster/hdbscan/hdbscan.pyx +++ b/python/cuml/cuml/cluster/hdbscan/hdbscan.pyx @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2023, NVIDIA CORPORATION. +# Copyright (c) 2021-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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 index cff4b6f453..c09c3fa960 100644 --- a/python/cuml/cuml/fil/fil.pyx +++ b/python/cuml/cuml/fil/fil.pyx @@ -36,8 +36,8 @@ 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 +from rmm.librmm.memory_resource cimport 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 index 54d5adf21f..edf8039053 100644 --- 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 index 200b8cc4b3..bc6aa4143c 100644 --- 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.librmm.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 index dda2ab380f..fc5aff8d01 100644 --- 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 index 470e867f60..240c438950 100644 --- a/python/cuml/cuml/svm/linear.pyx +++ b/python/cuml/cuml/svm/linear.pyx @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2023, NVIDIA CORPORATION. +# Copyright (c) 2021-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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 From df3f87aab7d79b4bb2445fe7d2393dea621e7f8f Mon Sep 17 00:00:00 2001 From: Matthew Murray <41342305+Matt711@users.noreply.github.com> Date: Mon, 7 Oct 2024 12:34:57 -0400 Subject: [PATCH 2/3] Update fil.pyx fix import --- python/cuml/cuml/fil/fil.pyx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/cuml/cuml/fil/fil.pyx b/python/cuml/cuml/fil/fil.pyx index c09c3fa960..d3764fc758 100644 --- 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.pylibrmm.memory_resource cimport DeviceMemoryResource -from rmm.librmm.memory_resource cimport get_current_device_resource +from rmm.pylibrmm.memory_resource cimport ( + DeviceMemoryResource, + get_current_device_resource, +) import treelite.sklearn as tl_skl From aec574305fe2eedaf5060ac9f20aa45ccc292223 Mon Sep 17 00:00:00 2001 From: Matthew Murray <41342305+Matt711@users.noreply.github.com> Date: Mon, 7 Oct 2024 12:35:59 -0400 Subject: [PATCH 3/3] Update umap_utils.pyx fix import --- python/cuml/cuml/manifold/umap_utils.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cuml/cuml/manifold/umap_utils.pyx b/python/cuml/cuml/manifold/umap_utils.pyx index bc6aa4143c..55d86dc272 100644 --- 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.librmm.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