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

{scikit_learn_intelex-2024.1.0.data → scikit_learn_intelex-2024.2.0.data}/data/Lib/site-packages/sklearnex/cluster/dbscan.py

@@ -22,7 +22,8 @@ from scipy import sparse as sp
 from sklearn.cluster import DBSCAN as sklearn_DBSCAN
 from sklearn.utils.validation import _check_sample_weight
 
-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.cluster import DBSCAN as onedal_DBSCAN
 
 from .._device_offload import dispatch, wrap_output_data
@@ -45,7 +46,7 @@ class BaseDBSCAN(ABC):
         self.n_features_in_ = self._onedal_estimator.n_features_in_
 
 
-@control_n_jobs
+@control_n_jobs(decorated_methods=["fit"])
 class DBSCAN(sklearn_DBSCAN, BaseDBSCAN):
     __doc__ = sklearn_DBSCAN.__doc__
 
@@ -83,7 +84,6 @@ class DBSCAN(sklearn_DBSCAN, BaseDBSCAN):
         self.p = p
         self.n_jobs = n_jobs
 
-    @run_with_n_jobs
     def _onedal_fit(self, X, y, sample_weight=None, queue=None):
         onedal_params = {
             "eps": self.eps,

scikit_learn_intelex-2024.2.0.data/data/Lib/site-packages/sklearnex/covariance/__init__.py

@@ -0,0 +1,19 @@
+# ===============================================================================
+# 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.
+# ===============================================================================
+
+from .incremental_covariance import IncrementalEmpiricalCovariance
+
+__all__ = ["IncrementalEmpiricalCovariance"]

scikit_learn_intelex-2024.2.0.data/data/Lib/site-packages/sklearnex/covariance/incremental_covariance.py

@@ -0,0 +1,130 @@
+# ===============================================================================
+# 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 numpy as np
+from sklearn.utils import check_array, gen_batches
+
+from daal4py.sklearn._n_jobs_support import control_n_jobs
+from onedal._device_offload import support_usm_ndarray
+from onedal.covariance import (
+    IncrementalEmpiricalCovariance as onedal_IncrementalEmpiricalCovariance,
+)
+
+
+@control_n_jobs(decorated_methods=["partial_fit"])
+class IncrementalEmpiricalCovariance:
+    """
+    Incremental estimator for covariance.
+    Allows to compute empirical covariance estimated by maximum
+    likelihood method if data are splitted into batches.
+
+    Parameters
+    ----------
+    batch_size : int, default=None
+        The number of samples to use for each batch. Only used when calling
+        ``fit``. If ``batch_size`` is ``None``, then ``batch_size``
+        is inferred from the data and set to ``5 * n_features``, to provide a
+        balance between approximation accuracy and memory consumption.
+
+    Attributes
+    ----------
+    location_ : ndarray of shape (n_features,)
+        Estimated location, i.e. the estimated mean.
+
+    covariance_ : ndarray of shape (n_features, n_features)
+        Estimated covariance matrix
+    """
+
+    _onedal_incremental_covariance = staticmethod(onedal_IncrementalEmpiricalCovariance)
+
+    def __init__(self, batch_size=None):
+        self._need_to_finalize = False  # If True then finalize compute should
+        #      be called to obtain covariance_ or location_ from partial compute data
+        self.batch_size = batch_size
+
+    def _onedal_finalize_fit(self):
+        assert hasattr(self, "_onedal_estimator")
+        self._onedal_estimator.finalize_fit()
+        self._need_to_finalize = False
+
+    def _onedal_partial_fit(self, X, queue):
+        onedal_params = {
+            "method": "dense",
+            "bias": True,
+        }
+        if not hasattr(self, "_onedal_estimator"):
+            self._onedal_estimator = self._onedal_incremental_covariance(**onedal_params)
+        self._onedal_estimator.partial_fit(X, queue)
+        self._need_to_finalize = True
+
+    @property
+    def covariance_(self):
+        if self._need_to_finalize:
+            self._onedal_finalize_fit()
+        return self._onedal_estimator.covariance_
+
+    @property
+    def location_(self):
+        if self._need_to_finalize:
+            self._onedal_finalize_fit()
+        return self._onedal_estimator.location_
+
+    @support_usm_ndarray()
+    def partial_fit(self, X, queue=None):
+        """
+        Incremental fit with X. All of X is processed as a single batch.
+
+        Parameters
+        ----------
+        X : array-like of shape (n_samples, n_features)
+            Training data, where `n_samples` is the number of samples and
+            `n_features` is the number of features.
+
+        Returns
+        -------
+        self : object
+            Returns the instance itself.
+        """
+        X = check_array(X, dtype=[np.float64, np.float32])
+        self._onedal_partial_fit(X, queue)
+        return self
+
+    def fit(self, X, queue=None):
+        """
+        Fit the model with X, using minibatches of size batch_size.
+
+        Parameters
+        ----------
+        X : array-like of shape (n_samples, n_features)
+            Training data, where `n_samples` is the number of samples and
+            `n_features` is the number of features.
+
+        Returns
+        -------
+        self : object
+            Returns the instance itself.
+        """
+        n_samples, n_features = X.shape
+        if self.batch_size is None:
+            batch_size_ = 5 * n_features
+        else:
+            batch_size_ = self.batch_size
+        for batch in gen_batches(n_samples, batch_size_):
+            X_batch = X[batch]
+            self.partial_fit(X_batch, queue=queue)
+
+        self._onedal_finalize_fit()
+        return self

scikit_learn_intelex-2024.2.0.data/data/Lib/site-packages/sklearnex/covariance/tests/test_incremental_covariance.py

@@ -0,0 +1,143 @@
+# ===============================================================================
+# 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 numpy as np
+import pytest
+from numpy.testing import assert_allclose
+
+from onedal.tests.utils._dataframes_support import (
+    _convert_to_dataframe,
+    get_dataframes_and_queues,
+)
+
+
+@pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
+@pytest.mark.parametrize("dtype", [np.float32, np.float64])
+def test_sklearnex_partial_fit_on_gold_data(dataframe, queue, dtype):
+    from sklearnex.covariance import IncrementalEmpiricalCovariance
+
+    X = np.array([[0, 1], [0, 1]])
+    X = X.astype(dtype)
+    X_split = np.array_split(X, 2)
+    inccov = IncrementalEmpiricalCovariance()
+
+    for i in range(2):
+        X_split_df = _convert_to_dataframe(
+            X_split[i], sycl_queue=queue, target_df=dataframe
+        )
+        result = inccov.partial_fit(X_split_df)
+
+    expected_covariance = np.array([[0, 0], [0, 0]])
+    expected_means = np.array([0, 1])
+
+    assert_allclose(expected_covariance, result.covariance_)
+    assert_allclose(expected_means, result.location_)
+
+    X = np.array([[1, 2], [3, 6]])
+    X = X.astype(dtype)
+    X_split = np.array_split(X, 2)
+    inccov = IncrementalEmpiricalCovariance()
+
+    for i in range(2):
+        X_split_df = _convert_to_dataframe(
+            X_split[i], sycl_queue=queue, target_df=dataframe
+        )
+        result = inccov.partial_fit(X_split_df)
+
+    expected_covariance = np.array([[1, 2], [2, 4]])
+    expected_means = np.array([2, 4])
+
+    assert_allclose(expected_covariance, result.covariance_)
+    assert_allclose(expected_means, result.location_)
+
+
+@pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
+@pytest.mark.parametrize("batch_size", [2, 4])
+@pytest.mark.parametrize("dtype", [np.float32, np.float64])
+def test_sklearnex_fit_on_gold_data(dataframe, queue, batch_size, dtype):
+    from sklearnex.covariance import IncrementalEmpiricalCovariance
+
+    X = np.array([[0, 1, 2, 3], [0, -1, -2, -3], [0, 1, 2, 3], [0, 1, 2, 3]])
+    X = X.astype(dtype)
+    X_df = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
+    inccov = IncrementalEmpiricalCovariance(batch_size=batch_size)
+
+    result = inccov.fit(X_df)
+
+    expected_covariance = np.array(
+        [[0, 0, 0, 0], [0, 0.75, 1.5, 2.25], [0, 1.5, 3, 4.5], [0, 2.25, 4.5, 6.75]]
+    )
+    expected_means = np.array([0, 0.5, 1, 1.5])
+
+    assert_allclose(expected_covariance, result.covariance_)
+    assert_allclose(expected_means, result.location_)
+
+
+@pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
+@pytest.mark.parametrize("num_batches", [2, 4, 6, 8, 10])
+@pytest.mark.parametrize("row_count", [100, 1000, 2000])
+@pytest.mark.parametrize("column_count", [10, 100, 200])
+@pytest.mark.parametrize("dtype", [np.float32, np.float64])
+def test_sklearnex_partial_fit_on_random_data(
+    dataframe, queue, num_batches, row_count, column_count, dtype
+):
+    from sklearnex.covariance import IncrementalEmpiricalCovariance
+
+    seed = 77
+    gen = np.random.default_rng(seed)
+    X = gen.uniform(low=-0.3, high=+0.7, size=(row_count, column_count))
+    X = X.astype(dtype)
+    X_split = np.array_split(X, num_batches)
+    inccov = IncrementalEmpiricalCovariance()
+
+    for i in range(num_batches):
+        X_split_df = _convert_to_dataframe(
+            X_split[i], sycl_queue=queue, target_df=dataframe
+        )
+        result = inccov.partial_fit(X_split_df)
+
+    expected_covariance = np.cov(X.T, bias=1)
+    expected_means = np.mean(X, axis=0)
+
+    assert_allclose(expected_covariance, result.covariance_, atol=1e-6)
+    assert_allclose(expected_means, result.location_, atol=1e-6)
+
+
+@pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
+@pytest.mark.parametrize("num_batches", [2, 4, 6, 8, 10])
+@pytest.mark.parametrize("row_count", [100, 1000, 2000])
+@pytest.mark.parametrize("column_count", [10, 100, 200])
+@pytest.mark.parametrize("dtype", [np.float32, np.float64])
+def test_sklearnex_fit_on_random_data(
+    dataframe, queue, num_batches, row_count, column_count, dtype
+):
+    from sklearnex.covariance import IncrementalEmpiricalCovariance
+
+    seed = 77
+    gen = np.random.default_rng(seed)
+    X = gen.uniform(low=-0.3, high=+0.7, size=(row_count, column_count))
+    X = X.astype(dtype)
+    X_df = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
+    batch_size = row_count // num_batches
+    inccov = IncrementalEmpiricalCovariance(batch_size=batch_size)
+
+    result = inccov.fit(X_df)
+
+    expected_covariance = np.cov(X.T, bias=1)
+    expected_means = np.mean(X, axis=0)
+
+    assert_allclose(expected_covariance, result.covariance_, atol=1e-6)
+    assert_allclose(expected_means, result.location_, atol=1e-6)

{scikit_learn_intelex-2024.1.0.data → scikit_learn_intelex-2024.2.0.data}/data/Lib/site-packages/sklearnex/dispatcher.py

@@ -69,6 +69,7 @@ def get_patch_map():
         from .ensemble import RandomForestClassifier as RandomForestClassifier_sklearnex
         from .ensemble import RandomForestRegressor as RandomForestRegressor_sklearnex
         from .linear_model import LinearRegression as LinearRegression_sklearnex
+        from .linear_model import LogisticRegression as LogisticRegression_sklearnex
         from .neighbors import KNeighborsClassifier as KNeighborsClassifier_sklearnex
         from .neighbors import KNeighborsRegressor as KNeighborsRegressor_sklearnex
         from .neighbors import LocalOutlierFactor as LocalOutlierFactor_sklearnex
@@ -80,9 +81,6 @@ def get_patch_map():
             EmpiricalCovariance as EmpiricalCovariance_sklearnex,
         )
         from .preview.decomposition import PCA as PCA_sklearnex
