Merge branch 'master' into resolve-gh-2352-2353

Author: antonwolfy

CHANGELOG.md

@@ -56,6 +56,7 @@ Also, that release drops support for Python 3.9, making Python 3.10 the minimum
 * Dropped support for Python 3.9 [#2626](https://github.com/IntelPython/dpnp/pull/2626)
 * Removed the obsolete interface from DPNP to Numba JIT [#2647](https://github.com/IntelPython/dpnp/pull/2647)
 * Removed the `newshape` parameter from `dpnp.reshape`, which has been deprecated since dpnp 0.17.0. Pass it positionally or use `shape=` on newer versions [#2670](https://github.com/IntelPython/dpnp/pull/2670)
+* Removed unused `pytest` configuration from `pyproject.toml` [#2729](https://github.com/IntelPython/dpnp/pull/2729)
 
 ### Fixed
 

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', []) %}

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):

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)

dpnp/tests/third_party/cupy/binary_tests/test_elementwise.py

@@ -1,11 +1,9 @@
 from __future__ import annotations
 
-import unittest
-
 from dpnp.tests.third_party.cupy import testing
 
 
-class TestElementwise(unittest.TestCase):
+class TestElementwise:
 
     @testing.for_int_dtypes()
     @testing.numpy_cupy_array_equal()

dpnp/tests/third_party/cupy/binary_tests/test_packing.py

@@ -1,4 +1,4 @@
-import unittest
+from __future__ import annotations
 
 import numpy
 import pytest
@@ -11,7 +11,7 @@
 )
 
 
-class TestPacking(unittest.TestCase):
+class TestPacking:
 
     @testing.for_int_dtypes()
     @testing.numpy_cupy_array_equal()

dpnp/tests/third_party/cupy/core_tests/test_array_function.py

@@ -1,4 +1,4 @@
-import unittest
+from __future__ import annotations
 
 import numpy
 import pytest
@@ -11,7 +11,7 @@
 )
 
 
-class TestArrayFunction(unittest.TestCase):
+class TestArrayFunction:
 
     @testing.with_requires("numpy>=1.17.0")
     def test_array_function(self):

dpnp/tests/third_party/cupy/core_tests/test_core.py

@@ -1,20 +1,23 @@
 from __future__ import annotations
 
 import sys
-import unittest
 
 import numpy
 import pytest
 
 import dpnp as cupy
+
+# from cupy._core import core
 from dpnp.tests.third_party.cupy import testing
 from dpnp.tests.third_party.cupy.testing._protocol_helpers import (
     DummyObjectWithCudaArrayInterface,
     DummyObjectWithCuPyGetNDArray,
 )
 
+# from cupy_tests.core_tests import test_raw
+
 
-class TestSize(unittest.TestCase):
+class TestSize:
 
     # def tearDown(self):
     #     # Free huge memory for slow test
@@ -58,7 +61,7 @@ def test_size_huge(self, xp):
 
 
 @pytest.mark.skip("no cupy._core submodule")
-class TestOrder(unittest.TestCase):
+class TestOrder:
 
     @testing.for_orders(_orders.keys())
     def test_ndarray(self, order):