Skip to content

Commit 994c33f

Browse files
authored
Merge branch 'master' into fix_heevd_hang_cpu
2 parents 4a53451 + f772017 commit 994c33f

File tree

8 files changed

+23
-39
lines changed

8 files changed

+23
-39
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
sudo apt-get install -y nvidia-cuda-toolkit clinfo
9292
9393
- name: Checkout repo
94-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
94+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
9595
with:
9696
fetch-depth: 0
9797

@@ -209,7 +209,7 @@ jobs:
209209
runs-on: ubuntu-20.04
210210

211211
steps:
212-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
212+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
213213
with:
214214
fetch-depth: 0
215215

.github/workflows/conda-package.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
strategy:
6868
matrix:
6969
python: ['3.9', '3.10', '3.11']
70-
os: [ubuntu-20.04, windows-latest]
70+
os: [ubuntu-20.04, windows-2019]
7171

7272
permissions:
7373
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -77,7 +77,7 @@ jobs:
7777

7878
defaults:
7979
run:
80-
shell: ${{ matrix.os == 'windows-latest' && 'cmd /C CALL {0}' || 'bash -l {0}' }}
80+
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -l {0}' }}
8181

8282
continue-on-error: true
8383

@@ -88,7 +88,7 @@ jobs:
8888
access_token: ${{ github.token }}
8989

9090
- name: Checkout DPNP repo
91-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
91+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
9292
with:
9393
fetch-depth: 0
9494

@@ -253,11 +253,11 @@ jobs:
253253
python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
254254
255255
test_windows:
256-
name: Test ['windows-latest', python='${{ matrix.python }}']
256+
name: Test ['windows-2019', python='${{ matrix.python }}']
257257

258258
needs: build
259259

260-
runs-on: windows-latest
260+
runs-on: windows-2019
261261

262262
defaults:
263263
run:
@@ -409,7 +409,7 @@ jobs:
409409
strategy:
410410
matrix:
411411
python: ['3.9', '3.10', '3.11']
412-
os: [ubuntu-20.04, windows-latest]
412+
os: [ubuntu-20.04, windows-2019]
413413

414414
runs-on: ${{ matrix.os }}
415415

@@ -477,7 +477,7 @@ jobs:
477477
run: conda install anaconda-client
478478

479479
- name: Checkout repo
480-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
480+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
481481
with:
482482
repository: IntelPython/devops-tools
483483
fetch-depth: 0

.github/workflows/generate_coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
access_token: ${{ github.token }}
3333

3434
- name: Checkout repo
35-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
35+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3636
with:
3737
fetch-depth: 0
3838

.github/workflows/openssf-scorecard.yml

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

3434
steps:
3535
- name: "Checkout code"
36-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
36+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3737
with:
3838
persist-credentials: false
3939

@@ -68,6 +68,6 @@ jobs:
6868

6969
# Upload the results to GitHub's code scanning dashboard.
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
71+
uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
7272
with:
7373
sarif_file: results.sarif

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
pylint
2727
2828
- name: Checkout DPNP repo
29-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
29+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3030

3131
- name: Set up python
3232
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0

setup.cfg

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@ max_line_length = 120
33
ignore = E201
44

55
[tool:pytest]
6-
addopts = -p no:warnings --tb=short
6+
# By default, tests marked as slow will be deselected.
7+
# To run all tests, use -m "slow and not slow".
8+
# To run only slow tests, use -m "slow".
9+
addopts = -m "not slow" -p no:warnings --tb=short --strict-markers
710
norecursedirs = tests_perf
811
testpaths = tests
12+
markers =
13+
slow: marks tests as slow (deselect with '-m "not slow"')
14+
multi_gpu: marks tests that require a specified number of GPUs
15+
# Added due to -p no:warnings to avoid errors with --strict-markers
16+
filterwarnings: mark to filter warnings during tests
917

1018
[versioneer]
1119
VCS = git

tests/test_mathematical.py

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -813,16 +813,6 @@ def test_op_with_scalar(array, val, func, data_type, val_type):
813813
pytest.skip(
814814
"(0j ** 0) is different: (NaN + NaNj) in dpnp and (1 + 0j) in numpy"
815815
)
816-
# TODO: Remove when #1378 (dpctl) is solved and 2024.1 is released (coverage is failing otherwise)
817-
elif (
818-
is_cpu_device()
819-
and dpnp_a.dtype == dpnp.complex128
820-
and dpnp_a.size >= 8
821-
and not dpnp.all(dpnp_a)
822-
):
823-
pytest.skip(
824-
"[..., 0j ** val] is different for x.size >= 8: [..., NaN + NaNj] in dpnp and [..., 0 + 0j] in numpy"
825-
)
826816

827817
if func == "subtract" and val_type == bool and data_type == dpnp.bool:
828818
with pytest.raises(TypeError):
@@ -1287,19 +1277,6 @@ def test_power(array, val, data_type, val_type):
12871277
dpnp_a = dpnp.array(array, dtype=data_type)
12881278
val_ = val_type(val)
12891279

1290-
# TODO: Remove when #1378 (dpctl) is solved and 2024.1 is released (coverage is failing otherwise)
1291-
if (
1292-
is_cpu_device()
1293-
and (
1294-
dpnp.complex128 in (data_type, val_type)
1295-
or dpnp.complex64 in (data_type, val_type)
1296-
)
1297-
and dpnp_a.size >= 8
1298-
):
1299-
pytest.skip(
1300-
"[..., 0j ** val] is different for x.size >= 8: [..., NaN + NaNj] in dpnp and [..., 0 + 0j] in numpy"
1301-
)
1302-
13031280
result = dpnp.power(dpnp_a, val_)
13041281
expected = numpy.power(np_a, val_)
13051282
assert_allclose(expected, result, rtol=1e-6)
@@ -2647,7 +2624,7 @@ def test_matmul_out_0D(self, out_shape):
26472624
assert result is dpnp_out
26482625
assert_dtype_allclose(result, expected)
26492626

2650-
@pytest.mark.skipif(is_cpu_device(), reason="large size")
2627+
@testing.slow
26512628
@pytest.mark.parametrize(
26522629
"shape",
26532630
[

tests/third_party/cupy/math_tests/test_sumprod.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from tests.helper import (
99
has_support_aspect16,
1010
has_support_aspect64,
11-
is_win_platform,
1211
)
1312
from tests.third_party.cupy import testing
1413

0 commit comments

Comments
 (0)