scikit-learn-intelex 2024.1.0__py310-none-win_amd64.whl → 2025.1.0__py310-none-win_amd64.whl

{scikit_learn_intelex-2024.1.0.data → scikit_learn_intelex-2025.1.0.data}/data/Lib/site-packages/sklearnex/neighbors/knn_regression.py

@@ -14,132 +14,32 @@
 # limitations under the License.
 # ==============================================================================
 
-import warnings
-
-from sklearn.neighbors._ball_tree import BallTree
-from sklearn.neighbors._base import NeighborsBase as sklearn_NeighborsBase
-from sklearn.neighbors._kd_tree import KDTree
-
-from daal4py.sklearn._utils import control_n_jobs, run_with_n_jobs, sklearn_check_version
-
-if not sklearn_check_version("1.2"):
-    from sklearn.neighbors._base import _check_weights
-
-import numpy as np
-from sklearn.neighbors._base import VALID_METRICS
+from sklearn.metrics import r2_score
 from sklearn.neighbors._regression import (
-    KNeighborsRegressor as sklearn_KNeighborsRegressor,
+    KNeighborsRegressor as _sklearn_KNeighborsRegressor,
 )
-from sklearn.neighbors._unsupervised import NearestNeighbors as sklearn_NearestNeighbors
 from sklearn.utils.validation import _deprecate_positional_args, check_is_fitted
 
+from daal4py.sklearn._n_jobs_support import control_n_jobs
+from daal4py.sklearn._utils import sklearn_check_version
 from onedal.neighbors import KNeighborsRegressor as onedal_KNeighborsRegressor
-from onedal.utils import _check_array, _num_features, _num_samples
 
 from .._device_offload import dispatch, wrap_output_data
 from .common import KNeighborsDispatchingBase
 
-if sklearn_check_version("0.24"):
-
-    class KNeighborsRegressor_(sklearn_KNeighborsRegressor):
-        if sklearn_check_version("1.2"):
-            _parameter_constraints: dict = {
-                **sklearn_KNeighborsRegressor._parameter_constraints
-            }
-
-        @_deprecate_positional_args
-        def __init__(
-            self,
-            n_neighbors=5,
-            *,
-            weights="uniform",
-            algorithm="auto",
-            leaf_size=30,
-            p=2,
-            metric="minkowski",
-            metric_params=None,
-            n_jobs=None,
-            **kwargs,
-        ):
-            super().__init__(
-                n_neighbors=n_neighbors,
-                algorithm=algorithm,
-                leaf_size=leaf_size,
-                metric=metric,
-                p=p,
-                metric_params=metric_params,
-                n_jobs=n_jobs,
-                **kwargs,
-            )
-            self.weights = (
-                weights if sklearn_check_version("1.0") else _check_weights(weights)
-            )
-
-elif sklearn_check_version("0.22"):
-    from sklearn.neighbors._base import SupervisedFloatMixin as BaseSupervisedFloatMixin
-
-    class KNeighborsRegressor_(sklearn_KNeighborsRegressor, BaseSupervisedFloatMixin):
-        @_deprecate_positional_args
-        def __init__(
-            self,
-            n_neighbors=5,
-            *,
-            weights="uniform",
-            algorithm="auto",
-            leaf_size=30,
-            p=2,
-            metric="minkowski",
-            metric_params=None,
-            n_jobs=None,
-            **kwargs,
-        ):
-            super().__init__(
-                n_neighbors=n_neighbors,
-                algorithm=algorithm,
-                leaf_size=leaf_size,
-                metric=metric,
-                p=p,
-                metric_params=metric_params,
-                n_jobs=n_jobs,
-                **kwargs,
-            )
-            self.weights = _check_weights(weights)
-
+if sklearn_check_version("1.6"):
+    from sklearn.utils.validation import validate_data
 else:
-    from sklearn.neighbors.base import SupervisedFloatMixin as BaseSupervisedFloatMixin
-
-    class KNeighborsRegressor_(sklearn_KNeighborsRegressor, BaseSupervisedFloatMixin):
-        @_deprecate_positional_args
-        def __init__(
-            self,
-            n_neighbors=5,
-            *,
-            weights="uniform",
-            algorithm="auto",
-            leaf_size=30,
-            p=2,
-            metric="minkowski",
-            metric_params=None,
-            n_jobs=None,
-            **kwargs,
-        ):
-            super().__init__(
-                n_neighbors=n_neighbors,
-                algorithm=algorithm,
-                leaf_size=leaf_size,
-                metric=metric,
-                p=p,
-                metric_params=metric_params,
-                n_jobs=n_jobs,
-                **kwargs,
-            )
-            self.weights = _check_weights(weights)
+    validate_data = _sklearn_KNeighborsRegressor._validate_data
 
 
-@control_n_jobs
-class KNeighborsRegressor(KNeighborsRegressor_, KNeighborsDispatchingBase):
+@control_n_jobs(decorated_methods=["fit", "predict", "kneighbors", "score"])
+class KNeighborsRegressor(KNeighborsDispatchingBase, _sklearn_KNeighborsRegressor):
+    __doc__ = _sklearn_KNeighborsRegressor.__doc__
     if sklearn_check_version("1.2"):
