scikit-learn-intelex 2024.0.1__py38-none-manylinux1_x86_64.whl → 2024.2.0__py38-none-manylinux1_x86_64.whl

sklearnex/ensemble/_forest.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ==============================================================================
 # Copyright 2021 Intel Corporation
 #
@@ -43,6 +42,7 @@ from sklearn.utils.validation import (
     check_X_y,
 )
 
+from daal4py.sklearn._n_jobs_support import control_n_jobs
 from daal4py.sklearn._utils import (
     check_tree_nodes,
     daal_check_version,
@@ -114,6 +114,8 @@ class BaseForest(ABC):
             # [:, np.newaxis] that does not.
             y = np.reshape(y, (-1, 1))
 
+        self._n_samples, self.n_outputs_ = y.shape
+
         y, expanded_class_weight = self._validate_y_class_weight(y)
 
         self.n_features_in_ = X.shape[1]
@@ -189,7 +191,16 @@ class BaseForest(ABC):
                 self.oob_decision_function_ = (
                     self._onedal_estimator.oob_decision_function_
                 )
-
+        if self.bootstrap:
+            self._n_samples_bootstrap = max(
+                round(
+                    self._onedal_estimator.observations_per_tree_fraction
+                    * self._n_samples
+                ),
+                1,
+            )
+        else:
+            self._n_samples_bootstrap = None
         self._validate_estimator()
         return self
 
@@ -1122,6 +1133,7 @@ class ForestRegressor(sklearn_ForestRegressor, BaseForest):
     predict.__doc__ = sklearn_ForestRegressor.predict.__doc__
 
 
+@control_n_jobs(decorated_methods=["fit", "predict", "predict_proba"])
 class RandomForestClassifier(ForestClassifier):
     __doc__ = sklearn_RandomForestClassifier.__doc__
     _onedal_factory = onedal_RandomForestClassifier
@@ -1331,6 +1343,7 @@ class RandomForestClassifier(ForestClassifier):
             self.min_bin_size = min_bin_size
 
 
+@control_n_jobs(decorated_methods=["fit", "predict"])
 class RandomForestRegressor(ForestRegressor):
     __doc__ = sklearn_RandomForestRegressor.__doc__
     _onedal_factory = onedal_RandomForestRegressor
@@ -1531,6 +1544,7 @@ class RandomForestRegressor(ForestRegressor):
             self.min_bin_size = min_bin_size
 
 
+@control_n_jobs(decorated_methods=["fit", "predict", "predict_proba"])
 class ExtraTreesClassifier(ForestClassifier):
     __doc__ = sklearn_ExtraTreesClassifier.__doc__
     _onedal_factory = onedal_ExtraTreesClassifier
@@ -1740,6 +1754,7 @@ class ExtraTreesClassifier(ForestClassifier):
             self.min_bin_size = min_bin_size
 
 
+@control_n_jobs(decorated_methods=["fit", "predict"])
 class ExtraTreesRegressor(ForestRegressor):
     __doc__ = sklearn_ExtraTreesRegressor.__doc__
     _onedal_factory = onedal_ExtraTreesRegressor

sklearnex/ensemble/tests/test_forest.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2023 Intel Corporation
 #

sklearnex/glob/__main__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/glob/dispatcher.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/linear_model/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #
@@ -17,14 +16,13 @@
 
 from .coordinate_descent import ElasticNet, Lasso
 from .linear import LinearRegression
-from .logistic_path import LogisticRegression, logistic_regression_path
+from .logistic_regression import LogisticRegression
 from .ridge import Ridge
 
 __all__ = [
     "Ridge",
     "LinearRegression",
     "LogisticRegression",
-    "logistic_regression_path",
     "ElasticNet",
     "Lasso",
 ]

sklearnex/linear_model/coordinate_descent.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/linear_model/linear.py

@@ -65,10 +65,15 @@ if daal_check_version((2023, "P", 100)):
     import numpy as np
     from sklearn.linear_model import LinearRegression as sklearn_LinearRegression
 
+    from daal4py.sklearn._n_jobs_support import control_n_jobs
     from daal4py.sklearn._utils import get_dtype, make2d, sklearn_check_version
 
     from .._device_offload import dispatch, wrap_output_data
-    from .._utils import PatchingConditionsChain, get_patch_message
+    from .._utils import (
+        PatchingConditionsChain,
+        get_patch_message,
+        register_hyperparameters,
+    )
     from ..utils.validation import _assert_all_finite
 
     if sklearn_check_version("1.0") and not sklearn_check_version("1.2"):
@@ -78,9 +83,12 @@ if daal_check_version((2023, "P", 100)):
     from sklearn.exceptions import NotFittedError
     from sklearn.utils.validation import _deprecate_positional_args, check_X_y
 
+    from onedal.common.hyperparameters import get_hyperparameters
     from onedal.linear_model import LinearRegression as onedal_LinearRegression
     from onedal.utils import _num_features, _num_samples
 
+    @register_hyperparameters({"fit": get_hyperparameters("linear_regression", "train")})
+    @control_n_jobs(decorated_methods=["fit", "predict"])
     class LinearRegression(sklearn_LinearRegression, BaseLinearRegression):
         __doc__ = sklearn_LinearRegression.__doc__
         intercept_, coef_ = None, None

sklearnex/linear_model/logistic_path.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/linear_model/logistic_regression.py

@@ -0,0 +1,333 @@
+# ===============================================================================
+# 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ===============================================================================
+
+import logging
+from abc import ABC
+
+from daal4py.sklearn._utils import daal_check_version
+from daal4py.sklearn.linear_model.logistic_path import (
+    LogisticRegression as LogisticRegression_daal4py,
+)
+from daal4py.sklearn.linear_model.logistic_path import daal4py_fit, daal4py_predict
+
+
+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 daal4py.sklearn._n_jobs_support import control_n_jobs
+    from daal4py.sklearn._utils import sklearn_check_version
+    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
+
+    @control_n_jobs(
+        decorated_methods=["fit", "predict", "predict_proba", "predict_log_proba"]
+    )
+    class LogisticRegression(sklearn_LogisticRegression, BaseLogisticRegression):
+        __doc__ = sklearn_LogisticRegression.__doc__
+        intercept_, coef_, n_iter_ = None, None, None
+
+        if sklearn_check_version("1.2"):
+            _parameter_constraints: dict = {
+                **sklearn_LogisticRegression._parameter_constraints
+            }
+
+        def __init__(
+            self,
+            penalty="l2",
+            *,
+            dual=False,
+            tol=1e-4,
+            C=1.0,
+            fit_intercept=True,
+            intercept_scaling=1,
+            class_weight=None,
+            random_state=None,
+            solver="lbfgs" if sklearn_check_version("0.22") else "liblinear",
+            max_iter=100,
+            multi_class="auto" if sklearn_check_version("0.22") else "ovr",
+            verbose=0,
+            warm_start=False,
+            n_jobs=None,
+            l1_ratio=None,
+        ):
+            super().__init__(
+                penalty=penalty,
+                dual=dual,
+                tol=tol,
+                C=C,
+                fit_intercept=fit_intercept,
+                intercept_scaling=intercept_scaling,
+                class_weight=class_weight,
+                random_state=random_state,
+                solver=solver,
+                max_iter=max_iter,
+                multi_class=multi_class,
+                verbose=verbose,
+                warm_start=warm_start,
+                n_jobs=n_jobs,
+                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(
+                self,
+                "fit",
+                {
+                    "onedal": self.__class__._onedal_fit,
+                    "sklearn": sklearn_LogisticRegression.fit,
+                },
+                X,
+                y,
+                sample_weight,
+            )
+            return self
+
+        @wrap_output_data
+        def predict(self, X):
+            if sklearn_check_version("1.0"):
+                self._check_feature_names(X, reset=False)
+            return dispatch(
+                self,
+                "predict",
+                {
+                    "onedal": self.__class__._onedal_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)
+            return dispatch(
+                self,
+                "predict",
+                {
+                    "onedal": self.__class__._onedal_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)
+            return dispatch(
+                self,
+                "predict",
+                {
+                    "onedal": self.__class__._onedal_predict_log_proba,
+                    "sklearn": sklearn_LogisticRegression.predict_log_proba,
+                },
+                X,
+            )
+
+        def _test_type_and_finiteness(self, X_in):
+            X = np.asarray(X_in)
+
+            if np.iscomplexobj(X):
+                return False
+            try:
+                _assert_all_finite(X)
+            except BaseException:
+                return False
+            return True
+
+        def _onedal_gpu_fit_supported(self, method_name, *data):
+            assert method_name == "fit"
+            assert len(data) == 3
+            X, y, sample_weight = data
+
+            class_name = self.__class__.__name__
+            patching_status = PatchingConditionsChain(
+                f"sklearn.linear_model.{class_name}.fit"
+            )
+
+            dal_ready = 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.class_weight is None, "Class weight is not supported"),
+                    (self.solver == "newton-cg", "Only newton-cg solver is supported."),
+                    (
+                        self.multi_class != "multinomial",
+                        "multi_class parameter is not supported.",
+                    ),
+                    (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."),
+                ]
+            )
+
+            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
+
+            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_)
+            )
+            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."),
+                ]
+            )
+            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"]:
+                return self._onedal_gpu_predict_supported(method_name, *data)
+            raise RuntimeError(
+                f"Unknown method {method_name} in {self.__class__.__name__}"
+            )
+
+        def _onedal_cpu_supported(self, method_name, *data):
+            class_name = self.__class__.__name__
+            patching_status = PatchingConditionsChain(
+                f"sklearn.linear_model.{class_name}.{method_name}"
+            )
+
+            return patching_status
+
+        def _initialize_onedal_estimator(self):
+            onedal_params = {
+                "tol": self.tol,
+                "C": self.C,
+                "fit_intercept": self.fit_intercept,
+                "solver": self.solver,
+                "max_iter": self.max_iter,
+            }
+            self._onedal_estimator = onedal_LogisticRegression(**onedal_params)
+
+        def _onedal_fit(self, X, y, sample_weight, 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)
+            else:
+                X, y = check_X_y(**check_params)
+            self._initialize_onedal_estimator()
+            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)
+
+        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)
+            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)
+            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)
+            assert hasattr(self, "_onedal_estimator")
+            return self._onedal_estimator.predict_log_proba(X, queue=queue)
+
+else:
+    LogisticRegression = LogisticRegression_daal4py
+
+    logging.warning(
+        "Sklearnex LogisticRegression requires oneDAL version >= 2024.0.1 "
+        "but it was not found"
+    )