-        from .preview.linear_model import (
-            LogisticRegression as LogisticRegression_sklearnex,
-        )
         from .svm import SVC as SVC_sklearnex
         from .svm import SVR as SVR_sklearnex
         from .svm import NuSVC as NuSVC_sklearnex
@@ -119,21 +117,6 @@ def get_patch_map():
                 ]
             ]
 
-            # LogisticRegression
-            mapping.pop("logisticregression")
-            mapping.pop("log_reg")
-            mapping["log_reg"] = [
-                [
-                    (
-                        linear_model_module,
-                        "LogisticRegression",
-                        LogisticRegression_sklearnex,
-                    ),
-                    None,
-                ]
-            ]
-            mapping["logisticregression"] = mapping["log_reg"]
-
         # DBSCAN
         mapping.pop("dbscan")
         mapping["dbscan"] = [[(cluster_module, "DBSCAN", DBSCAN_sklearnex), None]]
@@ -161,6 +144,24 @@ def get_patch_map():
         ]
         mapping["linearregression"] = mapping["linear"]
 
+        # Logistic Regression
+
+        mapping.pop("logisticregression")
+        mapping.pop("log_reg")
+        mapping.pop("logistic")
+        mapping.pop("_logistic_regression_path")
+        mapping["log_reg"] = [
+            [
+                (
+                    linear_model_module,
+                    "LogisticRegression",
+                    LogisticRegression_sklearnex,
+                ),
+                None,
+            ]
+        ]
+        mapping["logisticregression"] = mapping["log_reg"]
+
         # kNN
         mapping.pop("knn_classifier")
         mapping.pop("kneighborsclassifier")