-        _parameter_constraints: dict = {**KNeighborsRegressor_._parameter_constraints}
+        _parameter_constraints: dict = {
+            **_sklearn_KNeighborsRegressor._parameter_constraints
+        }
 
     if sklearn_check_version("1.0"):
 
@@ -195,13 +95,12 @@ class KNeighborsRegressor(KNeighborsRegressor_, KNeighborsDispatchingBase):
             )
 
     def fit(self, X, y):
-        self._fit_validation(X, y)
         dispatch(
             self,
             "fit",
             {
                 "onedal": self.__class__._onedal_fit,
-                "sklearn": sklearn_KNeighborsRegressor.fit,
+                "sklearn": _sklearn_KNeighborsRegressor.fit,
             },
             X,
             y,
@@ -218,55 +117,45 @@ class KNeighborsRegressor(KNeighborsRegressor_, KNeighborsDispatchingBase):
             "predict",
             {
                 "onedal": self.__class__._onedal_predict,
-                "sklearn": sklearn_KNeighborsRegressor.predict,
+                "sklearn": _sklearn_KNeighborsRegressor.predict,
             },
             X,
         )
 
     @wrap_output_data
-    def kneighbors(self, X=None, n_neighbors=None, return_distance=True):
+    def score(self, X, y, sample_weight=None):
         check_is_fitted(self)
         if sklearn_check_version("1.0"):
             self._check_feature_names(X, reset=False)
         return dispatch(
             self,
-            "kneighbors",
+            "score",
             {
-                "onedal": self.__class__._onedal_kneighbors,
-                "sklearn": sklearn_KNeighborsRegressor.kneighbors,
+                "onedal": self.__class__._onedal_score,
+                "sklearn": _sklearn_KNeighborsRegressor.score,
             },
             X,
-            n_neighbors,
-            return_distance,
+            y,
+            sample_weight=sample_weight,
         )
 
     @wrap_output_data
-    def radius_neighbors(
-        self, X=None, radius=None, return_distance=True, sort_results=False
-    ):
-        _onedal_estimator = getattr(self, "_onedal_estimator", None)
-
-        if (
-            _onedal_estimator is not None
-            or getattr(self, "_tree", 0) is None
-            and self._fit_method == "kd_tree"
-        ):
-            if sklearn_check_version("0.24"):
-                sklearn_NearestNeighbors.fit(self, self._fit_X, getattr(self, "_y", None))
-            else:
-                sklearn_NearestNeighbors.fit(self, self._fit_X)
-        if sklearn_check_version("0.22"):
-            result = sklearn_NearestNeighbors.radius_neighbors(
-                self, X, radius, return_distance, sort_results
-            )
-        else:
-            result = sklearn_NearestNeighbors.radius_neighbors(
-                self, X, radius, return_distance
-            )
-
-        return result
+    def kneighbors(self, X=None, n_neighbors=None, return_distance=True):
+        check_is_fitted(self)
+        if sklearn_check_version("1.0") and X is not None:
+            self._check_feature_names(X, reset=False)
+        return dispatch(
+            self,
+            "kneighbors",
+            {
+                "onedal": self.__class__._onedal_kneighbors,
+                "sklearn": _sklearn_KNeighborsRegressor.kneighbors,
+            },
+            X,
+            n_neighbors=n_neighbors,
+            return_distance=return_distance,
+        )
 
-    @run_with_n_jobs
     def _onedal_fit(self, X, y, queue=None):
         onedal_params = {
             "n_neighbors": self.n_neighbors,
@@ -289,11 +178,9 @@ class KNeighborsRegressor(KNeighborsRegressor_, KNeighborsDispatchingBase):
 
         self._save_attributes()
 
-    @run_with_n_jobs
     def _onedal_predict(self, X, queue=None):
         return self._onedal_estimator.predict(X, queue=queue)
 
-    @run_with_n_jobs
     def _onedal_kneighbors(
         self, X=None, n_neighbors=None, return_distance=True, queue=None
     ):
@@ -301,6 +188,11 @@ class KNeighborsRegressor(KNeighborsRegressor_, KNeighborsDispatchingBase):
             X, n_neighbors, return_distance, queue=queue
         )
 
