-
Notifications
You must be signed in to change notification settings - Fork 654
Use RAFT backend for make_blobs #8482
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.
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
Open
NIne-WIngEd
wants to merge
1
commit into
NVIDIA:main
Choose a base branch
from
NIne-WIngEd:enh-make-blobs-raft-clean
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+481
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| # | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
|
|
||
| import cupy as cp | ||
|
|
||
| from cuml.internals import get_handle | ||
|
|
||
| from libc.stddef cimport size_t | ||
| from libc.stdint cimport int64_t, uint64_t, uintptr_t | ||
| from libcpp cimport bool | ||
| from pylibraft.common.handle cimport handle_t | ||
|
|
||
|
|
||
| cdef extern from "cuml/datasets/make_blobs.hpp" namespace "ML" nogil: | ||
| void cpp_make_blobs "ML::Datasets::make_blobs" ( | ||
| const handle_t& handle, | ||
| float* out, | ||
| int64_t* labels, | ||
| int64_t n_rows, | ||
| int64_t n_cols, | ||
| int64_t n_clusters, | ||
| bool row_major, | ||
| const float* centers, | ||
| const float* cluster_std, | ||
| const float cluster_std_scalar, | ||
| bool shuffle, | ||
| float center_box_min, | ||
| float center_box_max, | ||
| uint64_t seed) except + | ||
|
|
||
| void cpp_make_blobs "ML::Datasets::make_blobs" ( | ||
| const handle_t& handle, | ||
| double* out, | ||
| int64_t* labels, | ||
| int64_t n_rows, | ||
| int64_t n_cols, | ||
| int64_t n_clusters, | ||
| bool row_major, | ||
| const double* centers, | ||
| const double* cluster_std, | ||
| const double cluster_std_scalar, | ||
| bool shuffle, | ||
| double center_box_min, | ||
| double center_box_max, | ||
| uint64_t seed) except + | ||
|
|
||
|
|
||
| def make_blobs( | ||
| n_samples, | ||
| n_features, | ||
| n_centers, | ||
| centers, | ||
| cluster_std, | ||
| center_box_min, | ||
| center_box_max, | ||
| shuffle, | ||
| random_state, | ||
| order, | ||
| dtype, | ||
| ): | ||
| dtype = cp.dtype(dtype) | ||
|
|
||
| h = get_handle() | ||
| cdef handle_t* h_ptr = <handle_t*><size_t>h.getHandle() | ||
|
|
||
| X = cp.empty((n_samples, n_features), dtype=dtype, order=order) | ||
| y = cp.empty(n_samples, dtype=cp.int64) | ||
|
|
||
| cdef uintptr_t x_p = X.data.ptr | ||
| cdef uintptr_t y_p = y.data.ptr | ||
| cdef uintptr_t ctr_p = 0 | ||
| if centers is not None: | ||
| ctr_p = centers.data.ptr | ||
|
|
||
| cdef bool row_c = order == "C" | ||
|
|
||
| if dtype == cp.dtype("float32"): | ||
| cpp_make_blobs( | ||
| h_ptr[0], | ||
| <float*>x_p, | ||
| <int64_t*>y_p, | ||
| <int64_t>n_samples, | ||
| <int64_t>n_features, | ||
| <int64_t>n_centers, | ||
| row_c, | ||
| <const float*>ctr_p, | ||
| <const float*>0, | ||
| <float>cluster_std, | ||
| <bool>shuffle, | ||
| <float>center_box_min, | ||
| <float>center_box_max, | ||
| <uint64_t>random_state, | ||
| ) | ||
| elif dtype == cp.dtype("float64"): | ||
| cpp_make_blobs( | ||
| h_ptr[0], | ||
| <double*>x_p, | ||
| <int64_t*>y_p, | ||
| <int64_t>n_samples, | ||
| <int64_t>n_features, | ||
| <int64_t>n_centers, | ||
| row_c, | ||
| <const double*>ctr_p, | ||
| <const double*>0, | ||
| <double>cluster_std, | ||
| <bool>shuffle, | ||
| <double>center_box_min, | ||
| <double>center_box_max, | ||
| <uint64_t>random_state, | ||
| ) | ||
| else: | ||
| raise ValueError("RAFT make_blobs only supports float32 and float64.") | ||
|
|
||
| return X, y.astype(dtype, copy=False) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The native API already accepts per-cluster standard deviations through the
cluster_stddevice pointer. Could we pass an array here instead of restricting the RAFT path to a scalarcluster_std? That would preserve the existing Python API and eliminate one fallback case.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked this before wiring it up. The RAFT API accepts the device pointer, but the current implementation looks like it indexes cluster_std using the row index rather than the cluster label, so an n_clusters-length array looks unsafe there. I kept sequence cluster_std on the CuPy path for now. Would you prefer that I handle the RAFT-side issue separately first?