{scikit_learn_intelex-2024.1.0.data → scikit_learn_intelex-2024.2.0.data}/data/Lib/site-packages/sklearnex/ensemble/_forest.py

@@ -42,11 +42,10 @@ 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,
-    control_n_jobs,
     daal_check_version,
-    run_with_n_jobs,
     sklearn_check_version,
 )
 from onedal.ensemble import ExtraTreesClassifier as onedal_ExtraTreesClassifier
@@ -78,7 +77,6 @@ if sklearn_check_version("1.4"):
 class BaseForest(ABC):
     _onedal_factory = None
 
-    @run_with_n_jobs
     def _onedal_fit(self, X, y, sample_weight=None, queue=None):
         if sklearn_check_version("0.24"):
             X, y = self._validate_data(
@@ -787,7 +785,6 @@ class ForestClassifier(sklearn_ForestClassifier, BaseForest):
 
         return patching_status
 
-    @run_with_n_jobs
     def _onedal_predict(self, X, queue=None):
         X = check_array(
             X,
@@ -802,7 +799,6 @@ class ForestClassifier(sklearn_ForestClassifier, BaseForest):
         res = self._onedal_estimator.predict(X, queue=queue)
         return np.take(self.classes_, res.ravel().astype(np.int64, casting="unsafe"))
 
-    @run_with_n_jobs
     def _onedal_predict_proba(self, X, queue=None):
         X = check_array(X, dtype=[np.float64, np.float32], force_all_finite=False)
         check_is_fitted(self, "_onedal_estimator")
@@ -1096,7 +1092,6 @@ class ForestRegressor(sklearn_ForestRegressor, BaseForest):
 
         return patching_status
 
-    @run_with_n_jobs
     def _onedal_predict(self, X, queue=None):
         X = check_array(
             X, dtype=[np.float64, np.float32], force_all_finite=False
@@ -1138,7 +1133,7 @@ class ForestRegressor(sklearn_ForestRegressor, BaseForest):
     predict.__doc__ = sklearn_ForestRegressor.predict.__doc__
 
 
-@control_n_jobs
+@control_n_jobs(decorated_methods=["fit", "predict", "predict_proba"])
 class RandomForestClassifier(ForestClassifier):
     __doc__ = sklearn_RandomForestClassifier.__doc__
     _onedal_factory = onedal_RandomForestClassifier
@@ -1348,7 +1343,7 @@ class RandomForestClassifier(ForestClassifier):
             self.min_bin_size = min_bin_size
 
 
-@control_n_jobs
+@control_n_jobs(decorated_methods=["fit", "predict"])
 class RandomForestRegressor(ForestRegressor):
     __doc__ = sklearn_RandomForestRegressor.__doc__
     _onedal_factory = onedal_RandomForestRegressor
@@ -1549,7 +1544,7 @@ class RandomForestRegressor(ForestRegressor):
             self.min_bin_size = min_bin_size
 
 
-@control_n_jobs
+@control_n_jobs(decorated_methods=["fit", "predict", "predict_proba"])
 class ExtraTreesClassifier(ForestClassifier):
     __doc__ = sklearn_ExtraTreesClassifier.__doc__
     _onedal_factory = onedal_ExtraTreesClassifier
@@ -1759,7 +1754,7 @@ class ExtraTreesClassifier(ForestClassifier):
             self.min_bin_size = min_bin_size
 
 
-@control_n_jobs
+@control_n_jobs(decorated_methods=["fit", "predict"])
 class ExtraTreesRegressor(ForestRegressor):
     __doc__ = sklearn_ExtraTreesRegressor.__doc__
     _onedal_factory = onedal_ExtraTreesRegressor

{scikit_learn_intelex-2024.1.0.data → scikit_learn_intelex-2024.2.0.data}/data/Lib/site-packages/sklearnex/linear_model/__init__.py

@@ -16,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",
 ]

{scikit_learn_intelex-2024.1.0.data → scikit_learn_intelex-2024.2.0.data}/data/Lib/site-packages/sklearnex/linear_model/linear.py

@@ -65,13 +65,8 @@ if daal_check_version((2023, "P", 100)):
     import numpy as np
     from sklearn.linear_model import LinearRegression as sklearn_LinearRegression
 
-    from daal4py.sklearn._utils import (
-        control_n_jobs,
-        get_dtype,
-        make2d,
-        run_with_n_jobs,
-        sklearn_check_version,
-    )
+    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 (
@@ -93,7 +88,7 @@ if daal_check_version((2023, "P", 100)):
     from onedal.utils import _num_features, _num_samples
 
     @register_hyperparameters({"fit": get_hyperparameters("linear_regression", "train")})
-    @control_n_jobs
+    @control_n_jobs(decorated_methods=["fit", "predict"])
     class LinearRegression(sklearn_LinearRegression, BaseLinearRegression):
         __doc__ = sklearn_LinearRegression.__doc__
         intercept_, coef_ = None, None
@@ -330,7 +325,6 @@ if daal_check_version((2023, "P", 100)):
             onedal_params = {"fit_intercept": self.fit_intercept, "copy_X": self.copy_X}
             self._onedal_estimator = onedal_LinearRegression(**onedal_params)
 
-        @run_with_n_jobs
         def _onedal_fit(self, X, y, sample_weight, queue=None):
             assert sample_weight is None
 
@@ -369,7 +363,6 @@ if daal_check_version((2023, "P", 100)):
                 del self._onedal_estimator
                 super().fit(X, y)
 
-        @run_with_n_jobs
         def _onedal_predict(self, X, queue=None):
             X = self._validate_data(X, accept_sparse=False, reset=False)
             if not hasattr(self, "_onedal_estimator"):

{scikit_learn_intelex-2024.1.0.data/data/Lib/site-packages/sklearnex/preview → scikit_learn_intelex-2024.2.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,14 +17,11 @@
 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 LogisticRegression_daal4py,
 )
+from daal4py.sklearn.linear_model.logistic_path import daal4py_fit, daal4py_predict
 
 
 class BaseLogisticRegression(ABC):
@@ -43,14 +40,18 @@ if daal_check_version((2024, "P", 1)):
     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
+    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
@@ -97,6 +98,8 @@ 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)
@@ -160,10 +163,8 @@ if daal_check_version((2024, "P", 1)):
         def _test_type_and_finiteness(self, X_in):
             X = np.asarray(X_in)
 
-            dtype = X.dtype
-            if "complex" in str(type(dtype)):
+            if np.iscomplexobj(X):
                 return False
-
             try:
                 _assert_all_finite(X)
             except BaseException:
@@ -268,15 +269,6 @@ 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):
             if queue is None or queue.sycl_device.is_cpu:
                 return self._onedal_cpu_fit(X, y, sample_weight)
@@ -313,38 +305,27 @@ if daal_check_version((2024, "P", 1)):
                 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_
-
+            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_
 
+            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)
-            if not hasattr(self, "_onedal_estimator"):
-                self._initialize_onedal_estimator()
-                self._onedal_estimator.coef_ = self.coef_
-                self._onedal_estimator.intercept_ = self.intercept_
 
+            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:
-    from daal4py.sklearn.linear_model import LogisticRegression
+    LogisticRegression = LogisticRegression_daal4py
 
     logging.warning(
         "Sklearnex LogisticRegression requires oneDAL version >= 2024.0.1 "