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

{scikit_learn_intelex-2024.1.0.data/data/Lib/site-packages/sklearnex/preview → scikit_learn_intelex-2025.1.0.data/data/Lib/site-packages/sklearnex}/linear_model/logistic_regression.py

@@ -1,5 +1,5 @@
 # ===============================================================================
-# Copyright 2023 Intel Corporation
+# Copyright 2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,47 +17,60 @@
 import logging
 from abc import ABC
 
-import sklearn.linear_model._logistic as logistic_module
-
 from daal4py.sklearn._utils import daal_check_version
 from daal4py.sklearn.linear_model.logistic_path import (
-    LogisticRegression,
-    daal4py_predict,
-    logistic_regression_path,
+    LogisticRegression as _daal4py_LogisticRegression,
 )
 
-
-class BaseLogisticRegression(ABC):
-    def _save_attributes(self):
-        assert hasattr(self, "_onedal_estimator")
-        self.classes_ = self._onedal_estimator.classes_
-        self.coef_ = self._onedal_estimator.coef_
-        self.intercept_ = self._onedal_estimator.intercept_
-        self.n_features_in_ = self._onedal_estimator.n_features_in_
-        self.n_iter_ = self._onedal_estimator.n_iter_
-
-
 if daal_check_version((2024, "P", 1)):
     import numpy as np
     from scipy.sparse import issparse
-    from sklearn.linear_model import LogisticRegression as sklearn_LogisticRegression
-    from sklearn.utils.validation import check_X_y
+    from sklearn.linear_model import LogisticRegression as _sklearn_LogisticRegression
+    from sklearn.metrics import accuracy_score
+    from sklearn.utils.multiclass import type_of_target
+    from sklearn.utils.validation import check_array, check_is_fitted, check_X_y
 
+    from daal4py.sklearn._n_jobs_support import control_n_jobs
     from daal4py.sklearn._utils import sklearn_check_version
+    from daal4py.sklearn.linear_model.logistic_path import daal4py_fit, daal4py_predict
     from onedal.linear_model import LogisticRegression as onedal_LogisticRegression
-    from onedal.utils import _num_features, _num_samples
-
-    from ..._device_offload import dispatch, wrap_output_data
-    from ..._utils import PatchingConditionsChain, get_patch_message
-    from ...utils.validation import _assert_all_finite
-
-    class LogisticRegression(sklearn_LogisticRegression, BaseLogisticRegression):
-        __doc__ = sklearn_LogisticRegression.__doc__
-        intercept_, coef_, n_iter_ = None, None, None
+    from onedal.utils import _num_samples
+
+    from .._config import get_config
+    from .._device_offload import dispatch, wrap_output_data
+    from .._utils import PatchingConditionsChain, get_patch_message
+
+    if sklearn_check_version("1.6"):
+        from sklearn.utils.validation import validate_data
+    else:
+        validate_data = _sklearn_LogisticRegression._validate_data
+
+    _sparsity_enabled = daal_check_version((2024, "P", 700))
+
+    class BaseLogisticRegression(ABC):
+        def _save_attributes(self):
+            assert hasattr(self, "_onedal_estimator")
+            self.classes_ = self._onedal_estimator.classes_
+            self.coef_ = self._onedal_estimator.coef_
+            self.intercept_ = self._onedal_estimator.intercept_
+            self.n_features_in_ = self._onedal_estimator.n_features_in_
+            self.n_iter_ = self._onedal_estimator.n_iter_
+
+    @control_n_jobs(
+        decorated_methods=[
+            "fit",
+            "predict",
+            "predict_proba",
+            "predict_log_proba",
+            "score",
+        ]
+    )
+    class LogisticRegression(_sklearn_LogisticRegression, BaseLogisticRegression):
+        __doc__ = _sklearn_LogisticRegression.__doc__
 
         if sklearn_check_version("1.2"):
             _parameter_constraints: dict = {
-                **sklearn_LogisticRegression._parameter_constraints
+                **_sklearn_LogisticRegression._parameter_constraints
             }
 
         def __init__(
@@ -71,9 +84,9 @@ if daal_check_version((2024, "P", 1)):
             intercept_scaling=1,
             class_weight=None,
             random_state=None,
-            solver="lbfgs" if sklearn_check_version("0.22") else "liblinear",
+            solver="lbfgs",
             max_iter=100,
-            multi_class="auto" if sklearn_check_version("0.22") else "ovr",
+            multi_class="deprecated" if sklearn_check_version("1.5") else "auto",
             verbose=0,
             warm_start=False,
             n_jobs=None,
@@ -97,9 +110,9 @@ if daal_check_version((2024, "P", 1)):
                 l1_ratio=l1_ratio,
             )
 
