scikit-learn-intelex 2025.7.0__py310-none-win_amd64.whl → 2025.9.0__py310-none-win_amd64.whl

scikit_learn_intelex-2025.9.0.data/data/Lib/site-packages/sklearnex/preview/decomposition/incremental_pca.py

@@ -0,0 +1,406 @@
+# ===============================================================================
+# 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 scipy.sparse as sp
+from sklearn.decomposition import IncrementalPCA as _sklearn_IncrementalPCA
+from sklearn.utils import check_array, gen_batches
+from sklearn.utils.validation import check_is_fitted
+
+from daal4py.sklearn._n_jobs_support import control_n_jobs
+from daal4py.sklearn._utils import sklearn_check_version
+from onedal.decomposition import IncrementalPCA as onedal_IncrementalPCA
+
+from ..._config import get_config
+from ..._device_offload import dispatch, wrap_output_data
+from ..._utils import PatchingConditionsChain, _add_inc_serialization_note
+from ...base import oneDALEstimator
+from ...utils._array_api import enable_array_api, get_namespace
+from ...utils.validation import validate_data
+
+if sklearn_check_version("1.2"):
+    from sklearn.utils._param_validation import StrOptions
+
+
+@enable_array_api
+@control_n_jobs(
+    decorated_methods=["fit", "partial_fit", "transform", "_onedal_finalize_fit"]
+)
+class IncrementalPCA(oneDALEstimator, _sklearn_IncrementalPCA):
+    __doc__ = _sklearn_IncrementalPCA.__doc__
+
+    if sklearn_check_version("1.2"):
+        _parameter_constraints: dict = {
+            **_sklearn_IncrementalPCA._parameter_constraints,
+            "svd_solver": [StrOptions({"auto", "covariance_eigh", "onedal_svd"})],
+        }
+
+    def __init__(
+        self,
+        n_components=None,
+        *,
+        whiten=False,
+        copy=True,
+        batch_size=None,
+        svd_solver="auto",
+    ):
+        super().__init__(
+            n_components=n_components, whiten=whiten, copy=copy, batch_size=batch_size
+        )
+        self.svd_solver = svd_solver
+        self._need_to_finalize = False
+        # Note: use of the onedal_svd solver will cause partial result to grow proportionally
+        # to the input data and for that reason is not the default, which is contrary
+        # to the scikit-learn implementation.
+
+    _onedal_incremental_pca = staticmethod(onedal_IncrementalPCA)
+
+    def _set_n_components(self, n_components, n_samples, n_features, first_pass):
+        # extracted from sklearn's ``IncrementalPCA.partial_fit``. This is a
+        # maintenance burden that cannot be easily separated from sklearn.
+        if n_components is None:
+            if self._components_ is None:
+                self._n_components_ = min(n_samples, n_features)
+            else:
+                self._n_components_ = self.components_.shape[0]
+        elif not 1 <= n_components <= n_features:
+            raise ValueError(
+                "n_components=%r invalid for n_features=%d, need "
+                "more rows than columns for IncrementalPCA "
+                "processing" % (self.n_components, n_features)
+            )
+        elif n_components > n_samples and (
+            not sklearn_check_version("1.6") or first_pass
+        ):
+            raise ValueError(
+                "n_components=%r must be less or equal to "
+                "the batch number of samples "
+                "%d" % (self.n_components, n_samples)
+                + (
+                    " for the first partial_fit call."
+                    if sklearn_check_version("1.6")
+                    else ""
+                )
+            )
+        else:
+            self._n_components_ = n_components
+
+        # the private variables are used to not trigger _onedal_finalize_fit
+        if (self._components_ is not None) and (
+            self._components_.shape[0] != self._n_components_
+        ):
+            raise ValueError(
+                "Number of input features has changed from %i "
+                "to %i between calls to partial_fit! Try "
+                "setting n_components to a fixed value."
+                % (self.components_.shape[0], self.n_components_)
+            )
+
+    def _compute_noise_variance(self, n_sf_min, xp):
+        # generally replicates capability seen in sklearn.PCA._fit_full
+        explained_variance = self._onedal_estimator.explained_variance_
+        if self._n_components_ < n_sf_min:
+            if explained_variance.shape[0] == n_sf_min:
+                return xp.mean(explained_variance[self._n_components_ :])
+            elif explained_variance.shape[0] < n_sf_min:
+                # replicates capability seen in sklearn.PCA._fit_truncated
+                # this is necessary as oneDAL will fit only to self.n_components
+                # which leads to self.explained_variance_ not containing the
+                # full information (and therefore can't replicate
+                # sklearn.PCA._fit_full)
+                resid_var = xp.sum(self._onedal_estimator.var_) - xp.sum(
+                    explained_variance
+                )
+                return resid_var / (n_sf_min - self._n_components_)
+        else:
+            return 0.0
+
+    def _onedal_transform(self, X, queue=None):
+        # does not batch out data like sklearn's ``IncrementalPCA.transform``
+        if self._need_to_finalize:
+            self._onedal_finalize_fit()
+        if not get_config()["use_raw_input"]:
+            xp, _ = get_namespace(X)
+            X = validate_data(self, X, dtype=[xp.float64, xp.float32], reset=False)
+        return self._onedal_estimator.predict(X, queue=queue)
+
+    def _onedal_fit_transform(self, X, queue=None):
+        X = self._onedal_fit(X, queue=queue)
+        return self._onedal_estimator.predict(X, queue=queue)
+
+    def _onedal_partial_fit(self, X, check_input=True, queue=None):
+        first_pass = not hasattr(self, "components_")
+        if first_pass:
+            self._components_ = None
+
+        if check_input:
+            if not get_config()["use_raw_input"]:
+                xp, _ = get_namespace(X)
+                X = validate_data(
+                    self, X, dtype=[xp.float64, xp.float32], reset=first_pass
+                )
+            else:
+                self.n_features_in_ = X.shape[1]
+
+        n_samples, n_features = X.shape
+
+        self._set_n_components(self.n_components, n_samples, n_features, first_pass)
+
+        if not hasattr(self, "n_samples_seen_"):
+            self.n_samples_seen_ = n_samples
+        else:
+            self.n_samples_seen_ += n_samples
+
+        onedal_params = {
+            "n_components": self._n_components_,
+            "whiten": self.whiten,
+            "method": "svd" if self.svd_solver == "onedal_svd" else "cov",
+        }
+
+        if not hasattr(self, "_onedal_estimator"):
+            self._onedal_estimator = self._onedal_incremental_pca(**onedal_params)
+        self._onedal_estimator.partial_fit(X, queue=queue)
+        self._need_to_finalize = True
+
+    def _onedal_finalize_fit(self):
+        assert hasattr(self, "_onedal_estimator")
+        self._onedal_estimator.finalize_fit()
+        xp, _ = get_namespace(
+            self._onedal_estimator.explained_variance_,
+            self._onedal_estimator.singular_values_,
+        )
+
+        # set attributes needed for transform
+        self._mean_ = self._onedal_estimator.mean_
+        self._components_ = self._onedal_estimator.components_
+        # oneDAL PCA eigenvalues are not guaranteed to be >=0 and must be clipped.
+        # This is likely due to accumulated numerical error in the oneDAL calculation.
+        self._explained_variance_ = xp.clip(
+            self._onedal_estimator.explained_variance_, 0.0, None
+        )
+
+        # set other attributes
+        self.singular_values_ = self._onedal_estimator.singular_values_
+        # NOTE: This covers up a numerical accuracy issue in oneDAL online PCA which
+        # can yield NaN values for singular values. Replace in place using array API
+        self.singular_values_[...] = xp.where(
+            xp.isnan(self.singular_values_), 0, self.singular_values_
+        )
+        self.explained_variance_ratio_ = self._onedal_estimator.explained_variance_ratio_
+        self.var_ = self._onedal_estimator.var_
+
+        # calculate the noise variance
+        self.noise_variance_ = self._compute_noise_variance(
+            min(self.n_samples_seen_, self.n_features_in_), xp
+        )
+
+        self._need_to_finalize = False
+
+    def _onedal_fit(self, X, queue=None):
+        # Taken from sklearn for conformance purposes
+        self.components_ = None
+
+        if not get_config()["use_raw_input"]:
+            if sklearn_check_version("1.2"):
+                self._validate_params()
+            xp, _ = get_namespace(X)
+            X = validate_data(self, X, dtype=[xp.float64, xp.float32], copy=self.copy)
+        else:
+            self.n_features_in_ = X.shape[1]
+
+        n_samples, n_features = X.shape
+
+        if self.batch_size is None:
+            self.batch_size_ = 5 * n_features
+        else:
+            self.batch_size_ = self.batch_size
+
+        self.n_samples_seen_ = 0
+        if hasattr(self, "_onedal_estimator"):
+            self._onedal_estimator._reset()
+
+        for batch in gen_batches(
+            n_samples, self.batch_size_, min_batch_size=self.n_components or 0
+        ):
+            X_batch = X[batch, ...]
+            self._onedal_partial_fit(X_batch, queue=queue)
+
+        self._onedal_finalize_fit()
+
+        return X
+
+    def _onedal_cpu_supported(self, method_name, *data):
+        patching_status = PatchingConditionsChain(
+            f"sklearn.decomposition.{self.__class__.__name__}.{method_name}"
+        )
+        X = data[0]
+        if "fit" in method_name:
+            patching_status.and_conditions(
+                [(not sp.issparse(X), "Sparse input is not supported")]
+            )
+        else:
+            patching_status.and_conditions(
+                [
+                    (not sp.issparse(X), "Sparse input is not supported"),
+                    (hasattr(self, "_onedal_estimator"), "oneDAL model was not trained"),
+                ]
+            )
+        return patching_status
+
+    def _onedal_gpu_supported(self, method_name, *data):
+        patching_status = PatchingConditionsChain(
+            f"sklearn.decomposition.{self.__class__.__name__}.{method_name}"
+        )
+        # onedal_svd doesn't exist for GPU
+        X = data[0]
+        if "fit" in method_name:
+            patching_status.and_conditions(
+                [
+                    (not sp.issparse(X), "Sparse input is not supported"),
+                    (self.svd_solver != "onedal_svd", "onedal_svd not supported on GPU"),
+                ]
+            )
+        else:
+            patching_status.and_conditions(
+                [
+                    (not sp.issparse(X), "Sparse input is not supported"),
+                    (hasattr(self, "_onedal_estimator"), "oneDAL model was not trained"),
+                ]
+            )
+        return patching_status
+
+    def partial_fit(self, X, y=None, check_input=True):
+        if sklearn_check_version("1.2") and check_input:
+            self._validate_params()
+
+        dispatch(
+            self,
+            "partial_fit",
+            {
+                "onedal": self.__class__._onedal_partial_fit,
+                "sklearn": _sklearn_IncrementalPCA.partial_fit,
+            },
+            X,
+            check_input=check_input,
+        )
+        return self
+
+    def fit(self, X, y=None):
+        if sklearn_check_version("1.2"):
+            self._validate_params()
+
+        dispatch(
+            self,
+            "fit",
+            {
+                "onedal": self.__class__._onedal_fit,
+                "sklearn": _sklearn_IncrementalPCA.fit,
+            },
+            X,
+        )
+        return self
+
+    @wrap_output_data
+    def transform(self, X):
+        check_is_fitted(self)
+        return dispatch(
+            self,
+            "transform",
+            {
+                "onedal": self.__class__._onedal_transform,
+                "sklearn": _sklearn_IncrementalPCA.transform,
+            },
+            X,
+        )
+
+    @wrap_output_data
+    def fit_transform(self, X, y=None, **fit_params):
+        if sklearn_check_version("1.2"):
+            self._validate_params()
+        return dispatch(
+            self,
+            "fit_transform",
+            {
+                "onedal": self.__class__._onedal_fit_transform,
+                "sklearn": _sklearn_IncrementalPCA.fit_transform,
+            },
+            X,
+        )
+
+    # set properties for deleting the onedal_estimator model if:
+    # n_components_, components_, mean_ or explained_variance_ are
+    # changed. This assists in speeding up multiple uses of onedal
+    # transform as a model must now only be generated once.
+
+    @property
+    def n_components_(self):
+        if hasattr(self, "_onedal_estimator") and self._need_to_finalize:
+            self._onedal_finalize_fit()
+        return self._n_components_
+
+    @n_components_.setter
+    def n_components_(self, value):
+        if hasattr(self, "_onedal_estimator"):
+            self._onedal_estimator.n_components_ = value
+            self._onedal_estimator._onedal_model = None
+        self._n_components_ = value
+
+    @property
+    def components_(self):
+        if hasattr(self, "_onedal_estimator") and self._need_to_finalize:
+            self._onedal_finalize_fit()
+        return self._components_
+
+    @components_.setter
+    def components_(self, value):
+        if hasattr(self, "_onedal_estimator"):
+            self._onedal_estimator.components_ = value
+            self._onedal_estimator._onedal_model = None
+        self._components_ = value
+
+    @property
+    def mean_(self):
+        if hasattr(self, "_onedal_estimator") and self._need_to_finalize:
+            self._onedal_finalize_fit()
+        return self._mean_
+
+    @mean_.setter
+    def mean_(self, value):
+        if hasattr(self, "_onedal_estimator"):
+            self._onedal_estimator.mean_ = value
+            self._onedal_estimator._onedal_model = None
+        self._mean_ = value
+
+    @property
+    def explained_variance_(self):
+        if hasattr(self, "_onedal_estimator") and self._need_to_finalize:
+            self._onedal_finalize_fit()
+        return self._explained_variance_
+
+    @explained_variance_.setter
+    def explained_variance_(self, value):
+        if hasattr(self, "_onedal_estimator"):
+            self._onedal_estimator.explained_variance_ = value
+            self._onedal_estimator._onedal_model = None
+        self._explained_variance_ = value
+
+    __doc__ = _add_inc_serialization_note(
+        _sklearn_IncrementalPCA.__doc__ + "\n" + r"%incremental_serialization_note%"
+    )
+    fit.__doc__ = _sklearn_IncrementalPCA.fit.__doc__
+    fit_transform.__doc__ = _sklearn_IncrementalPCA.fit_transform.__doc__
+    transform.__doc__ = _sklearn_IncrementalPCA.transform.__doc__
+    partial_fit.__doc__ = _sklearn_IncrementalPCA.partial_fit.__doc__

