Merge d4253ae into 89b03eb

Author: vlad-perevezentsev

.flake8

@@ -56,7 +56,7 @@ exclude =
     build,
     dpnp/to_numba/*.py,
     conda.recipe,
-    tests/*.py,
+    dpnp/tests/*.py,
     tests_external/*.py,
     versioneer.py,
 

.pre-commit-config.yaml

@@ -32,9 +32,9 @@ repos:
     -   id: python-no-eval
         exclude: |
             (?x)^(
-                tests/test_arraycreation.py|
-                tests/test_sycl_queue.py|
-                tests/test_usm_type.py
+                dpnp/tests/test_arraycreation.py|
+                dpnp/tests/test_sycl_queue.py|
+                dpnp/tests/test_usm_type.py
             )$
     -   id: python-no-log-warn
     -   id: python-use-type-annotations

MANIFEST.in

@@ -50,14 +50,6 @@ test:
     requires:
       - pytest
       - setuptools
-    source_files:
-      - examples
-      - tests
-      - setup.cfg
-    commands:
-      - python -c "import dpnp; print(dpnp.__version__)"
-      - python -m dpctl -f
-      - pytest -s
 
 about:
     home: https://github.com/IntelPython/dpnp

conda-recipe/meta.yaml

@@ -26,3 +26,15 @@ if [ -n "${TBBROOT}" ]; then
     # shellcheck source=/dev/null
     . "${TBBROOT}"/env/vars.sh
 fi
+
+# If PYTHON is not set
+# assign it to the Python interpreter from the testing environment
+if [ -z "${PYTHON}" ]; then
+    PYTHON=$PREFIX/bin/python
+fi
+
+set -e
+
+$PYTHON -c "import dpctl; print(dpctl.__version__)"
+$PYTHON -m dpctl -f
+$PYTHON -m pytest -q -ra --disable-warnings --pyargs dpnp

conda-recipe/run_test.sh

@@ -1,6 +1,6 @@
 import numpy
 
-from tests import testing
+from dpnp.tests import testing
 
 numpy.testing.assert_allclose = testing.assert_allclose
 numpy.testing.assert_array_equal = testing.assert_array_equal

tests/__init__.py renamed to dpnp/tests/__init__.py

@@ -50,6 +50,45 @@ def get_excluded_tests(test_exclude_file):
     return excluded_tests
 
 
+def pytest_configure(config):
+    # By default, tests marked as slow will be deselected.
+    # To run all tests, use -m "slow or not slow".
+    # To run only slow tests, use -m "slow".
+    # Equivalent to addopts = -m "not slow"
+    if not config.getoption("markexpr"):
+        config.option.markexpr = "not slow"
+    # Equivalent to addopts = --tb=short
+    if not config.getoption("tbstyle"):
+        config.option.tbstyle = "short"
+    # Equivalent to addopts = --strict-markers
+    if not config.getoption("strict_markers"):
+        config.option.strict_markers = True
+
+    # Register pytest markers
+    config.addinivalue_line(
+        "markers", "slow: marks tests as slow (deselect with '-m \"not slow\"')"
+    )
+    config.addinivalue_line(
+        "markers",
+        "multi_gpu: marks tests that require a specified number of GPUs",
+    )
+
+    # Add warning filters
+    # pkg_resources
+    config.addinivalue_line(
+        "filterwarnings",
+        "ignore:pkg_resources is deprecated as an API:DeprecationWarning",
+    )
+    # NumPy arccosh
+    # Undefined behavior depends on the backend:
+    # NumPy with OpenBLAS for np.array[1.0] does not raise a warning
+    # while numpy with OneMKL raises RuntimeWarning
+    config.addinivalue_line(
+        "filterwarnings",
+        "ignore:invalid value encountered in arccosh:RuntimeWarning",
+    )
+
+
 def pytest_collection_modifyitems(config, items):
     test_path = os.path.split(__file__)[0]
     excluded_tests = []
@@ -95,6 +134,14 @@ def pytest_collection_modifyitems(config, items):
             if test_name == item_tbl_str:
                 item.add_marker(skip_mark)
 
+    # Handle the exclusion of tests marked as "slow"
+    selected_marker = config.getoption("markexpr")
+    if "not slow" in selected_marker:
+        skip_slow = pytest.mark.skip(reason="Skipping slow tests")
+        for item in items:
+            if "slow" in item.keywords:
+                item.add_marker(skip_slow)
+
 
 @pytest.fixture
 def allow_fall_back_on_numpy(monkeypatch):

tests/conftest.py renamed to dpnp/tests/conftest.py

@@ -2,8 +2,8 @@
 
 import numpy
 
-from tests.helper import has_support_aspect64
-from tests.third_party.cupy import testing
+from .helper import has_support_aspect64
+from .third_party.cupy import testing
 
 
 class TestArithmetic(unittest.TestCase):

tests/helper.py renamed to dpnp/tests/helper.py

@@ -10,9 +10,9 @@
 )
 
 import dpnp
-from tests.third_party.cupy import testing
 
 from .helper import get_all_dtypes, get_float_complex_dtypes
+from .third_party.cupy import testing
 
 
 class TestAtleast1d:

dpnp/tests/skipped_tests.tbl

@@ -14,7 +14,6 @@
 )
 
 import dpnp as inp
-from tests.third_party.cupy import testing
 
 from .helper import (
     assert_dtype_allclose,
@@ -25,6 +24,7 @@
     has_support_aspect64,
     is_cpu_device,
 )
+from .third_party.cupy import testing
 
 
 def vvsort(val, vec, size, xp):

dpnp/tests/skipped_tests_gpu.tbl

@@ -7,7 +7,6 @@
 from numpy.testing import assert_array_equal, assert_equal, assert_raises
 
 import dpnp
-from tests.third_party.cupy import testing
 
 from .helper import (
     assert_dtype_allclose,
@@ -18,6 +17,7 @@
     get_integer_dtypes,
     has_support_aspect64,
 )
+from .third_party.cupy import testing
 
 testdata = []
 testdata += [

dpnp/tests/skipped_tests_gpu_no_fp64.tbl

@@ -19,7 +19,6 @@
 
 import dpnp
 from dpnp.dpnp_array import dpnp_array
-from tests.third_party.cupy import testing
 
 from .helper import (
     assert_dtype_allclose,
@@ -36,6 +35,7 @@
     _get_numpy_arrays_2in_1out,
     _get_output_data_type,
 )
+from .third_party.cupy import testing
 
 
 class TestAngle:

tests/test_absolute.py renamed to dpnp/tests/test_absolute.py

@@ -1,6 +1,6 @@
 import unittest
 
-from tests.third_party.cupy import testing
+from .third_party.cupy import testing
 
 
 class TestMatMul(unittest.TestCase):

tests/test_amin_amax.py renamed to dpnp/tests/test_amin_amax.py

@@ -10,7 +10,6 @@
 )
 
 import dpnp
-from tests.third_party.cupy import testing
 
 from .helper import (
     assert_dtype_allclose,
@@ -20,6 +19,7 @@
     get_float_dtypes,
     has_support_aspect64,
 )
+from .third_party.cupy import testing
 
 
 class TestNanArgmaxNanArgmin:

tests/test_arithmetic.py renamed to dpnp/tests/test_arithmetic.py

@@ -5,7 +5,8 @@
 from numpy.testing import assert_raises
 
 import dpnp as dp
-from tests.third_party.cupy import testing
+
+from .third_party.cupy import testing
 
 
 class TestOuter(unittest.TestCase):

tests/test_arraycreation.py renamed to dpnp/tests/test_arraycreation.py

@@ -7,7 +7,8 @@
 )
 
 import dpnp
-from tests.helper import (
+
+from .helper import (
     assert_dtype_allclose,
     get_all_dtypes,
     get_float_dtypes,

tests/test_arraymanipulation.py renamed to dpnp/tests/test_arraymanipulation.py

@@ -1,4 +1,4 @@
-from tests.testing.array import (
+from dpnp.tests.testing.array import (
     assert_allclose,
     assert_array_equal,
     assert_equal,

tests/test_bitwise.py renamed to dpnp/tests/test_bitwise.py

@@ -3,8 +3,8 @@
 import numpy
 import pytest
 
-from tests.tests_perf.data_generator import *
-from tests.tests_perf.test_perf_base import DPNPTestPerfBase
+from dpnp.tests.tests_perf.data_generator import *
+from dpnp.tests.tests_perf.test_perf_base import DPNPTestPerfBase
 
 SEED = 7777777
 SL, SH = 10.0, 50.0

tests/test_copy.py renamed to dpnp/tests/test_copy.py

@@ -2,8 +2,8 @@
 import pytest
 
 import dpnp
-from tests.tests_perf.data_generator import *
-from tests.tests_perf.test_perf_base import DPNPTestPerfBase
+from dpnp.tests.tests_perf.data_generator import *
+from dpnp.tests.tests_perf.test_perf_base import DPNPTestPerfBase
 
 
 class TestDPNP(DPNPTestPerfBase):

tests/test_counting.py renamed to dpnp/tests/test_counting.py

@@ -1,8 +1,8 @@
 import numpy
 import pytest
 
-from tests.tests_perf.data_generator import *
-from tests.tests_perf.test_perf_base import DPNPTestPerfBase
+from dpnp.tests.tests_perf.data_generator import *
+from dpnp.tests.tests_perf.test_perf_base import DPNPTestPerfBase
 
 
 class TestDPNPMathematical(DPNPTestPerfBase):

tests/test_dlpack.py renamed to dpnp/tests/test_dlpack.py

@@ -2,8 +2,8 @@
 import pytest
 
 import dpnp
-from tests.tests_perf.data_generator import *
-from tests.tests_perf.test_perf_base import DPNPTestPerfBase
+from dpnp.tests.tests_perf.data_generator import *
+from dpnp.tests.tests_perf.test_perf_base import DPNPTestPerfBase
 
 
 def cos_2_args(input_A, input_B, lib):

tests/test_fft.py renamed to dpnp/tests/test_fft.py

@@ -1,6 +1,6 @@
 import unittest
 
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 
 class TestElementwise(unittest.TestCase):

tests/test_flat.py renamed to dpnp/tests/test_flat.py

@@ -5,7 +5,7 @@
 import pytest
 
 import dpnp as cupy
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 
 class TestSize(unittest.TestCase):

tests/test_flipping.py renamed to dpnp/tests/test_flipping.py

@@ -4,7 +4,7 @@
 import pytest
 
 import dpnp as cupy
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 
 class TestElementwise(unittest.TestCase):

tests/test_histogram.py renamed to dpnp/tests/test_histogram.py

@@ -6,7 +6,7 @@
 import pytest
 
 import dpnp as cupy
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 
 def _gen_array(dtype, alloc_q=None):

tests/test_indexing.py renamed to dpnp/tests/test_indexing.py

@@ -4,7 +4,7 @@
 import pytest
 
 import dpnp as cupy
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 
 @pytest.mark.skip("class Flags is not exposed")

tests/test_linalg.py renamed to dpnp/tests/test_linalg.py

@@ -7,7 +7,7 @@
 from dpctl.tensor._numpy_helper import AxisError
 
 import dpnp as cupy
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 
 def get_array_module(*args):

tests/test_logic.py renamed to dpnp/tests/test_logic.py

@@ -4,8 +4,8 @@
 import pytest
 
 import dpnp as cupy
-from tests.helper import has_support_aspect64
-from tests.third_party.cupy import testing
+from dpnp.tests.helper import has_support_aspect64
+from dpnp.tests.third_party.cupy import testing
 
 
 class TestConj(unittest.TestCase):

tests/test_manipulation.py renamed to dpnp/tests/test_manipulation.py

@@ -4,7 +4,7 @@
 import pytest
 
 import dpnp as cupy
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 
 @testing.parameterize(

tests/test_mathematical.py renamed to dpnp/tests/test_mathematical.py

@@ -2,7 +2,7 @@
 import pytest
 
 import dpnp as cupy
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 if numpy.lib.NumpyVersion(numpy.__version__) >= "2.0.0b1":
     from numpy.exceptions import ComplexWarning

tests/test_mixins.py renamed to dpnp/tests/test_mixins.py

@@ -3,8 +3,8 @@
 import numpy
 import pytest
 
-from tests.helper import has_support_aspect64
-from tests.third_party.cupy import testing
+from dpnp.tests.helper import has_support_aspect64
+from dpnp.tests.third_party.cupy import testing
 
 
 @testing.parameterize(

tests/test_nanfunctions.py renamed to dpnp/tests/test_nanfunctions.py

@@ -6,7 +6,7 @@
 import dpnp as cupy
 
 # from cupy.core import _accelerator
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 
 @testing.parameterize(

tests/test_ndarray.py renamed to dpnp/tests/test_ndarray.py

@@ -5,7 +5,7 @@
 import pytest
 
 import dpnp as cupy
-from tests.third_party.cupy import testing
+from dpnp.tests.third_party.cupy import testing
 
 
 class TestArrayBoolOp(unittest.TestCase):