Fix rebase issues

intel · Apr 18, 2024 · 8162e95 · 8162e95
1 parent 0324525
commit 8162e95
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/onedal/basic_statistics/basic_statistics.cpp b/onedal/basic_statistics/basic_statistics.cpp
@@ -160,11 +160,6 @@ void init_finalize_compute_ops(pybind11::module_& m) {
     });
 }
 
-template <typename Policy, typename Task>
-void init_compute_ops(py::module& m) {
-    init_compute_ops_dispatcher<Policy, Task>{}(m);
-}
-
 template <typename Task>
 void init_compute_result(py::module_& m) {
     using namespace dal::basic_statistics;
@@ -215,13 +210,13 @@ ONEDAL_PY_INIT_MODULE(basic_statistics) {
     auto sub = m.def_submodule("basic_statistics");
 
 #ifdef ONEDAL_DATA_PARALLEL_SPMD
-    ONEDAL_PY_INSTANTIATE(init_compute_ops, sub, policy_spmd, task_list);
+    ONEDAL_PY_INSTANTIATE(init_compute_ops, sub, policy_spmd, task::compute);
 #else // ONEDAL_DATA_PARALLEL_SPMD
-    ONEDAL_PY_INSTANTIATE(init_compute_ops, sub, policy_list, task_list);
-    ONEDAL_PY_INSTANTIATE(init_partial_compute_ops, sub, policy_list, task_list);
-    ONEDAL_PY_INSTANTIATE(init_finalize_compute_ops, sub, policy_list, task_list);
-    ONEDAL_PY_INSTANTIATE(init_compute_result, sub, task_list);
-    ONEDAL_PY_INSTANTIATE(init_partial_compute_result, sub, task_list);
+    ONEDAL_PY_INSTANTIATE(init_compute_ops, sub, policy_list, task::compute);
+    ONEDAL_PY_INSTANTIATE(init_partial_compute_ops, sub, policy_list, task::compute);
+    ONEDAL_PY_INSTANTIATE(init_finalize_compute_ops, sub, policy_list, task::compute);
+    ONEDAL_PY_INSTANTIATE(init_compute_result, sub, task::compute);
+    ONEDAL_PY_INSTANTIATE(init_partial_compute_result, sub, task::compute);
 #endif // ONEDAL_DATA_PARALLEL_SPMD
 }
 

diff --git a/onedal/basic_statistics/basic_statistics.py b/onedal/basic_statistics/basic_statistics.py
@@ -24,7 +24,7 @@
 from ..datatypes import _convert_to_supported, from_table, to_table
 
 
-class BaseBasicStatistics(metaclass=ABCMeta):
+class BaseBasicStatistics(BaseEstimator, metaclass=ABCMeta):
     @abstractmethod
     def __init__(self, result_options, algorithm):
         self.options = result_options

diff --git a/onedal/basic_statistics/incremental_basic_statistics.py b/onedal/basic_statistics/incremental_basic_statistics.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.

diff --git a/sklearnex/basic_statistics/basic_statistics.py b/sklearnex/basic_statistics/basic_statistics.py
@@ -14,12 +14,12 @@
 # limitations under the License.
 # ==============================================================================
 
-from daal4py.sklearn._utils import control_n_jobs, run_with_n_jobs
+from daal4py.sklearn._n_jobs_support import control_n_jobs
 from onedal._device_offload import support_usm_ndarray
 from onedal.basic_statistics import BasicStatistics as onedal_BasicStatistics
 
 
-@control_n_jobs
+@control_n_jobs(decorated_methods=["fit"])
 class BasicStatistics:
     """
     Estimator for basic statistics.
@@ -69,7 +69,6 @@ def _save_attributes(self):
         for option in result_options:
             setattr(self, option, getattr(self._onedal_estimator, option))
 
-    @run_with_n_jobs
     def _onedal_fit(self, X, weights=None, queue=None):
         onedal_params = {
             "algorithm": "by_default",