Merge branch 'main' into dev/eglaser-add-torch-spmd-validation

Author: ethanglaser

.ci/pipeline/build-and-test-lnx.yml

@@ -67,7 +67,7 @@ steps:
       NO_DPC: ${{ variables.NO_DPC }}
       DPCTL_VERSION: 0.21.1
       DPNP_VERSION: 0.19.1
-      DPCPP_RT_VERSION: 2025.3.2
+      DPCPP_RT_VERSION: 2025.3.3
     displayName: "Install testing requirements"
   - script: |
       . /usr/share/miniconda/etc/profile.d/conda.sh

.ci/scripts/get_compatible_scipy_version.py

@@ -1,56 +1,44 @@
-#! /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.
-# ===============================================================================
-from sys import argv, exit, stderr
-from sys import version_info as python_version
-
-if len(argv) == 1:
-    from daal4py.sklearn._utils import sklearn_check_version
-else:
-    # This is necessary to prevent import errors from sklearnex and by extension
-    # sklearn caused by initial scipy and/or numpy versions that are installed.
-    # It is written in a way to be `packaging` independent. This branch occurs
-    # when a sklearn version is given to the script externally.
-    def sklearn_check_version(ver):
-        ver = [int(i) if i != "" else 0 for i in ver.split(".")[:2]]
-        sk_ver = [int(i) if i != "" else 0 for i in str(argv[1]).split(".")[:2]]
-        return sk_ver[0] > ver[0] or (sk_ver[0] == ver[0] and sk_ver[1] >= ver[1])
-
-
-if sklearn_check_version("1.4"):
-    print("Scipy version is not specified for this sklearn/python version.", file=stderr)
-    print("scipy")
-elif sklearn_check_version("1.3") or python_version[1] > 11:
-    if python_version[1] > 8:
-        print("scipy==1.12.*")
-    else:
-        print("scipy==1.11.*")
-elif sklearn_check_version("1.2") or python_version[1] > 10:
-    if python_version[1] > 9:
-        print("scipy==1.12.*")
-    else:
-        print("scipy==1.9.*")
-elif sklearn_check_version("1.1"):
-    print("scipy==1.8.*")
-elif sklearn_check_version("1.0"):
-    print("scipy==1.7.*")
-else:
-    print(
-        "Scipy version defaults to not specified "
-        "for this outdated sklearn/python version.",
-        file=stderr,
-    )
-    print("scipy")
+#! /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.
+# ===============================================================================
+from sys import argv, exit, stderr
+from sys import version_info as python_version
+
+if len(argv) == 1:
+    from daal4py.sklearn._utils import sklearn_check_version
+else:
+    # This is necessary to prevent import errors from sklearnex and by extension
+    # sklearn caused by initial scipy and/or numpy versions that are installed.
+    # It is written in a way to be `packaging` independent. This branch occurs
+    # when a sklearn version is given to the script externally.
+    def sklearn_check_version(ver):
+        ver = [int(i) if i != "" else 0 for i in ver.split(".")[:2]]
+        sk_ver = [int(i) if i != "" else 0 for i in str(argv[1]).split(".")[:2]]
+        return sk_ver[0] > ver[0] or (sk_ver[0] == ver[0] and sk_ver[1] >= ver[1])
+
+
+if sklearn_check_version("1.4"):
+    print("Scipy version is not specified for this sklearn/python version.", file=stderr)
+    print("scipy")
+elif sklearn_check_version("1.0"):
+    print("scipy==1.10.*")
+else:
+    print(
+        "Scipy version defaults to not specified "
+        "for this outdated sklearn/python version.",
+        file=stderr,
+    )
+    print("scipy")

.ci/scripts/install_dpcpp.sh

@@ -21,5 +21,5 @@ rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
 echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
 sudo add-apt-repository -y "deb https://apt.repos.intel.com/oneapi all main"
 sudo apt-get update
-sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp=2025.3.2-832
+sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp=2025.3.3-30
 sudo bash -c 'echo libintelocl.so > /etc/OpenCL/vendors/intel-cpu.icd'

.circleci/deselect_tests.py