{scikit_learn_intelex-2025.7.0.data → scikit_learn_intelex-2025.9.0.data}/data/Lib/site-packages/sklearnex/preview/decomposition/tests/test_incremental_pca.py

@@ -16,9 +16,12 @@
 
 import numpy as np
 import pytest
+import scipy.sparse as sp
 from numpy.testing import assert_allclose
+from sklearn.base import clone
+from sklearn.datasets import load_iris
 
-from daal4py.sklearn._utils import daal_check_version
+from daal4py.sklearn._utils import daal_check_version, sklearn_check_version
 from onedal.tests.utils._dataframes_support import (
     _as_numpy,
     _convert_to_dataframe,
@@ -334,3 +337,54 @@ def test_sklearnex_incremental_estimatior_pickle(dataframe, queue, dtype):
         incpca_loaded.explained_variance_ratio_,
         atol=1e-6,
     )
+
+
+@pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues("numpy,dpctl"))
+def test_changed_estimated_attributes(with_array_api, dataframe, queue):
+    # check that attributes necessary for the PCA onedal estimator match
+    # changes occurring in the sklearnex estimator
+    X, y = load_iris(return_X_y=True)
+
+    X_0 = _convert_to_dataframe(X[y == 0], sycl_queue=queue, target_df=dataframe)
+    X = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
+
+    est0 = IncrementalPCA(n_components=4).fit(X_0)
+    est = clone(est0)
+    assert not hasattr(est, "_onedal_estimator")
+    est.fit(X)
+    assert not np.array_equal(_as_numpy(est.transform(X)), _as_numpy(est0.transform(X)))
+
+    # copy over parameters necessary for transform
+    est.mean_ = est0.mean_
+    est.components_ = est0.components_
+    est.explained_variance_ = est0.explained_variance_
+    est.n_components_ = est0.n_components_  # is trivial but exercises the logic
+
+    assert np.array_equal(_as_numpy(est.transform(X)), _as_numpy(est0.transform(X)))
+
+
+@pytest.mark.skipif(
+    not sklearn_check_version("1.5"),
+    reason='svd_solver="auto" does not support sparse inputs',
+)
+@pytest.mark.allow_sklearn_fallback
+def test_create_model_behavior():
+    # verify that fit fallbacks does not break ``transform`` as the oneDAL
+    # model is generated JIT
+
+    X, _ = load_iris(return_X_y=True)
+    # generate a onedal estimator
+    est = IncrementalPCA(n_components=3)
+    X_trans = est.fit_transform(X)
+
+    # force data to sparse for a fallback to sklearn
+    X_sp = sp.csr_matrix(X)
+    est.fit(X_sp)
+    # In the case of a fallback, the model should be set to none by clobbered
+    # fitted attributes
+    assert est._onedal_estimator._onedal_model is None
+
+    X_trans_sparse = est.transform(X)
+    # use allclose as data was fit with sklearn and onedal on the same data
+    # but using different backends
+    assert_allclose(X_trans, X_trans_sparse)

