Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update all rmm imports to use pylibrmm/librmm #6084

Merged
merged 4 commits into from
Oct 8, 2024
Merged

Update all rmm imports to use pylibrmm/librmm #6084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d755c8e
Update all rmm imports to use pylibrmm/librmm
Matt711 Sep 25, 2024
9dfad42
Merge branch 'branch-24.12' into bug/fix-rmm-imports
Matt711 Oct 4, 2024
df3f87a
Update fil.pyx
Matt711 Oct 7, 2024
aec5743
Update umap_utils.pyx
Matt711 Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions python/cuml/cuml/cluster/hdbscan/hdbscan.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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
Matt711 marked this conversation as resolved.
Show resolved Hide resolved
from pylibraft.common.handle cimport handle_t

Expand Down
6 changes: 4 additions & 2 deletions python/cuml/cuml/fil/fil.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions python/cuml/cuml/manifold/umap_utils.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/cuml/cuml/manifold/umap_utils.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/cuml/cuml/random_projection/random_projection.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":

Expand Down
4 changes: 2 additions & 2 deletions python/cuml/cuml/svm/linear.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
Loading