Skip to content

Commit 6f53b1a

Browse files
icfausticfaust
authored
Merge branch 'uxlfoundation:main' into dev/pytorch_testing_2
2 parents b9839fb + 1416f10 commit 6f53b1a

File tree

88 files changed

+3483
-1265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3483
-1265
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ steps:
6565
pip list
6666
env:
6767
NO_DPC: ${{ variables.NO_DPC }}
68-
DPCTL_VERSION: 0.20.2
69-
DPNP_VERSION: 0.18.1
70-
DPCPP_RT_VERSION: 2025.2.1
68+
DPCTL_VERSION: 0.21.0
69+
DPNP_VERSION: 0.19.0
70+
DPCPP_RT_VERSION: 2025.3.1
7171
displayName: "Install testing requirements"
7272
- script: |
7373
. /usr/share/miniconda/etc/profile.d/conda.sh

‎.ci/pipeline/linting.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#===============================================================================
1616
steps:
1717
- script: |
18-
python -m pip install --upgrade pip pre-commit==4.0.1
18+
python -m pip install --upgrade pip pre-commit==4.5.0
1919
pre-commit install
2020
pre-commit run --all-files --show-diff-on-failure
2121
displayName: 'Linting'

‎.ci/pipeline/nightly.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ jobs:
9696
timeoutInMinutes: 120
9797
strategy:
9898
matrix:
99-
Python3.11_SklearnMain:
100-
PYTHON_VERSION: '3.11'
99+
Python3.13_SklearnMain:
100+
PYTHON_VERSION: '3.13'
101101
SKLEARN_VERSION: 'main'
102102
pool:
103103
vmImage: 'ubuntu-24.04'
@@ -107,8 +107,8 @@ jobs:
107107
timeoutInMinutes: 120
108108
strategy:
109109
matrix:
110-
Python3.11_SklearnMain:
111-
PYTHON_VERSION: '3.11'
110+
Python3.13_SklearnMain:
111+
PYTHON_VERSION: '3.13'
112112
SKLEARN_VERSION: 'main'
113113
pool:
114114
vmImage: 'windows-2022'

‎.ci/scripts/install_dpcpp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
2121
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
2222
sudo add-apt-repository -y "deb https://apt.repos.intel.com/oneapi all main"
2323
sudo apt-get update
24-
sudo apt-get install -y intel-dpcpp-cpp-compiler-2025.2
24+
sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp=2025.3.1-760
2525
sudo bash -c 'echo libintelocl.so > /etc/OpenCL/vendors/intel-cpu.icd'

‎.ci/scripts/select_sklearn_tests.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,18 @@ def parse_tests_tree(entry, prefix=""):
4141
"covariance/tests": "test_covariance.py",
4242
"decomposition/tests": ["test_pca.py", "test_incremental_pca.py"],
4343
"ensemble/tests": "test_forest.py",
44-
"linear_model/tests": ["test_base.py", "test_coordinate_descent.py", "test_ridge.py"],
44+
"linear_model/tests": [
45+
"test_base.py",
46+
"test_coordinate_descent.py",
47+
"test_logistic.py",
48+
"test_ridge.py",
49+
],
4550
"manifold/tests": "test_t_sne.py",
4651
"metrics/tests": ["test_pairwise.py", "test_ranking.py"],
4752
"model_selection/tests": ["test_split.py", "test_validation.py"],
4853
"neighbors/tests": ["test_lof.py", "test_neighbors.py", "test_neighbors_pipeline.py"],
4954
"svm/tests": ["test_sparse.py", "test_svm.py"],
55+
"tests": "test_dummy.py",
5056
}
5157
if sklearn_check_version("1.2"):
5258
tests_map["tests"] = ["test_public_functions.py"]

‎.github/CODEOWNERS‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
# Infra and tools
2-
.* @Alexsandruss @homksei @ahuber21 @ethanglaser @icfaust @david-cortes-intel
3-
.ci/ @Alexsandruss @homksei @ahuber21 @ethanglaser @icfaust
4-
.circleci/ @Alexsandruss @homksei @ahuber21 @ethanglaser @icfaust
5-
.github/ @Alexsandruss @homksei @ahuber21 @ethanglaser @icfaust
2+
.* @homksei @ahuber21 @ethanglaser @icfaust @david-cortes-intel
3+
.ci/ @homksei @ahuber21 @ethanglaser @icfaust
4+
.circleci/ @homksei @ahuber21 @ethanglaser @icfaust
5+
.github/ @homksei @ahuber21 @ethanglaser @icfaust
66