+    def _onedal_score(self, X, y, sample_weight=None, queue=None):
+        return r2_score(
+            y, self._onedal_predict(X, queue=queue), sample_weight=sample_weight
+        )
+
     def _save_attributes(self):
         self.n_features_in_ = self._onedal_estimator.n_features_in_
         self.n_samples_fit_ = self._onedal_estimator.n_samples_fit_
@@ -308,3 +200,8 @@ class KNeighborsRegressor(KNeighborsRegressor_, KNeighborsDispatchingBase):
         self._y = self._onedal_estimator._y
         self._fit_method = self._onedal_estimator._fit_method
         self._tree = self._onedal_estimator._tree
+
+    fit.__doc__ = _sklearn_KNeighborsRegressor.__doc__
+    predict.__doc__ = _sklearn_KNeighborsRegressor.predict.__doc__
+    kneighbors.__doc__ = _sklearn_KNeighborsRegressor.kneighbors.__doc__
+    score.__doc__ = _sklearn_KNeighborsRegressor.score.__doc__

{scikit_learn_intelex-2024.1.0.data → scikit_learn_intelex-2025.1.0.data}/data/Lib/site-packages/sklearnex/neighbors/knn_unsupervised.py

@@ -14,91 +14,29 @@
 # limitations under the License.
 # ===============================================================================
 
-try:
-    from packaging.version import Version
-except ImportError:
-    from distutils.version import LooseVersion as Version
-
-import warnings
-
-import numpy as np
-from sklearn import __version__ as sklearn_version
-from sklearn.neighbors._ball_tree import BallTree
-from sklearn.neighbors._base import VALID_METRICS
-from sklearn.neighbors._base import NeighborsBase as sklearn_NeighborsBase
-from sklearn.neighbors._kd_tree import KDTree
-from sklearn.neighbors._unsupervised import NearestNeighbors as sklearn_NearestNeighbors
+from sklearn.neighbors._unsupervised import NearestNeighbors as _sklearn_NearestNeighbors
 from sklearn.utils.validation import _deprecate_positional_args, check_is_fitted
 
-from daal4py.sklearn._utils import control_n_jobs, run_with_n_jobs, sklearn_check_version
+from daal4py.sklearn._n_jobs_support import control_n_jobs
+from daal4py.sklearn._utils import sklearn_check_version
 from onedal.neighbors import NearestNeighbors as onedal_NearestNeighbors
-from onedal.utils import _check_array, _num_features, _num_samples
 
 from .._device_offload import dispatch, wrap_output_data
 from .common import KNeighborsDispatchingBase
 
-if sklearn_check_version("0.22") and Version(sklearn_version) < Version("0.23"):
-
-    class NearestNeighbors_(sklearn_NearestNeighbors):
-        def __init__(
-            self,
-            n_neighbors=5,
-            radius=1.0,
-            algorithm="auto",
-            leaf_size=30,
-            metric="minkowski",
-            p=2,
-            metric_params=None,
-            n_jobs=None,
-        ):
-            super().__init__(
-                n_neighbors=n_neighbors,
-                radius=radius,
-                algorithm=algorithm,
-                leaf_size=leaf_size,
-                metric=metric,
-                p=p,
-                metric_params=metric_params,
-                n_jobs=n_jobs,
-            )
-
+if sklearn_check_version("1.6"):
+    from sklearn.utils.validation import validate_data
 else:
+    validate_data = _sklearn_NearestNeighbors._validate_data
 
-    class NearestNeighbors_(sklearn_NearestNeighbors):
-        if sklearn_check_version("1.2"):
-            _parameter_constraints: dict = {
-                **sklearn_NearestNeighbors._parameter_constraints
-            }
 
-        @_deprecate_positional_args
-        def __init__(
-            self,
-            *,
-            n_neighbors=5,
-            radius=1.0,
-            algorithm="auto",
-            leaf_size=30,
-            metric="minkowski",
-            p=2,
-            metric_params=None,
-            n_jobs=None,
-        ):
-            super().__init__(
-                n_neighbors=n_neighbors,
-                radius=radius,
-                algorithm=algorithm,
-                leaf_size=leaf_size,
-                metric=metric,
-                p=p,
-                metric_params=metric_params,
-                n_jobs=n_jobs,
-            )
-
-
-@control_n_jobs
-class NearestNeighbors(NearestNeighbors_, KNeighborsDispatchingBase):
+@control_n_jobs(decorated_methods=["fit", "kneighbors", "radius_neighbors"])
+class NearestNeighbors(KNeighborsDispatchingBase, _sklearn_NearestNeighbors):
+    __doc__ = _sklearn_NearestNeighbors.__doc__
     if sklearn_check_version("1.2"):
