From fd71f50af6d52a5aef1fef59ffc5005064aee7ba Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Tue, 20 Jan 2026 05:23:11 -0800 Subject: [PATCH 1/2] Bump required dpctl version --- conda-recipe/meta.yaml | 2 +- environments/dpctl_pkg.txt | 2 +- environments/dpctl_pkg.yml | 2 +- pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 2fd55e07eb4b..661f44b50ed9 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ {% set max_compiler_and_mkl_version = environ.get("MAX_BUILD_CMPL_MKL_VERSION", "2026.0a0") %} {% set required_compiler_and_mkl_version = "2025.0" %} -{% set required_dpctl_version = "0.21.0" %} +{% set required_dpctl_version = "0.22.0*" %} {% set pyproject = load_file_data('pyproject.toml') %} {% set py_build_deps = pyproject.get('build-system', {}).get('requires', []) %} diff --git a/environments/dpctl_pkg.txt b/environments/dpctl_pkg.txt index 29fdceb21e82..9d585f1ec230 100644 --- a/environments/dpctl_pkg.txt +++ b/environments/dpctl_pkg.txt @@ -1,2 +1,2 @@ --index-url https://pypi.anaconda.org/dppy/label/dev/simple -dpctl>=0.21.0dev0 +dpctl>=0.22.0dev0 diff --git a/environments/dpctl_pkg.yml b/environments/dpctl_pkg.yml index 6cea30d0e65a..16d295cdc09c 100644 --- a/environments/dpctl_pkg.yml +++ b/environments/dpctl_pkg.yml @@ -2,4 +2,4 @@ name: Install dpctl package channels: - dppy/label/dev dependencies: - - dpctl>=0.21.0dev0 + - dpctl>=0.22.0dev0 diff --git a/pyproject.toml b/pyproject.toml index 42e142f266e9..d659428877fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,7 @@ dependencies = [ # "dpcpp-cpp-rt>=0.59.0", # "intel-cmplr-lib-rt>=0.59.0" # WARNING: use the latest dpctl dev version, otherwise stable w/f will fail - "dpctl>=0.21.0dev0", + "dpctl>=0.22.0dev0", "numpy>=1.26.0" ] description = "Data Parallel Extension for NumPy" From 59cab46b39cb1d9feadcf83d91da5008ca93bc58 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Tue, 20 Jan 2026 06:28:01 -0800 Subject: [PATCH 2/2] Follow up gh-2728 and extend muting to any GPU with non LTS2 version --- dpnp/tests/helper.py | 10 ++++++++-- dpnp/tests/test_mathematical.py | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dpnp/tests/helper.py b/dpnp/tests/helper.py index 7678028d4880..65917ee6c340 100644 --- a/dpnp/tests/helper.py +++ b/dpnp/tests/helper.py @@ -1,4 +1,5 @@ import importlib.util +from enum import Enum from sys import platform import dpctl @@ -11,6 +12,11 @@ from . import config +class LTS_VERSION(Enum): + V1_3 = "1.3" + V1_6 = "1.6" + + def _assert_dtype(a_dt, b_dt, check_only_type_kind=False): if check_only_type_kind: assert a_dt.kind == b_dt.kind, f"{a_dt.kind} != {b_dt.kind}" @@ -475,13 +481,13 @@ def is_lnl(device=None): return _get_dev_mask(device) == 0x6400 -def is_lts_driver(device=None): +def is_lts_driver(version=LTS_VERSION.V1_3, device=None): """ Return True if a test is running on a GPU device with LTS driver version, False otherwise. """ dev = dpctl.select_default_device() if device is None else device - return dev.has_aspect_gpu and "1.3" in dev.driver_version + return dev.has_aspect_gpu and version.value in dev.driver_version def is_ptl(device=None): diff --git a/dpnp/tests/test_mathematical.py b/dpnp/tests/test_mathematical.py index 1418a5a7fed1..e38cb149c303 100644 --- a/dpnp/tests/test_mathematical.py +++ b/dpnp/tests/test_mathematical.py @@ -20,6 +20,7 @@ from dpnp.dpnp_utils import map_dtype_to_device from .helper import ( + LTS_VERSION, assert_dtype_allclose, generate_random_numpy_array, get_abs_array, @@ -33,7 +34,7 @@ has_support_aspect16, has_support_aspect64, is_intel_numpy, - is_ptl, + is_lts_driver, numpy_version, ) from .third_party.cupy import testing @@ -218,7 +219,7 @@ def _get_exp_array(self, a, axis, dtype): @pytest.mark.parametrize("axis", [None, 2, -1]) @pytest.mark.parametrize("include_initial", [True, False]) def test_basic(self, dtype, axis, include_initial): - if axis is None and is_ptl(): + if axis is None and not is_lts_driver(version=LTS_VERSION.V1_6): pytest.skip("due to SAT-8336") a = dpnp.ones((3, 4, 5, 6, 7), dtype=dtype) @@ -238,7 +239,7 @@ def test_basic(self, dtype, axis, include_initial): @pytest.mark.parametrize("axis", [None, 2, -1]) @pytest.mark.parametrize("include_initial", [True, False]) def test_include_initial(self, dtype, axis, include_initial): - if axis is None and is_ptl(): + if axis is None and not is_lts_driver(version=LTS_VERSION.V1_6): pytest.skip("due to SAT-8336") a = dpnp.ones((3, 4, 5, 6, 7), dtype=dtype)