Skip to content

sklearn API change #1120

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
merged 7 commits into from
May 31, 2024
Merged

sklearn API change #1120

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9142513
Use sklearn get_namespace to accomodate API change.
j-c-c May 28, 2024
2147dde
update pyproject.toml sklearn >= 1.5
j-c-c May 28, 2024
bb4a443
revert changes and pin sklearn.
j-c-c May 28, 2024
e9d3cb2
Workaround for py3.8
j-c-c May 30, 2024
becc76c
remove pin
j-c-c May 30, 2024
5386202
check sklearn version instead of python
j-c-c May 30, 2024
2ee4e5f
tox
j-c-c May 30, 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
20 changes: 18 additions & 2 deletions src/aspire/numeric/complex_pca/complex_pca.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@

import numpy as np
import scipy.sparse as sp
import sklearn
from packaging.version import Version
from sklearn.decomposition import PCA
from sklearn.utils._array_api import get_namespace

from .validation import check_array

Expand Down Expand Up @@ -45,6 +48,8 @@ def _fit(self, X):
allow_complex=True,
)

xp, is_array_api_compliant = get_namespace(X)

# Handle n_components==None
if self.n_components is None:
if self.svd_solver != "arpack":
Expand All @@ -66,11 +71,22 @@ def _fit(self, X):
else:
self._fit_svd_solver = "full"

# sci-kit changed `_fit_*()` API in latest release v1.5.0
# which supports Python 3.9 - 3.12. This can be removed after
# our minimal support is Python 3.9.
API_dep = Version(sklearn.__version__) < Version("1.5.0")

# Call different fits for either full or truncated SVD
if self._fit_svd_solver == "full":
return self._fit_full(X, n_components)
if API_dep:
return self._fit_full(X, n_components)
else:
return self._fit_full(X, n_components, xp, is_array_api_compliant)
elif self._fit_svd_solver in ["arpack", "randomized"]:
return self._fit_truncated(X, n_components, self._fit_svd_solver)
if API_dep:
return self._fit_truncated(X, n_components, self._fit_svd_solver)
else:
return self._fit_truncated(X, n_components, xp)
else:
raise ValueError(
"Unrecognized svd_solver='{0}'" "".format(self._fit_svd_solver)
Expand Down