77
# Docs
8-
*.md @maria-Petrova @napetrov @Alexsandruss @icfaust @david-cortes-intel @Vika-F @syakov-intel @yuejiaointel
9-
doc/ @maria-Petrova @Alexsandruss @icfaust @david-cortes-intel @Vika-F @syakov-intel @yuejiaointel
10-
requirements-doc.txt @Alexsandruss @icfaust @david-cortes-intel
8+
*.md @maria-Petrova @napetrov @icfaust @david-cortes-intel @Vika-F @syakov-intel @yuejiaointel
9+
doc/ @maria-Petrova @icfaust @david-cortes-intel @Vika-F @syakov-intel @yuejiaointel
10+
requirements-doc.txt @icfaust @david-cortes-intel
1111

1212
# sklearnex
13-
onedal/ @Alexsandruss @icfaust @ethanglaser @Vika-F @david-cortes-intel
14-
sklearnex/ @Alexsandruss @icfaust @ethanglaser @Vika-F @david-cortes-intel
13+
onedal/ @icfaust @ethanglaser @Vika-F @david-cortes-intel
14+
sklearnex/ @icfaust @ethanglaser @Vika-F @david-cortes-intel
1515

1616
# Examples
17-
examples/ @syakov-intel @Alexsandruss @napetrov @david-cortes-intel
17+
examples/ @syakov-intel @napetrov @david-cortes-intel
1818

1919
# Dependencies
20-
conda-recipe/ @napetrov @Alexsandruss @icfaust @david-cortes-intel
21-
dependencies-dev @napetrov @Alexsandruss @homksei @ahuber21 @ethanglaser
22-
pyproject.toml @napetrov @Alexsandruss @homksei @ahuber21 @ethanglaser
23-
requirements* @napetrov @Alexsandruss @homksei @ahuber21 @ethanglaser
24-
setup.* @napetrov @Alexsandruss @icfaust @david-cortes-intel
20+
conda-recipe/ @napetrov @icfaust @david-cortes-intel
21+
dependencies-dev @napetrov @homksei @ahuber21 @ethanglaser
22+
pyproject.toml @napetrov @homksei @ahuber21 @ethanglaser
23+
requirements* @napetrov @homksei @ahuber21 @ethanglaser
24+
setup.* @napetrov @icfaust @david-cortes-intel
2525

2626
# Model builders
2727
*model_builders* @razdoburdin @ahuber21 @avolkov-intel @icfaust @david-cortes-intel
@@ -32,17 +32,17 @@ src/gbt_model_builder* @razdoburdin @ahuber21 @avolkov-intel @icfaust @da
3232
*ensemble* @razdoburdin @ahuber21 @avolkov-intel @icfaust @david-cortes-intel
3333

3434
# Testing
35-
**/test*.py @Alexsandruss @icfaust @yuejiaointel @david-cortes-intel @ahuber21 @ethanglaser
36-
deselected_tests.yaml @Alexsandruss @icfaust @yuejiaointel @david-cortes-intel @ahuber21 @ethanglaser
37-
tests/ @Alexsandruss @icfaust @yuejiaointel @david-cortes-intel @ahuber21 @ethanglaser
35+
**/test*.py @icfaust @yuejiaointel @david-cortes-intel @ahuber21 @ethanglaser
36+
deselected_tests.yaml @icfaust @yuejiaointel @david-cortes-intel @ahuber21 @ethanglaser
37+
tests/ @icfaust @yuejiaointel @david-cortes-intel @ahuber21 @ethanglaser
3838

3939
# Distributed
4040
*spmd* @ethanglaser
4141

4242
# daal4py
43-
daal4py/sklearn/ @Alexsandruss @icfaust
43+
daal4py/sklearn/ @icfaust
4444

4545
# Core
46-
generator/ @Alexsandruss @icfaust
47-
scripts/ @Alexsandruss @icfaust
48-
src/ @Alexsandruss @icfaust
46+
generator/ @icfaust
47+
scripts/ @icfaust
48+
src/ @icfaust