@@ -81,13 +81,10 @@ def create_pytest_switches(
         with open(filename, "r") as fh:
             dt = yaml_load(fh, Loader=FullLoader)
 
+        sklearn_dir = os.path.dirname(sklearn.__file__)
+
         if absolute:
-            base_dir = (
-                os.path.relpath(
-                    os.path.dirname(sklearn.__file__), os.path.expanduser("~")
-                )
-                + "/"
-            )
+            base_dir = os.path.relpath(sklearn_dir, os.path.expanduser("~")) + "/"
         elif base_dir is None:
             base_dir = ""
         elif not base_dir.endswith("/"):
@@ -129,6 +126,14 @@ def create_pytest_switches(
         for test_name in filtered_deselection:
             if test_name:
                 pytest_switches.extend(["--deselect=" + base_dir + test_name])
+
+        # Files that crash at collection time need --ignore instead of --deselect
+        for entry in dt.get("ignored_tests", []):
+            rel_path = filter_by_version_and_platform(entry, sklearn_version)
+            if rel_path:
+                pytest_switches.append(
+                    "--ignore=" + os.path.join(sklearn_dir, *rel_path.split("/"))
+                )
     return pytest_switches
 
 

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ concurrency:
 env:
   DPCTL_VERSION: 0.21.1
   DPNP_VERSION: 0.19.1
-  DPCTL_PY_VERSIONS: '3.10\|3.12'
+  DPCTL_PY_VERSIONS: '3.10\|3.14'
   UXL_PYTHONVERSION: "3.13"
   UXL_SKLEARNVERSION: "1.6"
   ONEDAL_REPO: "uxlfoundation/oneDAL"

.github/workflows/docs-release.yml

@@ -98,7 +98,7 @@ jobs:
         ./build-doc.sh --gh-pages
 
     - name: Setup Pages
-      uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
+      uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
 
     - name: Prepare Documentation for Deployment
       run: |

.pre-commit-config.yaml

@@ -16,7 +16,7 @@
 
 repos:
   - repo: https://github.com/psf/black
-    rev: 26.1.0
+    rev: 26.3.1
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/isort

README.md

@@ -93,6 +93,8 @@ Easiest way to benefit from accelerations from the extension is by patching scik
         clustering = DBSCAN(eps=3, min_samples=2).fit(X)
     ```
 
+:eyes: Read about [other ways to patch scikit-learn](https://uxlfoundation.github.io/scikit-learn-intelex/latest/quick-start.html#patching).
+
 :eyes: Check out available [notebooks](https://github.com/uxlfoundation/scikit-learn-intelex/tree/master/examples/notebooks) for more examples.
 
 ### Usage without patching
@@ -133,37 +135,6 @@ pip install scikit-learn-intelex
 
 Package is also offered through other channels such as conda-forge. See all installation instructions in the [Installation Guide](https://uxlfoundation.github.io/scikit-learn-intelex/latest/quick-start.html#installation).
 
-## Integration
-
-The easiest way of accelerating scikit-learn workflows with the extension is through through [patching](https://uxlfoundation.github.io/scikit-learn-intelex/latest/quick-start.html#patching), which replaces the stock scikit-learn algorithms with their optimized versions provided by the extension using the same namespaces in the same modules as scikit-learn.
-
-The patching only affects [supported algorithms and their parameters](https://uxlfoundation.github.io/scikit-learn-intelex/latest/algorithms.html).
-You can still use not supported ones in your code, the package simply fallbacks into the stock version of scikit-learn.
-
-> **_TIP:_** Enable [verbose mode](https://uxlfoundation.github.io/scikit-learn-intelex/latest/verbose.html) to see which implementation of the algorithm is currently used.
-
-To patch scikit-learn, you can:
-* Use the following command-line flag:
-  ```shell
-  python -m sklearnex my_application.py
-  ```
-* Add the following lines to the script:
-  ```python
-  from sklearnex import patch_sklearn
-  patch_sklearn()
-  ```
-
-:eyes: Read about [other ways to patch scikit-learn](https://uxlfoundation.github.io/scikit-learn-intelex/latest/quick-start.html#patching).
-
-As an alternative, accelerated classes from the extension can also be imported directly without patching, thereby allowing to keep them separate from stock scikit-learn ones - for example:
-
-```python
-from sklearnex.cluster import DBSCAN as exDBSCAN
-from sklearn.cluster import DBSCAN as stockDBSCAN
-
-# ...
-```
-
 ## Documentation
 
 * [Quick Start](https://uxlfoundation.github.io/scikit-learn-intelex/latest/quick-start.html)

conda-recipe/meta.yaml

@@ -93,6 +93,7 @@ test:
     - treelite
     - array-api-compat
     - array-api-strict
+    - polars
   source_files:
     - .ci
     - setup.cfg

daal4py/sklearn/_utils.py

@@ -200,6 +200,10 @@ def is_sparse(x):
     return sp.issparse(x) or (is_DataFrame(x) and hasattr(x, "sparse"))
 
 
+def check_is_array_api(x: object) -> bool:
+    return not isinstance(x, np.ndarray) and hasattr(x, "__dlpack__")
+
+
 class PatchingConditionsChain:
     def __init__(self, scope_name):
         self.scope_name = scope_name