Skip to content

Commit bbe5985

Browse files
authored
Merge branch 'master' into adjust-windows-platform-check
2 parents c1aa371 + ac795ab commit bbe5985

File tree

10 files changed

+20
-44
lines changed

10 files changed

+20
-44
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
sudo apt-get install -y nvidia-cuda-toolkit clinfo
103103
104104
- name: Checkout repo
105-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
105+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
106106
with:
107107
fetch-depth: 0
108108

@@ -248,7 +248,7 @@ jobs:
248248
timeout-minutes: 10
249249

250250
steps:
251-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
251+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
252252
with:
253253
fetch-depth: 0
254254

.github/workflows/check-onemath.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
access_token: ${{ github.token }}
3939

4040
- name: Checkout DPNP repo
41-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
41+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4242
with:
4343
fetch-depth: 0
4444

@@ -78,7 +78,7 @@ jobs:
7878

7979
steps:
8080
- name: Checkout DPNP repo
81-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
81+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8282
with:
8383
fetch-depth: 0
8484

@@ -170,7 +170,7 @@ jobs:
170170

171171
steps:
172172
- name: Checkout DPNP repo
173-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
173+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
174174
with:
175175
fetch-depth: 0
176176

@@ -181,7 +181,7 @@ jobs:
181181
path: ${{ env.environment-file-loc }}
182182

183183
- name: Checkout oneMKL repo
184-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
184+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
185185
with:
186186
repository: 'oneapi-src/oneMKL'
187187
ref: 'develop'

.github/workflows/conda-package.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
access_token: ${{ github.token }}
5555

5656
- name: Checkout DPNP repo
57-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
57+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5858
with:
5959
fetch-depth: 0
6060

@@ -140,7 +140,7 @@ jobs:
140140

141141
steps:
142142
- name: Checkout DPNP repo
143-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
143+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
144144
with:
145145
fetch-depth: ${{ env.fetch-depth }}
146146
path: ${{ env.dpnp-repo-path }}
@@ -268,7 +268,7 @@ jobs:
268268

269269
steps:
270270
- name: Checkout DPNP repo
271-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
271+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
272272
with:
273273
fetch-depth: ${{ env.fetch-depth }}
274274
path: ${{ env.dpnp-repo-path }}
@@ -425,7 +425,7 @@ jobs:
425425
426426
steps:
427427
- name: Checkout DPNP repo
428-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
428+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
429429
with:
430430
fetch-depth: ${{ env.fetch-depth }}
431431

@@ -513,7 +513,7 @@ jobs:
513513

514514
steps:
515515
- name: Checkout DPNP repo
516-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
516+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
517517
with:
518518
fetch-depth: ${{ env.fetch-depth }}
519519
path: ${{ env.dpnp-repo-path }}
@@ -585,7 +585,7 @@ jobs:
585585
python -c "import dpnp; print(dpnp.__version__)"
586586
587587
- name: Clone array API tests repo
588-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
588+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
589589
with:
590590
repository: 'data-apis/array-api-tests'
591591
path: ${{ env.array-api-tests-path }}
@@ -666,7 +666,7 @@ jobs:
666666

667667
steps:
668668
- name: Checkout DPNP repo
669-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
669+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
670670
with:
671671
fetch-depth: ${{ env.fetch-depth }}
672672

@@ -692,7 +692,7 @@ jobs:
692692
activate-environment: ${{ env.cleanup-env-name }}
693693

694694
- name: Checkout repo
695-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
695+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
696696
with:
697697
repository: IntelPython/devops-tools
698698
fetch-depth: ${{ env.fetch-depth }}

.github/workflows/generate_coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
sudo gem install coveralls-lcov
6363
6464
- name: Checkout repo
65-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
65+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6666
with:
6767
fetch-depth: 0
6868

.github/workflows/openssf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3838
with:
3939
persist-credentials: false
4040

@@ -69,6 +69,6 @@ jobs:
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
72+
uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
7373
with:
7474
sarif_file: results.sarif

.github/workflows/pre-commit-autoupdate.yml

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