‎.github/renovate.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,22 @@
5454
],
5555
"depNameTemplate": "dpcpp-cpp-rt",
5656
"datasourceTemplate": "pypi"
57+
},
58+
{
59+
"customType": "regex",
60+
"fileMatch": ["^\\.ci/pipeline/linting\\.yml$"],
61+
"matchStrings": ["pre-commit==(?<currentValue>\\d+\\.\\d+\\.\\d+)"],
62+
"depNameTemplate": "pre-commit",
63+
"datasourceTemplate": "pypi"
64+
},
65+
{
66+
"customType": "regex",
67+
"fileMatch": ["^\\.ci\\/scripts\\/install_dpcpp\\.sh$"],
68+
"matchStrings": [
69+
".*\\b(?<depName>intel-oneapi-compiler-dpcpp-cpp)=(?<currentValue>\\d{4}\\.\\d+\\.\\d+-\\d+).*"
70+
],
71+
"datasourceTemplate": "deb",
72+
"registryUrlTemplate": "https://apt.repos.intel.com/oneapi?suite=all&components=main&binaryArch=amd64"
5773
}
5874
]
5975
}

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ concurrency:
3030
cancel-in-progress: true
3131

3232
env:
33-
DPCTL_VERSION: 0.20.2
34-
DPNP_VERSION: 0.18.1
33+
DPCTL_VERSION: 0.21.0
34+
DPNP_VERSION: 0.19.0
3535
DPCTL_PY_VERSIONS: '3.9\|3.11'
3636
UXL_PYTHONVERSION: "3.12"
3737
UXL_SKLEARNVERSION: "1.4"
@@ -78,21 +78,21 @@ jobs:
7878

7979
steps:
8080
- name: Checkout Scikit-learn-intelex
81-
uses: actions/checkout@v5
81+
uses: actions/checkout@v6
8282
- name: Install Python
8383
uses: actions/setup-python@v6
8484
with:
8585
python-version: ${{ matrix.PYTHON_VERSION }}
8686
- name: Download oneDAL build artifact
87-
uses: actions/download-artifact@v5
87+
uses: actions/download-artifact@v6
8888
with:
8989
name: __release_lnx
9090
github-token: ${{ github.token }}
9191
repository: ${{ env.ONEDAL_REPO }}
9292
run-id: ${{ needs.onedal_nightly.outputs.run-id }}
9393
path: ./__release_lnx
9494
- name: Download oneDAL environment artifact
95-
uses: actions/download-artifact@v5
95+
uses: actions/download-artifact@v6
9696
with:
9797
name: oneDAL_env
9898
github-token: ${{ github.token }}
@@ -162,7 +162,7 @@ jobs:
162162
source .github/scripts/activate_components.sh ${{ steps.set-env.outputs.DPCFLAG }}
163163
bash .github/scripts/generate_coverage_reports.sh lnx${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }} ${{ steps.set-env.outputs.DPCFLAG }}
164164
- name: Archive coverage report
165-
uses: actions/upload-artifact@v4
165+
uses: actions/upload-artifact@v5
166166
with:
167167
name: coverage_lnx_Py${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}
168168
path: |
@@ -193,21 +193,21 @@ jobs:
193193

194194
steps:
195195
- name: Checkout Scikit-learn-intelex
196-
uses: actions/checkout@v5
196+
uses: actions/checkout@v6
197197
- name: Install Python
198198
uses: actions/setup-python@v6
199199
with:
200200
python-version: ${{ matrix.PYTHON_VERSION }}
201201
- name: Download oneDAL build artifact
202-
uses: actions/download-artifact@v5
202+
uses: actions/download-artifact@v6
203203
with:
204204
name: __release_win
205205
github-token: ${{ github.token }}
206206
repository: ${{ env.ONEDAL_REPO }}
207207
run-id: ${{ needs.onedal_nightly.outputs.run-id }}
208208
path: ./__release_win
209209
- name: Download Intel BaseKit artifact
210-
uses: actions/download-artifact@v5
210+
uses: actions/download-artifact@v6
211211
with:
212212
name: intel_oneapi_basekit
213213
github-token: ${{ github.token }}
@@ -234,7 +234,7 @@ jobs:
234234
echo COVERAGE_RCFILE=%cd%\.coveragerc>> %GITHUB_ENV%
235235
- name: Download Intel OpenCL CPU Runtime artifact
236236
if: ${{ steps.set-env.outputs.DPCFLAG == '' }}
237-
uses: actions/download-artifact@v5
237+
uses: actions/download-artifact@v6
238238
with:
239239
name: opencl_rt_installer
240240
github-token: ${{ github.token }}
@@ -304,7 +304,7 @@ jobs:
304304
call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }}
305305
bash .github/scripts/generate_coverage_reports.sh win${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}
306306
- name: Archive coverage report
307-
uses: actions/upload-artifact@v4
307+
uses: actions/upload-artifact@v5
308308
with:
309309
name: coverage_win_Py${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}
310310
path: |
@@ -327,7 +327,7 @@ jobs:
327327

