Skip to content

Commit 2bcbf36

Browse files
author
Vahid Tavanashad
committed
Merge branch 'master' into syrk
2 parents 8592575 + d15d395 commit 2bcbf36

File tree

6 files changed

+30
-4
lines changed

6 files changed

+30
-4
lines changed

.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
71+
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
7272
with:
7373
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2222
* Updated existing GitHub workflows to add testing with Python 3.13 [#2510](https://github.com/IntelPython/dpnp/pull/2510)
2323
* Aligned the license expression with `PEP-639` [#2511](https://github.com/IntelPython/dpnp/pull/2511)
2424
* Bumped oneMKL version up to `v0.8` [#2514](https://github.com/IntelPython/dpnp/pull/2514)
25+
* Removed the use of class template argument deduction for alias template to conform to the C++17 standard [#2517](https://github.com/IntelPython/dpnp/pull/2517)
2526

2627
### Deprecated
2728

dpnp/backend/extensions/statistics/histogram.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,14 @@ struct HistogramF
139139
auto dispatch_edges = [&](uint32_t local_mem, const auto &weights,
140140
auto &hist) {
141141
if (device.is_gpu() && (local_mem >= bins_count + 1)) {
142-
auto edges = CachedEdges(bins_edges, bins_count + 1, cgh);
142+
auto edges =
143+
CachedEdges<BinsT>(bins_edges, bins_count + 1, cgh);
143144
submit_histogram(in, size, dims, WorkPI, hist, edges,
144145
weights, nd_range, cgh);
145146
}
146147
else {
147-
auto edges = UncachedEdges(bins_edges, bins_count + 1, cgh);
148+
auto edges =
149+
UncachedEdges<BinsT>(bins_edges, bins_count + 1, cgh);
148150
submit_histogram(in, size, dims, WorkPI, hist, edges,
149151
weights, nd_range, cgh);
150152
}
@@ -165,7 +167,8 @@ struct HistogramF
165167
}
166168
else {
167169
auto hist = HistGlobalMemory<HistType>(out);
168-
auto edges = UncachedEdges(bins_edges, bins_count + 1, cgh);
170+
auto edges =
171+
UncachedEdges<BinsT>(bins_edges, bins_count + 1, cgh);
169172
submit_histogram(in, size, dims, WorkPI, hist, edges,
170173
weights, nd_range, cgh);
171174
}

dpnp/tests/helper.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,14 @@ def is_lts_driver(device=None):
456456
return dev.has_aspect_gpu and "1.3" in dev.driver_version
457457

458458

459+
def is_ptl(device=None):
460+
"""
461+
Return True if a test is running on Panther Lake with Iris Xe3 GPU device,
462+
False otherwise.
463+
"""
464+
return _get_dev_mask(device) == 0xB000
465+
466+
459467
def is_win_platform():
460468
"""
461469
Return True if a test is running on Windows OS, False otherwise.

dpnp/tests/test_product.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
assert_dtype_allclose,
1313
generate_random_numpy_array,
1414
get_all_dtypes,
15+
is_gpu_device,
16+
is_ptl,
17+
is_win_platform,
1518
numpy_version,
1619
)
1720
from .third_party.cupy import testing
@@ -1151,6 +1154,7 @@ def test_large_values(self, dtype):
11511154
expected = numpy.matmul(a, b)
11521155
assert_dtype_allclose(result, expected)
11531156

1157+
@pytest.mark.skipif(is_ptl(), reason="MKLD-18712")
11541158
@pytest.mark.parametrize("dt_out", [numpy.int32, numpy.float32])
11551159
@pytest.mark.parametrize(
11561160
"shape1, shape2",
@@ -1495,6 +1499,9 @@ def test_invalid_axes(self, xp):
14951499

14961500
@testing.with_requires("numpy>=2.2")
14971501
class TestMatvec:
1502+
@pytest.mark.skipif(
1503+
is_win_platform() and not is_gpu_device(), reason="SAT-8073"
1504+
)
14981505
@pytest.mark.parametrize("dtype", get_all_dtypes(no_none=True))
14991506
@pytest.mark.parametrize(
15001507
"shape1, shape2",
@@ -2206,6 +2213,9 @@ def test_error(self, xp):
22062213

22072214
@testing.with_requires("numpy>=2.2")
22082215
class TestVecmat:
2216+
@pytest.mark.skipif(
2217+
is_win_platform() and not is_gpu_device(), reason="SAT-8073"
2218+
)
22092219
@pytest.mark.parametrize("dtype", get_all_dtypes(no_none=True))
22102220
@pytest.mark.parametrize(
22112221
"shape1, shape2",

dpnp/tests/test_umath.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
has_support_aspect64,
2424
is_cuda_device,
2525
is_gpu_device,
26+
is_win_platform,
2627
)
2728

2829
# full list of umaths
@@ -121,6 +122,9 @@ def test_umaths(test_cases):
121122
pytest.skip("dpnp.modf is not supported with dpnp.float16")
122123
elif is_cuda_device():
123124
pytest.skip("dpnp.modf is not supported on CUDA device")
125+
elif umath in ["vecmat", "matvec"]:
126+
if is_win_platform() and not is_gpu_device():
127+
pytest.skip("SAT-8073")
124128

125129
expected = getattr(numpy, umath)(*args)
126130
result = getattr(dpnp, umath)(*iargs)

0 commit comments

Comments
 (0)