{scikit_learn_intelex-2025.7.0.data → scikit_learn_intelex-2025.9.0.data}/data/Lib/site-packages/sklearnex/spmd/basic_statistics/basic_statistics.py

@@ -14,8 +14,11 @@
 # limitations under the License.
 # ==============================================================================
 
-from onedal.spmd.basic_statistics import BasicStatistics
+from onedal.spmd.basic_statistics import BasicStatistics as onedal_BasicStatistics
 
-# TODO:
-# Currently it uses `onedal` module interface.
-# Add sklearnex dispatching.
+from ...basic_statistics import BasicStatistics as BasicStatistics_Batch
+
+
+class BasicStatistics(BasicStatistics_Batch):
+    __doc__ = BasicStatistics_Batch.__doc__
+    _onedal_basic_statistics = staticmethod(onedal_BasicStatistics)

{scikit_learn_intelex-2025.7.0.data → scikit_learn_intelex-2025.9.0.data}/data/Lib/site-packages/sklearnex/spmd/basic_statistics/tests/test_basic_statistics_spmd.py

@@ -20,6 +20,7 @@ from numpy.testing import assert_allclose
 
 from onedal.basic_statistics.tests.utils import options_and_tests
 from onedal.tests.utils._dataframes_support import (
+    _as_numpy,
     _convert_to_dataframe,
     get_dataframes_and_queues,
 )