2020
steps:
2121
- name: Checkout DPNP repo
22-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323

2424
- name: Set up python
2525
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
pylint
3131
3232
- name: Checkout DPNP repo
33-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434
with:
3535
# use commit hash to make "no-commit-to-branch" check passing
3636
ref: ${{ github.sha }}

dpnp/tests/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ def numpy_version():
483483
return numpy.lib.NumpyVersion(numpy.__version__)
484484

485485

486-
def requires_intel_mkl_version(version):
486+
def requires_intel_mkl_version(version): # pragma: no cover
487487
"""
488488
Check if Intel MKL is used and its version is greater than or
489489
equal to the specified one.

dpnp/tests/test_linalg.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
has_support_aspect64,
2626
is_cpu_device,
2727
numpy_version,
28-
requires_intel_mkl_version,
2928
)
3029
from .third_party.cupy import testing
3130

@@ -1747,10 +1746,6 @@ def test_inv_singular_matrix(self, matrix):
17471746
assert_raises(numpy.linalg.LinAlgError, numpy.linalg.inv, a_np)
17481747
assert_raises(dpnp.linalg.LinAlgError, dpnp.linalg.inv, a_dp)
17491748

1750-
# TODO: remove skipif when Intel MKL 2025.2 is released
1751-
@pytest.mark.skipif(
1752-
not requires_intel_mkl_version("2025.2"), reason="mkl<2025.2"
1753-
)
17541749
def test_inv_singular_matrix_3D(self):
17551750
a_np = numpy.array(
17561751
[[[1, 2], [3, 4]], [[1, 2], [1, 2]], [[1, 3], [3, 1]]]
@@ -2766,13 +2761,6 @@ def test_slogdet_strides(self):
27662761
assert_allclose(sign_result, sign_expected)
27672762
assert_allclose(logdet_result, logdet_expected)
27682763

2769-
# TODO: remove skipif when Intel MKL 2025.2 is released
2770-
# Skip running on CPU because dpnp uses _getrf_batch only on CPU
2771-
# for dpnp.linalg.det/slogdet.
2772-
@pytest.mark.skipif(
2773-
is_cpu_device() and not requires_intel_mkl_version("2025.2"),
2774-
reason="mkl<2025.2",
2775-
)
27762764
@pytest.mark.parametrize(
27772765
"matrix",
27782766
[
@@ -2803,13 +2791,6 @@ def test_slogdet_singular_matrix(self, matrix):
28032791
assert_allclose(sign_result, sign_expected)
28042792
assert_allclose(logdet_result, logdet_expected)
28052793

2806-
# TODO: remove skipif when Intel MKL 2025.2 is released
2807-
# Skip running on CPU because dpnp uses _getrf_batch only on CPU
2808-
# for dpnp.linalg.det/slogdet.
2809-
@pytest.mark.skipif(
2810-
is_cpu_device() and not requires_intel_mkl_version("2025.2"),
2811-
reason="mkl<2025.2",
2812-
)
28132794
def test_slogdet_singular_matrix_3D(self):
28142795
a_np = numpy.array(
28152796
[[[1, 2], [3, 4]], [[1, 2], [1, 2]], [[1, 3], [3, 1]]]

dpnp/tests/third_party/cupy/linalg_tests/test_solve.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from dpnp.tests.helper import (
88
assert_dtype_allclose,
99
has_support_aspect64,
10-
requires_intel_mkl_version,
1110
)
1211
from dpnp.tests.third_party.cupy import testing
1312
from dpnp.tests.third_party.cupy.testing import _condition
@@ -214,10 +213,6 @@ def test_inv(self, dtype):
214213
):
215214
xp.linalg.inv(a)
216215

217-
# TODO: remove skipif when Intel MKL 2025.2 is released
218-
@pytest.mark.skipif(
219-
not requires_intel_mkl_version("2025.2"), reason="mkl<2025.2"
220-
)
221216
@testing.for_dtypes("ifdFD")
222217
def test_batched_inv(self, dtype):
223218
for xp in (numpy, cupy):

0 commit comments

Comments
 (0)