+        _onedal_cpu_fit = daal4py_fit
+
         def fit(self, X, y, sample_weight=None):
-            if sklearn_check_version("1.0"):
-                self._check_feature_names(X, reset=True)
             if sklearn_check_version("1.2"):
                 self._validate_params()
             dispatch(
@@ -107,7 +120,7 @@ if daal_check_version((2024, "P", 1)):
                 "fit",
                 {
                     "onedal": self.__class__._onedal_fit,
-                    "sklearn": sklearn_LogisticRegression.fit,
+                    "sklearn": _sklearn_LogisticRegression.fit,
                 },
                 X,
                 y,
@@ -117,58 +130,62 @@ if daal_check_version((2024, "P", 1)):
 
         @wrap_output_data
         def predict(self, X):
-            if sklearn_check_version("1.0"):
-                self._check_feature_names(X, reset=False)
+            check_is_fitted(self)
             return dispatch(
                 self,
                 "predict",
                 {
                     "onedal": self.__class__._onedal_predict,
-                    "sklearn": sklearn_LogisticRegression.predict,
+                    "sklearn": _sklearn_LogisticRegression.predict,
                 },
                 X,
             )
 
         @wrap_output_data
         def predict_proba(self, X):
-            if sklearn_check_version("1.0"):
-                self._check_feature_names(X, reset=False)
+            check_is_fitted(self)
             return dispatch(
                 self,
-                "predict",
+                "predict_proba",
                 {
                     "onedal": self.__class__._onedal_predict_proba,
-                    "sklearn": sklearn_LogisticRegression.predict_proba,
+                    "sklearn": _sklearn_LogisticRegression.predict_proba,
                 },
                 X,
             )
 
         @wrap_output_data
         def predict_log_proba(self, X):
-            if sklearn_check_version("1.0"):
-                self._check_feature_names(X, reset=False)
+            check_is_fitted(self)
             return dispatch(
                 self,
-                "predict",
+                "predict_log_proba",
                 {
                     "onedal": self.__class__._onedal_predict_log_proba,
-                    "sklearn": sklearn_LogisticRegression.predict_log_proba,
+                    "sklearn": _sklearn_LogisticRegression.predict_log_proba,
                 },
                 X,
             )
 
-        def _test_type_and_finiteness(self, X_in):
-            X = np.asarray(X_in)
-
-            dtype = X.dtype
-            if "complex" in str(type(dtype)):
-                return False
+        @wrap_output_data
+        def score(self, X, y, sample_weight=None):
+            check_is_fitted(self)
+            return dispatch(
+                self,
+                "score",
+                {
+                    "onedal": self.__class__._onedal_score,
+                    "sklearn": _sklearn_LogisticRegression.score,
+                },
+                X,
+                y,
+                sample_weight=sample_weight,
+            )
 
-            try:
-                _assert_all_finite(X)
-            except BaseException:
-                return False
-            return True
+        def _onedal_score(self, X, y, sample_weight=None, queue=None):
+            return accuracy_score(
+                y, self._onedal_predict(X, queue=queue), sample_weight=sample_weight
+            )
 
         def _onedal_gpu_fit_supported(self, method_name, *data):
             assert method_name == "fit"
@@ -180,11 +197,19 @@ if daal_check_version((2024, "P", 1)):
                 f"sklearn.linear_model.{class_name}.fit"
             )
 