@@ -68,7 +69,8 @@ def test_basic_stats_spmd_gold(dataframe, queue):
     batch_result = BasicStatistics_Batch().fit(data)
 
     for option in options_and_tests:
-        assert_allclose(getattr(spmd_result, option), getattr(batch_result, option))
+        attr = option + "_"
+        assert_allclose(getattr(spmd_result, attr), getattr(batch_result, attr))
 
 
 @pytest.mark.skipif(
@@ -106,9 +108,10 @@ def test_basic_stats_spmd_synthetic(
 
     tol = 1e-5 if dtype == np.float32 else 1e-7
     for option in options_and_tests:
+        attr = option + "_"
         assert_allclose(
-            getattr(spmd_result, option),
-            getattr(batch_result, option),
+            _as_numpy(getattr(spmd_result, attr)),
+            _as_numpy(getattr(batch_result, attr)),
             atol=tol,
             rtol=tol,
         )

{scikit_learn_intelex-2025.7.0.data → scikit_learn_intelex-2025.9.0.data}/data/Lib/site-packages/sklearnex/spmd/basic_statistics/tests/test_incremental_basic_statistics_spmd.py

@@ -20,6 +20,7 @@ from numpy.testing import assert_allclose
 
 from onedal.basic_statistics.tests.utils import options_and_tests
 from onedal.tests.utils._dataframes_support import (
+    _as_numpy,
     _convert_to_dataframe,
     get_dataframes_and_queues,
 )
@@ -89,9 +90,10 @@ def test_incremental_basic_statistics_fit_spmd_gold(dataframe, queue, weighted,
     )
 
     for option in options_and_tests:
+        attr = option + "_"
         assert_allclose(
-            getattr(incbs_spmd, option),
-            getattr(incbs, option),
+            getattr(incbs_spmd, attr),
+            getattr(incbs, attr),
             err_msg=f"Result for {option} is incorrect",
         )
 
@@ -162,9 +164,10 @@ def test_incremental_basic_statistics_partial_fit_spmd_gold(
     incbs.fit(dpt_data, sample_weight=dpt_weights if weighted else None)
 
     for option in options_and_tests:
+        attr = option + "_"
         assert_allclose(
-            getattr(incbs_spmd, option),
-            getattr(incbs, option),
+            getattr(incbs_spmd, attr),
+            getattr(incbs, attr),
             err_msg=f"Result for {option} is incorrect",
         )
 
@@ -234,8 +237,8 @@ def test_incremental_basic_statistics_single_option_partial_fit_spmd_gold(
         )
 
     incbs.fit(dpt_data, sample_weight=dpt_weights if weighted else None)
-
-    assert_allclose(getattr(incbs_spmd, option), getattr(incbs, option))
+    attr = option + "_"
+    assert_allclose(getattr(incbs_spmd, attr), getattr(incbs, attr))
 
 
 @pytest.mark.skipif(
@@ -302,9 +305,10 @@ def test_incremental_basic_statistics_partial_fit_spmd_synthetic(
         incbs.partial_fit(dpt_data, sample_weight=dpt_weights if weighted else None)
 
     for option in options_and_tests:
+        attr = option + "_"
         assert_allclose(
-            getattr(incbs_spmd, option),
-            getattr(incbs, option),
+            _as_numpy(getattr(incbs_spmd, attr)),
+            _as_numpy(getattr(incbs, attr)),
             atol=tol,
             err_msg=f"Result for {option} is incorrect",
         )

scikit_learn_intelex-2025.9.0.data/data/Lib/site-packages/sklearnex/spmd/cluster/dbscan.py

@@ -0,0 +1,26 @@
+# ==============================================================================
+# Copyright 2023 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 abc import ABC
+
+from onedal.spmd.cluster import DBSCAN as onedal_DBSCAN
+
+from ...cluster import DBSCAN as DBSCAN_Batch
+
+
+class DBSCAN(DBSCAN_Batch):
+    __doc__ = DBSCAN_Batch.__doc__
+    _onedal_dbscan = staticmethod(onedal_DBSCAN)

{scikit_learn_intelex-2025.7.0.data → scikit_learn_intelex-2025.9.0.data}/data/Lib/site-packages/sklearnex/spmd/covariance/covariance.py

@@ -14,8 +14,11 @@
 # limitations under the License.
 # ==============================================================================
 
-from onedal.spmd.covariance import EmpiricalCovariance
+from onedal.spmd.covariance import EmpiricalCovariance as onedal_EmpiricalCovariance
 
-# TODO:
-# Currently it uses `onedal` module interface.
-# Add sklearnex dispatching.
+from ...preview.covariance import EmpiricalCovariance as EmpiricalCovariance_Batch
+
+
+class EmpiricalCovariance(EmpiricalCovariance_Batch):
+    __doc__ = EmpiricalCovariance_Batch.__doc__
+    _onedal_covariance = staticmethod(onedal_EmpiricalCovariance)

{scikit_learn_intelex-2025.7.0.data → scikit_learn_intelex-2025.9.0.data}/data/Lib/site-packages/sklearnex/spmd/covariance/tests/test_covariance_spmd.py

@@ -19,6 +19,7 @@ import pytest
 from numpy.testing import assert_allclose
 
 from onedal.tests.utils._dataframes_support import (
+    _as_numpy,
     _convert_to_dataframe,
     get_dataframes_and_queues,
 )
@@ -41,7 +42,9 @@ from sklearnex.tests.utils.spmd import (
 @pytest.mark.mpi
 def test_covariance_spmd_gold(dataframe, queue):
     # Import spmd and batch algo
-    from onedal.covariance import EmpiricalCovariance as EmpiricalCovariance_Batch
+    from sklearnex.preview.covariance import (
+        EmpiricalCovariance as EmpiricalCovariance_Batch,
+    )
     from sklearnex.spmd.covariance import EmpiricalCovariance as EmpiricalCovariance_SPMD
 
     # Create gold data and convert to dataframe
@@ -65,8 +68,10 @@ def test_covariance_spmd_gold(dataframe, queue):
     spmd_result = EmpiricalCovariance_SPMD().fit(local_dpt_data)
     batch_result = EmpiricalCovariance_Batch().fit(data)
 
-    assert_allclose(spmd_result.covariance_, batch_result.covariance_)
-    assert_allclose(spmd_result.location_, batch_result.location_)
+    assert_allclose(
+        _as_numpy(spmd_result.covariance_), _as_numpy(batch_result.covariance_)
+    )
+    assert_allclose(_as_numpy(spmd_result.location_), _as_numpy(batch_result.location_))
 
 
 @pytest.mark.skipif(
@@ -78,7 +83,7 @@ def test_covariance_spmd_gold(dataframe, queue):
 @pytest.mark.parametrize("assume_centered", [True, False])
 @pytest.mark.parametrize(
     "dataframe,queue",
-    get_dataframes_and_queues(dataframe_filter_="dpnp,dpctl", device_filter_="gpu"),
+    get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
 )
 @pytest.mark.parametrize("dtype", [np.float32, np.float64])
 @pytest.mark.parametrize("use_raw_input", [True, False])
@@ -87,8 +92,9 @@ def test_covariance_spmd_synthetic(
     n_samples, n_features, assume_centered, dataframe, queue, dtype, use_raw_input
 ):
     # Import spmd and batch algo
-    # TODO: Align sklearnex spmd to sklearnex estimator with bias and swap onedal with sklearnex
-    from onedal.covariance import EmpiricalCovariance as EmpiricalCovariance_Batch
+    from sklearnex.preview.covariance import (
+        EmpiricalCovariance as EmpiricalCovariance_Batch,
+    )
     from sklearnex.spmd.covariance import EmpiricalCovariance as EmpiricalCovariance_SPMD
 
     # Generate data and convert to dataframe
@@ -106,5 +112,9 @@ def test_covariance_spmd_synthetic(
     batch_result = EmpiricalCovariance_Batch(assume_centered=assume_centered).fit(data)
 
     atol = 1e-5 if dtype == np.float32 else 1e-7
-    assert_allclose(spmd_result.covariance_, batch_result.covariance_, atol=atol)
-    assert_allclose(spmd_result.location_, batch_result.location_, atol=atol)
+    assert_allclose(
+        _as_numpy(spmd_result.covariance_), _as_numpy(batch_result.covariance_), atol=atol
+    )
+    assert_allclose(
+        _as_numpy(spmd_result.location_), _as_numpy(batch_result.location_), atol=atol
+    )