scikit-learn-intelex 2024.0.0__py310-none-win_amd64.whl → 2024.0.1__py310-none-win_amd64.whl

{scikit_learn_intelex-2024.0.0.data → scikit_learn_intelex-2024.0.1.data}/data/Lib/site-packages/sklearnex/_utils.py

@@ -81,6 +81,8 @@ def get_patch_message(s, queue=None):
             message += "CPU"
     elif s == "sklearn":
         message = "fallback to original Scikit-learn"
+    elif s == "sklearn_after_onedal":
+        message = "failed to run accelerated version, fallback to original Scikit-learn"
     else:
         raise ValueError(
             f"Invalid input - expected one of 'onedal','sklearn',"

{scikit_learn_intelex-2024.0.0.data → scikit_learn_intelex-2024.0.1.data}/data/Lib/site-packages/sklearnex/dispatcher.py

@@ -64,7 +64,11 @@ def get_patch_map():
             from .utils.parallel import _FuncWrapperOld as _FuncWrapper_sklearnex
 
         from .cluster import DBSCAN as DBSCAN_sklearnex
-
+        from .ensemble import ExtraTreesClassifier as ExtraTreesClassifier_sklearnex
+        from .ensemble import ExtraTreesRegressor as ExtraTreesRegressor_sklearnex
+        from .ensemble import RandomForestClassifier as RandomForestClassifier_sklearnex
+        from .ensemble import RandomForestRegressor as RandomForestRegressor_sklearnex
+        from .linear_model import LinearRegression as LinearRegression_sklearnex
         from .neighbors import KNeighborsClassifier as KNeighborsClassifier_sklearnex
         from .neighbors import KNeighborsRegressor as KNeighborsRegressor_sklearnex
         from .neighbors import LocalOutlierFactor as LocalOutlierFactor_sklearnex
@@ -73,17 +77,6 @@ def get_patch_map():
         # Preview classes for patching
         from .preview.cluster import KMeans as KMeans_sklearnex
         from .preview.decomposition import PCA as PCA_sklearnex
-        from .preview.ensemble import (
-            ExtraTreesClassifier as ExtraTreesClassifier_sklearnex,
-        )
-        from .preview.ensemble import ExtraTreesRegressor as ExtraTreesRegressor_sklearnex
-        from .preview.ensemble import (
-            RandomForestClassifier as RandomForestClassifier_sklearnex,
-        )
-        from .preview.ensemble import (
-            RandomForestRegressor as RandomForestRegressor_sklearnex,
-        )
-        from .preview.linear_model import LinearRegression as LinearRegression_sklearnex
         from .svm import SVC as SVC_sklearnex
         from .svm import SVR as SVR_sklearnex
         from .svm import NuSVC as NuSVC_sklearnex
@@ -91,75 +84,10 @@ def get_patch_map():
 
         # Patch for mapping
         if _is_preview_enabled():
-            # Ensemble
-            mapping["extra_trees_classifier"] = [
-                [
-                    (
-                        ensemble_module,
-                        "ExtraTreesClassifier",
-                        ExtraTreesClassifier_sklearnex,
-                    ),
-                    None,
-                ]
-            ]
-            mapping["extra_trees_regressor"] = [
-                [
-                    (
-                        ensemble_module,
-                        "ExtraTreesRegressor",
-                        ExtraTreesRegressor_sklearnex,
-                    ),
-                    None,
-                ]
-            ]
-            mapping["extratreesclassifier"] = mapping["extra_trees_classifier"]
-            mapping["extratreesregressor"] = mapping["extra_trees_regressor"]
-            mapping.pop("random_forest_classifier")
-            mapping.pop("random_forest_regressor")
-            mapping.pop("randomforestclassifier")
-            mapping.pop("randomforestregressor")
-            mapping["random_forest_classifier"] = [
-                [
-                    (
-                        ensemble_module,
-                        "RandomForestClassifier",
-                        RandomForestClassifier_sklearnex,
-                    ),
-                    None,
-                ]
-            ]
-            mapping["random_forest_regressor"] = [
-                [
-                    (
-                        ensemble_module,
-                        "RandomForestRegressor",
-                        RandomForestRegressor_sklearnex,
-                    ),
-                    None,
-                ]
-            ]
-            mapping["randomforestclassifier"] = mapping["random_forest_classifier"]
-            mapping["randomforestregressor"] = mapping["random_forest_regressor"]
-
             # PCA
             mapping.pop("pca")
             mapping["pca"] = [[(decomposition_module, "PCA", PCA_sklearnex), None]]
 
-            # Linear Regression
-            mapping.pop("linear")
-            mapping.pop("linearregression")
-            mapping["linear"] = [
-                [
-                    (
-                        linear_model_module,
-                        "LinearRegression",
-                        LinearRegression_sklearnex,
-                    ),
-                    None,
-                ]
-            ]
-            mapping["linearregression"] = mapping["linear"]
-
             # KMeans
             mapping.pop("kmeans")
             mapping["kmeans"] = [
@@ -185,6 +113,21 @@ def get_patch_map():
         mapping["nusvr"] = [[(svm_module, "NuSVR", NuSVR_sklearnex), None]]
         mapping["nusvc"] = [[(svm_module, "NuSVC", NuSVC_sklearnex), None]]
 
+        # Linear Regression
+        mapping.pop("linear")
+        mapping.pop("linearregression")
+        mapping["linear"] = [
+            [
+                (
+                    linear_model_module,
+                    "LinearRegression",
+                    LinearRegression_sklearnex,
+                ),
+                None,
+            ]
+        ]
+        mapping["linearregression"] = mapping["linear"]
+
         # kNN
         mapping.pop("knn_classifier")
         mapping.pop("kneighborsclassifier")
@@ -219,6 +162,56 @@ def get_patch_map():
         mapping["kneighborsregressor"] = mapping["knn_regressor"]
         mapping["nearestneighbors"] = mapping["nearest_neighbors"]
 
+        # Ensemble
+        mapping["extra_trees_classifier"] = [
+            [
+                (
+                    ensemble_module,
+                    "ExtraTreesClassifier",
+                    ExtraTreesClassifier_sklearnex,
+                ),
+                None,
+            ]
+        ]
+        mapping["extra_trees_regressor"] = [
+            [
+                (
+                    ensemble_module,
+                    "ExtraTreesRegressor",
+                    ExtraTreesRegressor_sklearnex,
+                ),
+                None,
+            ]
+        ]
+        mapping["extratreesclassifier"] = mapping["extra_trees_classifier"]
+        mapping["extratreesregressor"] = mapping["extra_trees_regressor"]
+        mapping.pop("random_forest_classifier")
+        mapping.pop("random_forest_regressor")
+        mapping.pop("randomforestclassifier")
+        mapping.pop("randomforestregressor")
+        mapping["random_forest_classifier"] = [
+            [
+                (
+                    ensemble_module,
+                    "RandomForestClassifier",
+                    RandomForestClassifier_sklearnex,
+                ),
+                None,
+            ]
+        ]
+        mapping["random_forest_regressor"] = [
+            [
+                (
+                    ensemble_module,
+                    "RandomForestRegressor",
+                    RandomForestRegressor_sklearnex,
+                ),
+                None,
+            ]
+        ]
+        mapping["randomforestclassifier"] = mapping["random_forest_classifier"]
+        mapping["randomforestregressor"] = mapping["random_forest_regressor"]
+
         # LocalOutlierFactor
         mapping["lof"] = [
             [

{scikit_learn_intelex-2024.0.0.data/data/Lib/site-packages/sklearnex/preview → scikit_learn_intelex-2024.0.1.data/data/Lib/site-packages/sklearnex}/ensemble/__init__.py

@@ -15,8 +15,12 @@
 # limitations under the License.
 # ===============================================================================
 
-from .extra_trees import ExtraTreesClassifier, ExtraTreesRegressor
-from .forest import RandomForestClassifier, RandomForestRegressor
+from ._forest import (
+    ExtraTreesClassifier,
+    ExtraTreesRegressor,
+    RandomForestClassifier,
+    RandomForestRegressor,
+)
 
 __all__ = [
     "ExtraTreesClassifier",