Skip to content

UMAP fallback improvements #6358

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

Merged
rapids-bot merged 3 commits into from
Feb 25, 2025
Merged

UMAP fallback improvements #6358

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acff72a
UMAP fallback improvements
viclafargue Feb 24, 2025
0253173
code style
viclafargue Feb 24, 2025
02a4713
Merge branch 'branch-25.04' into umap-fallback-improvements
dantegd Feb 25, 2025
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
16 changes: 14 additions & 2 deletions python/cuml/cuml/manifold/umap.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ from cuml.internals.utils import check_random_seed
from cuml.common.array_descriptor import CumlArrayDescriptor
from cuml.internals.api_decorators import device_interop_preparation
from cuml.internals.api_decorators import enable_device_interop
from cuml.internals.global_settings import GlobalSettings

rmm = gpu_only_import('rmm')

Expand Down Expand Up @@ -346,6 +347,13 @@ class UMAP(UniversalBase,
"wminkowski": "NotImplemented",
"mahalanobis": "NotImplemented",
"haversine": "NotImplemented",
},
"init": {
"pca": "NotImplemented",
"tswspectral": "NotImplemented"
},
"target_metric": {
"l2": "euclidean"
}
}

Expand Down Expand Up @@ -395,7 +403,9 @@ class UMAP(UniversalBase,
if init == "spectral" or init == "random":
self.init = init
else:
raise Exception("Initialization strategy not supported: %d" % init)
gs = GlobalSettings()
if not (gs.accelerator_active or self._experimental_dispatching):
raise Exception(f"Initialization strategy not supported: {init}")

if a is None or b is None:
a, b = type(self).find_ab_params(spread, min_dist)
Expand All @@ -421,7 +431,9 @@ class UMAP(UniversalBase,
if target_metric == "euclidean" or target_metric == "categorical":
self.target_metric = target_metric
else:
raise Exception("Invalid target metric: {}" % target_metric)
gs = GlobalSettings()
if not (gs.accelerator_active or self._experimental_dispatching):
raise Exception(f"Invalid target metric: {target_metric}")

self.callback = callback # prevent callback destruction
self.embedding_ = None
Expand Down