Merge branch 'intel:master' into remove_the_batch_suffix_from_examples

razdoburdin · Jul 28, 2023 · a8ec489 · a8ec489
2 parents cd47d9c + eb5e673
commit a8ec489
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/sklearnex/preview/ensemble/extra_trees.py b/sklearnex/preview/ensemble/extra_trees.py
@@ -623,8 +623,6 @@ def _onedal_cpu_supported(self, method_name, *data):
                 ]
             )
 
-            dal_ready = dal_ready and not hasattr(self, "estimators_")
-
             if dal_ready and (self.random_state is not None):
                 warnings.warn(
                     "Setting 'random_state' value is not supported. "
@@ -685,8 +683,6 @@ def _onedal_gpu_supported(self, method_name, *data):
                 ]
             )
 
-            dal_ready &= not hasattr(self, "estimators_")
-
             if dal_ready and (self.random_state is not None):
                 warnings.warn(
                     "Setting 'random_state' value is not supported. "
@@ -1154,8 +1150,6 @@ def _onedal_cpu_supported(self, method_name, *data):
                 ]
             )
 
-            dal_ready &= not hasattr(self, "estimators_")
-
             if dal_ready and (self.random_state is not None):
                 warnings.warn(
                     "Setting 'random_state' value is not supported. "
@@ -1216,8 +1210,6 @@ def _onedal_gpu_supported(self, method_name, *data):
                 ]
             )
 
-            dal_ready &= not hasattr(self, "estimators_")
-
             if dal_ready and (self.random_state is not None):
                 warnings.warn(
                     "Setting 'random_state' value is not supported. "

diff --git a/sklearnex/preview/ensemble/forest.py b/sklearnex/preview/ensemble/forest.py
@@ -593,8 +593,6 @@ def _onedal_cpu_supported(self, method_name, *data):
                 return False
             elif not self.n_outputs_ == 1:
                 return False
-            elif hasattr(self, "estimators_"):
-                return False
             else:
                 return True
         if method_name in ["predict", "predict_proba"]:
@@ -643,8 +641,6 @@ def _onedal_gpu_supported(self, method_name, *data):
                 return False
             elif not self.n_outputs_ == 1:
                 return False
-            elif hasattr(self, "estimators_"):
-                return False
             else:
                 return True
         if method_name in ["predict", "predict_proba"]:
@@ -1004,8 +1000,6 @@ def _onedal_cpu_supported(self, method_name, *data):
                 return False
             elif not self.n_outputs_ == 1:
                 return False
-            elif hasattr(self, "estimators_"):
-                return False
             else:
                 return True
         if method_name == "predict":
@@ -1057,8 +1051,6 @@ def _onedal_gpu_supported(self, method_name, *data):
                 return False
             elif self.oob_score:
                 return False
-            elif hasattr(self, "estimators_"):
-                return False
             else:
                 return True
         if method_name == "predict":