-        _parameter_constraints: dict = {**NearestNeighbors_._parameter_constraints}
+        _parameter_constraints: dict = {
+            **_sklearn_NearestNeighbors._parameter_constraints
+        }
 
     @_deprecate_positional_args
     def __init__(
@@ -124,13 +62,12 @@ class NearestNeighbors(NearestNeighbors_, KNeighborsDispatchingBase):
         )
 
     def fit(self, X, y=None):
-        self._fit_validation(X, y)
         dispatch(
             self,
             "fit",
             {
                 "onedal": self.__class__._onedal_fit,
-                "sklearn": sklearn_NearestNeighbors.fit,
+                "sklearn": _sklearn_NearestNeighbors.fit,
             },
             X,
             None,
@@ -147,40 +84,53 @@ class NearestNeighbors(NearestNeighbors_, KNeighborsDispatchingBase):
             "kneighbors",
             {
                 "onedal": self.__class__._onedal_kneighbors,
-                "sklearn": sklearn_NearestNeighbors.kneighbors,
+                "sklearn": _sklearn_NearestNeighbors.kneighbors,
             },
             X,
-            n_neighbors,
-            return_distance,
+            n_neighbors=n_neighbors,
+            return_distance=return_distance,
         )
 
     @wrap_output_data
     def radius_neighbors(
         self, X=None, radius=None, return_distance=True, sort_results=False
     ):
-        _onedal_estimator = getattr(self, "_onedal_estimator", None)
-
         if (
-            _onedal_estimator is not None
+            hasattr(self, "_onedal_estimator")
             or getattr(self, "_tree", 0) is None
             and self._fit_method == "kd_tree"
         ):