-            dal_ready = patching_status.and_conditions(
+            target_type = (
+                type_of_target(y, input_name="y")
+                if sklearn_check_version("1.1")
+                else type_of_target(y)
+            )
+            patching_status.and_conditions(
                 [
                     (self.penalty == "l2", "Only l2 penalty is supported."),
                     (self.dual == False, "dual=True is not supported."),
-                    (self.intercept_scaling == 1, "Intercept scaling is not supported."),
+                    (
+                        self.intercept_scaling == 1,
+                        "Intercept scaling is not supported.",
+                    ),
                     (self.class_weight is None, "Class weight is not supported"),
                     (self.solver == "newton-cg", "Only newton-cg solver is supported."),
                     (
@@ -194,57 +219,49 @@ if daal_check_version((2024, "P", 1)):
                     (self.warm_start == False, "Warm start is not supported."),
                     (self.l1_ratio is None, "l1 ratio is not supported."),
                     (sample_weight is None, "Sample weight is not supported."),
+                    (
+                        target_type == "binary",
+                        "Only binary classification is supported",
+                    ),
                 ]
             )
 
-            if not dal_ready:
-                return patching_status
-
-            if not patching_status.and_condition(
-                self._test_type_and_finiteness(X), "Input X is not supported."
-            ):
-                return patching_status
-
-            patching_status.and_condition(
-                self._test_type_and_finiteness(y), "Input y is not supported."
-            )
-
             return patching_status
 
         def _onedal_gpu_predict_supported(self, method_name, *data):
-            assert method_name in ["predict", "predict_proba", "predict_log_proba"]
-            assert len(data) == 1
+            assert method_name in [
+                "predict",
+                "predict_proba",
+                "predict_log_proba",
+                "score",
+            ]
 
             class_name = self.__class__.__name__
             patching_status = PatchingConditionsChain(
                 f"sklearn.linear_model.{class_name}.{method_name}"
             )
 
-            n_samples = _num_samples(*data)
-            model_is_sparse = issparse(self.coef_) or (
-                self.fit_intercept and issparse(self.intercept_)
-            )
+            n_samples = _num_samples(data[0])
             dal_ready = patching_status.and_conditions(
                 [
                     (n_samples > 0, "Number of samples is less than 1."),
-                    (not issparse(*data), "Sparse input is not supported."),
-                    (not model_is_sparse, "Sparse coefficients are not supported."),
-                    (hasattr(self, "_onedal_estimator"), "oneDAL model was not trained."),
+                    (
+                        (not any([issparse(i) for i in data])) or _sparsity_enabled,
+                        "Sparse input is not supported.",
+                    ),
+                    (
+                        hasattr(self, "_onedal_estimator"),
+                        "oneDAL model was not trained.",
+                    ),
                 ]
             )
-            if not dal_ready:
-                return patching_status
-
-            patching_status.and_condition(
-                self._test_type_and_finiteness(*data), "Input X is not supported."
-            )
 
             return patching_status
 
         def _onedal_gpu_supported(self, method_name, *data):
             if method_name == "fit":
                 return self._onedal_gpu_fit_supported(method_name, *data)
-            if method_name in ["predict", "predict_proba", "predict_log_proba"]:
+            if method_name in ["predict", "predict_proba", "predict_log_proba", "score"]:
                 return self._onedal_gpu_predict_supported(method_name, *data)
             raise RuntimeError(
                 f"Unknown method {method_name} in {self.__class__.__name__}"
@@ -268,83 +285,127 @@ if daal_check_version((2024, "P", 1)):
             }
             self._onedal_estimator = onedal_LogisticRegression(**onedal_params)
 
-        def _onedal_cpu_fit(self, X, y, sample_weight):
-            which, what = logistic_module, "_logistic_regression_path"
-            replacer = logistic_regression_path
-            descriptor = getattr(which, what, None)
-            setattr(which, what, replacer)
-            clf = super().fit(X, y, sample_weight)
-            setattr(which, what, descriptor)
-            return clf
-
-        def _onedal_fit(self, X, y, sample_weight, queue=None):
+        def _onedal_fit(self, X, y, sample_weight=None, queue=None):
             if queue is None or queue.sycl_device.is_cpu:
                 return self._onedal_cpu_fit(X, y, sample_weight)
 
             assert sample_weight is None
 
-            check_params = {
-                "X": X,
-                "y": y,
-                "dtype": [np.float64, np.float32],
-                "accept_sparse": False,
-                "multi_output": False,
-                "force_all_finite": True,
-            }
-            if sklearn_check_version("1.2"):
-                X, y = self._validate_data(**check_params)
+            if sklearn_check_version("1.0"):
+                X, y = validate_data(
+                    self,
+                    X,
+                    y,
+                    accept_sparse=_sparsity_enabled,
+                    accept_large_sparse=_sparsity_enabled,
+                    dtype=[np.float64, np.float32],
+                )
             else:
-                X, y = check_X_y(**check_params)
+                X, y = check_X_y(
+                    X,
+                    y,
+                    accept_sparse=_sparsity_enabled,
+                    accept_large_sparse=_sparsity_enabled,
+                    dtype=[np.float64, np.float32],
+                )
+
             self._initialize_onedal_estimator()
-            try:
+            if get_config()["allow_sklearn_after_onedal"]:
+                try:
+                    self._onedal_estimator.fit(X, y, queue=queue)
+                    self._save_attributes()
+                except RuntimeError:
+                    logging.getLogger("sklearnex").info(
+                        f"{self.__class__.__name__}.fit "
+                        + get_patch_message("sklearn_after_onedal")
+                    )
+
+                    del self._onedal_estimator
+                    super().fit(X, y)
+            else:
                 self._onedal_estimator.fit(X, y, queue=queue)
                 self._save_attributes()
-            except RuntimeError:
-                logging.getLogger("sklearnex").info(
-                    f"{self.__class__.__name__}.fit "
-                    + get_patch_message("sklearn_after_onedal")
-                )
-
-                del self._onedal_estimator
-                super().fit(X, y)
 
         def _onedal_predict(self, X, queue=None):
             if queue is None or queue.sycl_device.is_cpu:
                 return daal4py_predict(self, X, "computeClassLabels")
 
-            X = self._validate_data(X, accept_sparse=False, reset=False)
-            if not hasattr(self, "_onedal_estimator"):
-                self._initialize_onedal_estimator()
-                self._onedal_estimator.coef_ = self.coef_
-                self._onedal_estimator.intercept_ = self.intercept_
-                self._onedal_estimator.classes_ = self.classes_
+            if sklearn_check_version("1.0"):
+                X = validate_data(
+                    self,
+                    X,
+                    reset=False,
+                    accept_sparse=_sparsity_enabled,
+                    accept_large_sparse=_sparsity_enabled,
+                    dtype=[np.float64, np.float32],
+                )
+            else:
+                X = check_array(
+                    X,
+                    accept_sparse=_sparsity_enabled,
+                    accept_large_sparse=_sparsity_enabled,
+                    dtype=[np.float64, np.float32],
+                )
 
+            assert hasattr(self, "_onedal_estimator")
             return self._onedal_estimator.predict(X, queue=queue)
 
         def _onedal_predict_proba(self, X, queue=None):
             if queue is None or queue.sycl_device.is_cpu:
                 return daal4py_predict(self, X, "computeClassProbabilities")
-            X = self._validate_data(X, accept_sparse=False, reset=False)
-            if not hasattr(self, "_onedal_estimator"):
-                self._initialize_onedal_estimator()
-                self._onedal_estimator.coef_ = self.coef_
-                self._onedal_estimator.intercept_ = self.intercept_
 
+            if sklearn_check_version("1.0"):
+                X = validate_data(
+                    self,
+                    X,
+                    reset=False,
+                    accept_sparse=_sparsity_enabled,
+                    accept_large_sparse=_sparsity_enabled,
+                    dtype=[np.float64, np.float32],
+                )
+            else:
+                X = check_array(
+                    X,
+                    accept_sparse=_sparsity_enabled,
+                    accept_large_sparse=_sparsity_enabled,
+                    dtype=[np.float64, np.float32],
+                )
+
+            assert hasattr(self, "_onedal_estimator")
             return self._onedal_estimator.predict_proba(X, queue=queue)
 
         def _onedal_predict_log_proba(self, X, queue=None):
             if queue is None or queue.sycl_device.is_cpu:
                 return daal4py_predict(self, X, "computeClassLogProbabilities")
-            X = self._validate_data(X, accept_sparse=False, reset=False)
-            if not hasattr(self, "_onedal_estimator"):
-                self._initialize_onedal_estimator()
-                self._onedal_estimator.coef_ = self.coef_
-                self._onedal_estimator.intercept_ = self.intercept_
 
+            if sklearn_check_version("1.0"):
+                X = validate_data(
+                    self,
+                    X,
+                    reset=False,
+                    accept_sparse=_sparsity_enabled,
+                    accept_large_sparse=_sparsity_enabled,
+                    dtype=[np.float64, np.float32],
+                )
+            else:
+                X = check_array(
+                    X,
+                    accept_sparse=_sparsity_enabled,
+                    accept_large_sparse=_sparsity_enabled,
+                    dtype=[np.float64, np.float32],
+                )
+
+            assert hasattr(self, "_onedal_estimator")
             return self._onedal_estimator.predict_log_proba(X, queue=queue)
 
+        fit.__doc__ = _sklearn_LogisticRegression.fit.__doc__
+        predict.__doc__ = _sklearn_LogisticRegression.predict.__doc__
+        predict_proba.__doc__ = _sklearn_LogisticRegression.predict_proba.__doc__
+        predict_log_proba.__doc__ = _sklearn_LogisticRegression.predict_log_proba.__doc__
+        score.__doc__ = _sklearn_LogisticRegression.score.__doc__
+
 else:
-    from daal4py.sklearn.linear_model import LogisticRegression
+    LogisticRegression = _daal4py_LogisticRegression
 
     logging.warning(
         "Sklearnex LogisticRegression requires oneDAL version >= 2024.0.1 "

{scikit_learn_intelex-2024.1.0.data → scikit_learn_intelex-2025.1.0.data}/data/Lib/site-packages/sklearnex/linear_model/ridge.py

@@ -15,3 +15,10 @@
 # ===============================================================================
 
 from daal4py.sklearn.linear_model import Ridge
+from onedal._device_offload import support_input_format
+
+# Note: `sklearnex.linear_model.Ridge` only has functional
+# sycl GPU support. No GPU device will be offloaded.
+Ridge.fit = support_input_format(queue_param=False)(Ridge.fit)
+Ridge.predict = support_input_format(queue_param=False)(Ridge.predict)
+Ridge.score = support_input_format(queue_param=False)(Ridge.score)