scikit-learn-intelex 2023.2.1__py39-none-win_amd64.whl → 2024.0.1__py39-none-win_amd64.whl

scikit_learn_intelex-2024.0.1.data/data/Lib/site-packages/sklearnex/ensemble/tests/test_forest.py

@@ -0,0 +1,118 @@
+#!/usr/bin/env python
+# ===============================================================================
+# 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.
+# ===============================================================================
+
+import pytest
+from numpy.testing import assert_allclose
+from sklearn.datasets import make_classification, make_regression
+
+from daal4py.sklearn._utils import daal_check_version
+from onedal.tests.utils._dataframes_support import (
+    _as_numpy,
+    _convert_to_dataframe,
+    get_dataframes_and_queues,
+)
+
+
+@pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
+def test_sklearnex_import_rf_classifier(dataframe, queue):
+    from sklearnex.ensemble import RandomForestClassifier
+
+    X, y = make_classification(
+        n_samples=1000,
+        n_features=4,
+        n_informative=2,
+        n_redundant=0,
+        random_state=0,
+        shuffle=False,
+    )
+    X = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
+    y = _convert_to_dataframe(y, sycl_queue=queue, target_df=dataframe)
+    rf = RandomForestClassifier(max_depth=2, random_state=0).fit(X, y)
+    assert "sklearnex" in rf.__module__
+    assert_allclose([1], _as_numpy(rf.predict([[0, 0, 0, 0]])))
+
+
+# TODO:
+# investigate failure for `dpnp.ndarrays` and `dpctl.tensors` on `GPU`
+@pytest.mark.parametrize(
+    "dataframe,queue", get_dataframes_and_queues(device_filter_="cpu")
+)
+def test_sklearnex_import_rf_regression(dataframe, queue):
+    from sklearnex.ensemble import RandomForestRegressor
+
+    X, y = make_regression(n_features=4, n_informative=2, random_state=0, shuffle=False)
+    X = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
+    y = _convert_to_dataframe(y, sycl_queue=queue, target_df=dataframe)
+    rf = RandomForestRegressor(max_depth=2, random_state=0).fit(X, y)
+    assert "sklearnex" in rf.__module__
+    pred = _as_numpy(rf.predict([[0, 0, 0, 0]]))
+    if daal_check_version((2024, "P", 0)):
+        assert_allclose([-6.971], pred, atol=1e-2)
+    else:
+        assert_allclose([-6.839], pred, atol=1e-2)
+
+
+# TODO:
+# investigate failure for `dpnp.ndarrays` and `dpctl.tensors` on `GPU`
+@pytest.mark.parametrize(
+    "dataframe,queue", get_dataframes_and_queues(device_filter_="cpu")
+)
+def test_sklearnex_import_et_classifier(dataframe, queue):
+    from sklearnex.ensemble import ExtraTreesClassifier
+
+    X, y = make_classification(
+        n_samples=1000,
+        n_features=4,
+        n_informative=2,
+        n_redundant=0,
+        random_state=0,
+        shuffle=False,
+    )
+    X = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
+    y = _convert_to_dataframe(y, sycl_queue=queue, target_df=dataframe)
+    # For the 2023.2 release, random_state is not supported
+    # defaults to seed=777, although it is set to 0
+    rf = ExtraTreesClassifier(max_depth=2, random_state=0).fit(X, y)
+    assert "sklearnex" in rf.__module__
+    assert_allclose([1], _as_numpy(rf.predict([[0, 0, 0, 0]])))
+
+
+# TODO:
+# investigate failure for `dpnp.ndarrays` and `dpctl.tensors` on `GPU`
+@pytest.mark.parametrize(
+    "dataframe,queue", get_dataframes_and_queues(device_filter_="cpu")
+)
+def test_sklearnex_import_et_regression(dataframe, queue):
+    from sklearnex.ensemble import ExtraTreesRegressor
+
+    X, y = make_regression(n_features=1, random_state=0, shuffle=False)
+    X = _convert_to_dataframe(X, sycl_queue=queue, target_df=dataframe)
+    y = _convert_to_dataframe(y, sycl_queue=queue, target_df=dataframe)
+    # For the 2023.2 release, random_state is not supported
+    # defaults to seed=777, although it is set to 0
+    rf = ExtraTreesRegressor(random_state=0).fit(X, y)
+    assert "sklearnex" in rf.__module__
+    pred = _as_numpy(
+        rf.predict(
+            [
+                [
+                    0,
+                ]
+            ]
+        )
+    )
+    assert_allclose([0.445], pred, atol=1e-2)

{scikit_learn_intelex-2023.2.1.data → scikit_learn_intelex-2024.0.1.data}/data/Lib/site-packages/sklearnex/glob/__main__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#===============================================================================
+# ===============================================================================
 # Copyright 2021 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,10 +13,9 @@
 # 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 sklearnex import patch_sklearn
-from sklearnex import unpatch_sklearn
+from sklearnex import patch_sklearn, unpatch_sklearn
 
 
 def _main():
