Skip to content

Commit

Permalink
Merge pull request rapidsai#5916 from rapidsai/branch-24.06
Browse files Browse the repository at this point in the history
Forward-merge branch-24.06 into branch-24.08
  • Loading branch information
GPUtester authored Jun 4, 2024
2 parents 9ca9f12 + c148298 commit 1b70cec
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion python/cuml/_thirdparty/sklearn/preprocessing/_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
from ..utils.extmath import _incremental_mean_and_var
from ..utils.extmath import row_norms
from ....thirdparty_adapters import check_array
from sklearn.utils._indexing import resample
from cuml.internals.mixins import AllowNaNTagMixin, SparseInputTagMixin, \
StatelessTagMixin
from ..utils.skl_dependencies import BaseEstimator, TransformerMixin
Expand All @@ -62,6 +61,7 @@
from cuml.internals.safe_imports import cpu_only_import
cpu_np = cpu_only_import('numpy')
np = gpu_only_import('cupy')
resample = cpu_only_import_from('sklearn.utils._indexing', 'resample')
sparse = gpu_only_import_from('cupyx.scipy', 'sparse')
stats = cpu_only_import_from('scipy', 'stats')

Expand Down

0 comments on commit 1b70cec

Please sign in to comment.