Merge branch 'uxlfoundation:main' into dev/pytorch_testing_2

Author: icfaust

.ci/scripts/run_sklearn_tests.py

@@ -14,12 +14,14 @@
 # limitations under the License.
 # ===============================================================================
 
+import os
+
+os.environ["SCIPY_ARRAY_API"] = "1"
 from sklearnex import patch_sklearn
 
 patch_sklearn()
 
 import argparse
-import os
 import sys
 
 import pytest
@@ -43,8 +45,6 @@
     if os.environ["SELECTED_TESTS"] == "all":
         os.environ["SELECTED_TESTS"] = ""
 
-    os.environ["SCIPY_ARRAY_API"] = "1"
-
     pytest_args = (
         f"--rootdir={sklearn_file_dir} "
         f'{os.environ["DESELECTED_TESTS"]} {os.environ["SELECTED_TESTS"]}'.split(" ")

.github/workflows/docs-release.yml

@@ -42,12 +42,12 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         fetch-depth: 0  # Ensures all tags are fetched
 
     - name: Set Up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
       with:
         python-version: "3.11"
 

.github/workflows/openssf-scorecard.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 

.github/workflows/skywalking-eyes.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: "Run check"
         uses: apache/skywalking-eyes/header@61275cc80d0798a405cb070f7d3a8aaf7cf2c2c1 # v0.8.0
         with:

.pre-commit-config.yaml

@@ -28,7 +28,7 @@ repos:
     hooks:
       - id: clang-format
   - repo: https://github.com/numpy/numpydoc
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
       - id: numpydoc-validation
         exclude: |

conda-recipe/run_test.bat

@@ -28,7 +28,7 @@ if "%PYTHON%"=="python" (
     set NO_DIST=1
 )
 
-
+set SCIPY_ARRAY_API=1
 
 %PYTHON% -c "from sklearnex import patch_sklearn; patch_sklearn()" || set exitcode=1
 

conda-recipe/run_test.sh

@@ -36,6 +36,8 @@ if [ -z "${PYTHON}" ]; then
     export PYTHON=python
 fi
 
+export SCIPY_ARRAY_API=1
+
 # Note: execute with argument --json-report in order to produce
 # a JSON report under folder '.pytest_reports'. Other arguments
 # will also be forwarded to pytest.

daal4py/sklearn/linear_model/tests/test_linear.py

@@ -14,24 +14,14 @@
 # limitations under the License.
 # ==============================================================================
 
-
-from os import environ
-
-from daal4py.sklearn._utils import sklearn_check_version
-
-# sklearn requires manual enabling of Scipy array API support
-# if `array-api-compat` package is present in environment
-# TODO: create generic approach to handle this for all tests
-if sklearn_check_version("1.6"):
-    environ["SCIPY_ARRAY_API"] = "1"
-
-
 import numpy as np
 import pytest
 from sklearn.datasets import make_regression
 from sklearn.linear_model import LinearRegression
 from sklearn.utils._testing import assert_array_almost_equal
 
+from daal4py.sklearn._utils import sklearn_check_version
+
 
 def make_dataset(n_samples, n_features, kind=np.array, random_state=0, types=None):
     try:

doc/sources/conf.py

@@ -272,6 +272,7 @@ def setup(app):
 linkcheck_ignore = [
     re.compile(r"https://github\.com/.+"),  # Avoid rate error
     re.compile(r"https://.*intel\.com/.+"),  # Avoid permission error
+    re.compile(r"https://medium\.com/.*"),  # Avoid Medium paywall/rate limit
 ]
 
 # Speed up link-check and fail faster

examples/sklearnex/basic_statistics_spmd.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 # ==============================================================================
 
-import dpctl.tensor as dpt
+import dpnp
 import numpy as np
 from dpctl import SyclQueue
 from mpi4py import MPI
@@ -51,14 +51,14 @@ def generate_data(par, size, seed=777):
 data, weights = generate_data(params_spmd, size, seed=rank)
 weighted_data = np.diag(weights) @ data
 
-dpt_data = dpt.asarray(data, usm_type="device", sycl_queue=q)
-dpt_weights = dpt.asarray(weights, usm_type="device", sycl_queue=q)
+dpnp_data = dpnp.asarray(data, usm_type="device", sycl_queue=q)
+dpnp_weights = dpnp.asarray(weights, usm_type="device", sycl_queue=q)
 
 gtr_mean = np.mean(weighted_data, axis=0)
 gtr_std = np.std(weighted_data, axis=0)
 
 bss = BasicStatisticsSpmd(["mean", "standard_deviation"])
-bss.fit(dpt_data, dpt_weights)
+bss.fit(dpnp_data, dpnp_weights)
 
 print(f"Computed mean on rank {rank}:\n", bss.mean_)
 print(f"Computed std on rank {rank}:\n", bss.standard_deviation_)