@@ -34,15 +33,29 @@ def _main():
         description="""
             Patch all your Scikit-learn applications using Intel(R) Extension for
             scikit-learn.""",
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-
-    parser.register('action', 'extend', ExtendAction)
-    parser.add_argument('action', choices=["patch_sklearn", "unpatch_sklearn"],
-                        help="Enable or Disable patching")
-    parser.add_argument('--no-verbose', '-nv', action='store_false',
-                        help="Disable additional information about enabling patching")
-    parser.add_argument('--algorithm', '-a', action='extend', type=str, nargs="+",
-                        help="The name of an algorithm to be patched globally")
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+
+    parser.register("action", "extend", ExtendAction)
+    parser.add_argument(
+        "action",
+        choices=["patch_sklearn", "unpatch_sklearn"],
+        help="Enable or Disable patching",
+    )
+    parser.add_argument(
+        "--no-verbose",
+        "-nv",
+        action="store_false",
+        help="Disable additional information about enabling patching",
+    )
+    parser.add_argument(
+        "--algorithm",
+        "-a",
+        action="extend",
+        type=str,
+        nargs="+",
+        help="The name of an algorithm to be patched globally",
+    )
     args = parser.parse_args()
 
     if args.action == "patch_sklearn":
@@ -50,9 +63,11 @@ def _main():
     elif args.action == "unpatch_sklearn":
         unpatch_sklearn(global_unpatch=True)
     else:
-        raise RuntimeError("Invalid choice for the action attribute."
-                           " Expected: patch_sklearn or unpatch_sklearn."
-                           f" Got {args.action}")
+        raise RuntimeError(
+            "Invalid choice for the action attribute."
+            " Expected: patch_sklearn or unpatch_sklearn."
+            f" Got {args.action}"
+        )
 
 
 _main()

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

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#===============================================================================
+# ===============================================================================
 # Copyright 2021 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,8 @@
 # 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.
-#===============================================================================
+# ===============================================================================
+
 
 def get_patch_str(name=None, verbose=True):
     return f"""try:
@@ -36,46 +37,52 @@ except ImportError:
 def patch_sklearn_global(name=None, verbose=True):
     import os
     import re
+
     try:
         import sklearn
     except ImportError:
         raise ImportError("Scikit-learn could not be imported. Nothing to patch\n")
 
     init_file_path = sklearn.__file__
-    distributor_file_path = os.path.join(os.path.dirname(init_file_path),
-                                         "_distributor_init.py")
+    distributor_file_path = os.path.join(
+        os.path.dirname(init_file_path), "_distributor_init.py"
+    )
 
-    with open(distributor_file_path, 'r', encoding='utf-8') as distributor_file:
+    with open(distributor_file_path, "r", encoding="utf-8") as distributor_file:
         lines = distributor_file.read()
         if re.search(get_patch_str_re(), lines):
-            lines = re.sub(get_patch_str_re(), '', lines)
+            lines = re.sub(get_patch_str_re(), "", lines)
 
-    with open(distributor_file_path, 'w', encoding='utf-8') as distributor_file:
+    with open(distributor_file_path, "w", encoding="utf-8") as distributor_file:
         distributor_file.write(lines + "\n" + get_patch_str(name, verbose) + "\n")
-        print("Scikit-learn was successfully globally patched"
-              " by Intel(R) Extension for Scikit-learn")
+        print(
+            "Scikit-learn was successfully globally patched"
+            " by Intel(R) Extension for Scikit-learn"
+        )
         return
 
 
 def unpatch_sklearn_global():
     import os
     import re
+
     try:
         import sklearn
     except ImportError:
         raise ImportError("Scikit-learn could not be imported. Nothing to unpatch\n")
 
     init_file_path = sklearn.__file__
-    distributor_file_path = os.path.join(os.path.dirname(init_file_path),
-                                         "_distributor_init.py")
+    distributor_file_path = os.path.join(
+        os.path.dirname(init_file_path), "_distributor_init.py"
+    )
 
-    with open(distributor_file_path, 'r', encoding='utf-8') as distributor_file:
+    with open(distributor_file_path, "r", encoding="utf-8") as distributor_file:
         lines = distributor_file.read()
         if not re.search(get_patch_str_re(), lines):
             print("Nothing to unpatch: Scikit-learn is not patched\n")
             return
-        lines = re.sub(get_patch_str_re(), '', lines)
+        lines = re.sub(get_patch_str_re(), "", lines)
 
-    with open(distributor_file_path, 'w', encoding='utf-8') as distributor_file:
+    with open(distributor_file_path, "w", encoding="utf-8") as distributor_file:
         distributor_file.write(lines)
         print("Scikit-learn was successfully globally unpatched")

{scikit_learn_intelex-2023.2.1.data → scikit_learn_intelex-2024.0.1.data}/data/Lib/site-packages/sklearnex/linear_model/__init__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#===============================================================================
+# ===============================================================================
 # Copyright 2021 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,18 +13,18 @@
 # 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 .coordinate_descent import ElasticNet, Lasso
 from .linear import LinearRegression
-from .logistic_path import logistic_regression_path, LogisticRegression
+from .logistic_path import LogisticRegression, logistic_regression_path
 from .ridge import Ridge
-from .coordinate_descent import ElasticNet, Lasso
 
 __all__ = [
-    'Ridge',
-    'LinearRegression',
-    'LogisticRegression',
-    'logistic_regression_path',
-    'ElasticNet',
-    'Lasso'
+    "Ridge",
+    "LinearRegression",
+    "LogisticRegression",
+    "logistic_regression_path",
+    "ElasticNet",
+    "Lasso",
 ]

{scikit_learn_intelex-2023.2.1.data → scikit_learn_intelex-2024.0.1.data}/data/Lib/site-packages/sklearnex/linear_model/coordinate_descent.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#===============================================================================
+# ===============================================================================
 # Copyright 2021 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,6 @@
 # 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 daal4py.sklearn.linear_model import ElasticNet, Lasso