-            if sklearn_check_version("0.24"):
-                sklearn_NearestNeighbors.fit(self, self._fit_X, getattr(self, "_y", None))
-            else:
-                sklearn_NearestNeighbors.fit(self, self._fit_X)
-        if sklearn_check_version("0.22"):
-            result = sklearn_NearestNeighbors.radius_neighbors(
-                self, X, radius, return_distance, sort_results
-            )
-        else:
-            result = sklearn_NearestNeighbors.radius_neighbors(
-                self, X, radius, return_distance
-            )
-
-        return result
-
-    @run_with_n_jobs
+            _sklearn_NearestNeighbors.fit(self, self._fit_X, getattr(self, "_y", None))
+        check_is_fitted(self)
+        return dispatch(
+            self,
+            "radius_neighbors",
+            {
+                "onedal": None,
+                "sklearn": _sklearn_NearestNeighbors.radius_neighbors,
+            },
+            X,
+            radius=radius,
+            return_distance=return_distance,
+            sort_results=sort_results,
+        )
+
+    def radius_neighbors_graph(
+        self, X=None, radius=None, mode="connectivity", sort_results=False
+    ):
+        return dispatch(
+            self,
+            "radius_neighbors_graph",
+            {
+                "onedal": None,
+                "sklearn": _sklearn_NearestNeighbors.radius_neighbors_graph,
+            },
+            X,
+            radius=radius,
+            mode=mode,
+            sort_results=sort_results,
+        )
+
     def _onedal_fit(self, X, y=None, queue=None):
         onedal_params = {
             "n_neighbors": self.n_neighbors,
@@ -202,11 +152,9 @@ class NearestNeighbors(NearestNeighbors_, KNeighborsDispatchingBase):
 
         self._save_attributes()
 
-    @run_with_n_jobs
     def _onedal_predict(self, X, queue=None):
         return self._onedal_estimator.predict(X, queue=queue)
 
-    @run_with_n_jobs
     def _onedal_kneighbors(
         self, X=None, n_neighbors=None, return_distance=True, queue=None
     ):
@@ -221,3 +169,10 @@ class NearestNeighbors(NearestNeighbors_, KNeighborsDispatchingBase):
         self._fit_X = self._onedal_estimator._fit_X
         self._fit_method = self._onedal_estimator._fit_method
         self._tree = self._onedal_estimator._tree
+
+    fit.__doc__ = _sklearn_NearestNeighbors.__doc__
+    kneighbors.__doc__ = _sklearn_NearestNeighbors.kneighbors.__doc__
+    radius_neighbors.__doc__ = _sklearn_NearestNeighbors.radius_neighbors.__doc__
+    radius_neighbors_graph.__doc__ = (
+        _sklearn_NearestNeighbors.radius_neighbors_graph.__doc__
+    )

{scikit_learn_intelex-2024.1.0.data → scikit_learn_intelex-2025.1.0.data}/data/Lib/site-packages/sklearnex/neighbors/tests/test_neighbors.py

@@ -14,7 +14,6 @@
 # limitations under the License.
 # ===============================================================================
 
-import numpy as np
 import pytest
 from numpy.testing import assert_allclose
 
@@ -23,12 +22,16 @@ from onedal.tests.utils._dataframes_support import (
     _convert_to_dataframe,
     get_dataframes_and_queues,
 )
+from sklearnex.neighbors import (
+    KNeighborsClassifier,
+    KNeighborsRegressor,
+    LocalOutlierFactor,
+    NearestNeighbors,
+)
 
 
 @pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
 def test_sklearnex_import_knn_classifier(dataframe, queue):
-    from sklearnex.neighbors import KNeighborsClassifier
-
     X = _convert_to_dataframe([[0], [1], [2], [3]], sycl_queue=queue, target_df=dataframe)
     y = _convert_to_dataframe([0, 0, 1, 1], sycl_queue=queue, target_df=dataframe)
     neigh = KNeighborsClassifier(n_neighbors=3).fit(X, y)
@@ -40,45 +43,40 @@ def test_sklearnex_import_knn_classifier(dataframe, queue):
 
 @pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
 def test_sklearnex_import_knn_regression(dataframe, queue):
-    from sklearnex.neighbors import KNeighborsRegressor
-
     X = _convert_to_dataframe([[0], [1], [2], [3]], sycl_queue=queue, target_df=dataframe)
     y = _convert_to_dataframe([0, 0, 1, 1], sycl_queue=queue, target_df=dataframe)
     neigh = KNeighborsRegressor(n_neighbors=2).fit(X, y)
     y_test = _convert_to_dataframe([[1.5]], sycl_queue=queue, target_df=dataframe)
-    pred = _as_numpy(neigh.predict(y_test))
+    pred = _as_numpy(neigh.predict(y_test)).squeeze()
     assert "sklearnex" in neigh.__module__
-    assert_allclose(pred, [0.5])
+    assert_allclose(pred, 0.5)
 
 
-# TODO:
-# investigate failure for `dpnp.ndarrays` and `dpctl.tensors`.
+@pytest.mark.parametrize("algorithm", ["auto", "brute"])
+@pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
 @pytest.mark.parametrize(
-    "dataframe,queue", get_dataframes_and_queues(dataframe_filter_="numpy")
+    "estimator",
+    [LocalOutlierFactor, NearestNeighbors],
 )
-def test_sklearnex_import_nn(dataframe, queue):
-    from sklearnex.neighbors import NearestNeighbors
-
+def test_sklearnex_kneighbors(algorithm, estimator, dataframe, queue):
     X = [[0, 0, 2], [1, 0, 0], [0, 0, 1]]
     X = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
     test = _convert_to_dataframe([[0, 0, 1.3]], sycl_queue=queue, target_df=dataframe)
-    neigh = NearestNeighbors(n_neighbors=2).fit(X)
+    neigh = estimator(n_neighbors=2, algorithm=algorithm).fit(X)
     result = neigh.kneighbors(test, 2, return_distance=False)
     result = _as_numpy(result)
     assert "sklearnex" in neigh.__module__
     assert_allclose(result, [[2, 0]])
+    result = neigh.kneighbors()
 
 
 @pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
 def test_sklearnex_import_lof(dataframe, queue):
-    from sklearnex.neighbors import LocalOutlierFactor
-
     X = [[7, 7, 7], [1, 0, 0], [0, 0, 1], [0, 0, 1]]
     X = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
     lof = LocalOutlierFactor(n_neighbors=2)
     result = lof.fit_predict(X)
     result = _as_numpy(result)
-    assert hasattr(lof, "_knn")
+    assert hasattr(lof, "_onedal_estimator")
     assert "sklearnex" in lof.__module__
-    assert "sklearnex" in lof._knn.__module__
     assert_allclose(result, [-1, 1, 1, 1])

{scikit_learn_intelex-2024.1.0.data/data/Lib/site-packages/sklearnex/spmd/decomposition → scikit_learn_intelex-2025.1.0.data/data/Lib/site-packages/sklearnex/preview}/__init__.py

@@ -14,6 +14,4 @@
 # limitations under the License.
 # ==============================================================================
 
-from .pca import PCA
-
-__all__ = ["PCA"]
+__all__ = ["covariance", "decomposition", "linear_model"]