sklearnex/linear_model/ridge.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/linear_model/tests/test_linear.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #
@@ -29,14 +28,20 @@ from onedal.tests.utils._dataframes_support import (
 
 
 @pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
-def test_sklearnex_import_linear(dataframe, queue):
+@pytest.mark.parametrize("macro_block", [None, 1024])
+def test_sklearnex_import_linear(dataframe, queue, macro_block):
     from sklearnex.linear_model import LinearRegression
 
     X = np.array([[1, 1], [1, 2], [2, 2], [2, 3]])
     y = np.dot(X, np.array([1, 2])) + 3
     X = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
     y = _convert_to_dataframe(y, sycl_queue=queue, target_df=dataframe)
-    linreg = LinearRegression().fit(X, y)
+    linreg = LinearRegression()
+    if daal_check_version((2024, "P", 0)) and macro_block is not None:
+        hparams = linreg.get_hyperparameters("fit")
+        hparams.cpu_macro_block = macro_block
+        hparams.gpu_macro_block = macro_block
+    linreg.fit(X, y)
     if daal_check_version((2023, "P", 100)):
         assert hasattr(linreg, "_onedal_estimator")
     assert "sklearnex" in linreg.__module__

sklearnex/linear_model/tests/test_logreg.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #
@@ -16,14 +15,79 @@
 # ===============================================================================
 
 import numpy as np
+import pytest
 from numpy.testing import assert_allclose
-from sklearn.datasets import load_iris
+from sklearn.datasets import load_breast_cancer, load_iris
+from sklearn.metrics import accuracy_score
+from sklearn.model_selection import train_test_split
 
+from daal4py.sklearn._utils import daal_check_version
+from onedal.tests.utils._dataframes_support import (
+    _as_numpy,
+    _convert_to_dataframe,
+    get_dataframes_and_queues,
+)
 
-def test_sklearnex_import():
+
+def prepare_input(X, y, dataframe, queue):
+    X_train, X_test, y_train, y_test = train_test_split(
+        X, y, train_size=0.8, random_state=42
+    )
+    X_train = _convert_to_dataframe(X_train, sycl_queue=queue, target_df=dataframe)
+    y_train = _convert_to_dataframe(y_train, sycl_queue=queue, target_df=dataframe)
+    X_test = _convert_to_dataframe(X_test, sycl_queue=queue, target_df=dataframe)
+    return X_train, X_test, y_train, y_test
+
+
+@pytest.mark.parametrize(
+    "dataframe,queue",
+    get_dataframes_and_queues(device_filter_="cpu"),
+)
+def test_sklearnex_multiclass_classification(dataframe, queue):
     from sklearnex.linear_model import LogisticRegression
 
     X, y = load_iris(return_X_y=True)
-    logreg = LogisticRegression(random_state=0, max_iter=200).fit(X, y)
-    assert "daal4py" in logreg.__module__
-    assert_allclose(logreg.score(X, y), 0.9733, atol=1e-3)
+    X_train, X_test, y_train, y_test = prepare_input(X, y, dataframe, queue)
+
+    logreg = LogisticRegression(fit_intercept=True, solver="lbfgs", max_iter=200).fit(
+        X_train, y_train
+    )
+
+    if daal_check_version((2024, "P", 1)):
+        assert "sklearnex" in logreg.__module__
+    else:
+        assert "daal4py" in logreg.__module__
+
+    y_pred = _as_numpy(logreg.predict(X_test))
+    assert accuracy_score(y_test, y_pred) > 0.99
+
+
+@pytest.mark.parametrize(
+    "dataframe,queue",
+    get_dataframes_and_queues(),
+)
+def test_sklearnex_binary_classification(dataframe, queue):
+    from sklearnex.linear_model import LogisticRegression
+
+    X, y = load_breast_cancer(return_X_y=True)
+    X_train, X_test, y_train, y_test = prepare_input(X, y, dataframe, queue)
+
+    logreg = LogisticRegression(fit_intercept=True, solver="newton-cg", max_iter=100).fit(
+        X_train, y_train
+    )
+
+    if daal_check_version((2024, "P", 1)):
+        assert "sklearnex" in logreg.__module__
+    else:
+        assert "daal4py" in logreg.__module__
+    if (
+        dataframe != "numpy"
+        and queue is not None
+        and queue.sycl_device.is_gpu
+        and daal_check_version((2024, "P", 1))
+    ):
+        # fit was done on gpu
+        assert hasattr(logreg, "_onedal_estimator")
+
+    y_pred = _as_numpy(logreg.predict(X_test))
+    assert accuracy_score(y_test, y_pred) > 0.95

sklearnex/manifold/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/manifold/t_sne.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/manifold/tests/test_tsne.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/metrics/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/metrics/pairwise.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/metrics/ranking.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/metrics/tests/test_metrics.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/model_selection/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/model_selection/split.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #

sklearnex/model_selection/tests/test_model_selection.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ===============================================================================
 # Copyright 2021 Intel Corporation
 #