328328
steps:
329329
- name: Checkout Scikit-learn-intelex
330-
uses: actions/checkout@v5
330+
uses: actions/checkout@v6
331331
- name: Install Python
332332
uses: actions/setup-python@v6
333333
with:
@@ -337,15 +337,15 @@ jobs:
337337
**/dependencies-dev
338338
**/requirements-test.txt
339339
- name: Download oneDAL build artifact
340-
uses: actions/download-artifact@v5
340+
uses: actions/download-artifact@v6
341341
with:
342342
name: __release_lnx
343343
github-token: ${{ github.token }}
344344
repository: ${{ env.ONEDAL_REPO }}
345345
run-id: ${{ needs.onedal_nightly.outputs.run-id }}
346346
path: ./__release_lnx
347347
- name: Download oneDAL environment artifact
348-
uses: actions/download-artifact@v5
348+
uses: actions/download-artifact@v6
349349
with:
350350
name: oneDAL_env
351351
github-token: ${{ github.token }}
@@ -380,7 +380,7 @@ jobs:
380380
source .github/scripts/activate_components.sh ${{ steps.set-env.outputs.DPCFLAG }}
381381
python setup.py bdist_wheel
382382
- name: Archive sklearnex build
383-
uses: actions/upload-artifact@v4
383+
uses: actions/upload-artifact@v5
384384
with:
385385
name: sklearnex_build_${{ env.UXL_PYTHONVERSION }}
386386
path: |
@@ -403,7 +403,7 @@ jobs:
403403
timeout-minutes: 120
404404
steps:
405405
- name: Checkout Scikit-learn-intelex
406-
uses: actions/checkout@v5
406+
uses: actions/checkout@v6
407407
- name: Install Python
408408
uses: actions/setup-python@v6
409409
with:
@@ -412,15 +412,15 @@ jobs:
412412
**/dependencies-dev
413413
**/requirements-test.txt
414414
- name: Download oneDAL build artifact
415-
uses: actions/download-artifact@v5
415+
uses: actions/download-artifact@v6
416416
with:
417417
name: __release_lnx
418418
github-token: ${{ github.token }}
419419
repository: ${{ env.ONEDAL_REPO }}
420420
run-id: ${{ needs.onedal_nightly.outputs.run-id }}
421421
path: ./__release_lnx
422422
- name: Download oneDAL environment artifact
423-
uses: actions/download-artifact@v5
423+
uses: actions/download-artifact@v6
424424
with:
425425
name: oneDAL_env
426426
github-token: ${{ github.token }}
@@ -457,7 +457,7 @@ jobs:
457457
pip install $(python .ci/scripts/get_compatible_scipy_version.py ${{ env.UXL_SKLEARVERSION }}) pyyaml
458458
pip list
459459
- name: Download sklearnex wheel
460-
uses: actions/download-artifact@v5
460+
uses: actions/download-artifact@v6
461461
with:
462462
name: sklearnex_build_${{ env.UXL_PYTHONVERSION }}
463463
- name: Install PyTorch
@@ -483,7 +483,7 @@ jobs:
483483
source .github/scripts/activate_components.sh
484484
bash .github/scripts/generate_coverage_reports.sh uxl_lnx_${{ matrix.DEVICE }}
485485
- name: Archive coverage report
486-
uses: actions/upload-artifact@v4
486+
uses: actions/upload-artifact@v5
487487
with:
488488
name: coverage_uxl_lnx_${{ matrix.DEVICE }}
489489
path: |

‎.github/workflows/codecov.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232

3333
steps:
3434
- name: Checkout Scikit-learn-intelex
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636
- name: Download artifacts
37-
uses: actions/download-artifact@v5
37+
uses: actions/download-artifact@v6
3838
with:
3939
path: coverage
4040
github-token: ${{ github.token }}

‎.github/workflows/docs-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
steps:
4444
- name: Checkout Repository
45-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
45+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4646
with:
4747
fetch-depth: 0 # Ensures all tags are fetched
4848

0 commit comments

Comments
 (0)