Merge 4aded88 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,
 

.github/workflows/conda-package.yml

@@ -20,49 +20,49 @@ env:
   RUN_TESTS_MAX_ATTEMPTS: 2
   TEST_ENV_NAME: 'test'
   TEST_SCOPE: >-
-      test_absolute.py
-      test_amin_amax.py
-      test_arithmetic.py
-      test_arraycreation.py
-      test_arraymanipulation.py
-      test_bitwise.py
-      test_copy.py
-      test_counting.py
-      test_fft.py
-      test_flat.py
-      test_histogram.py
-      test_indexing.py
-      test_linalg.py
-      test_logic.py
-      test_manipulation.py
-      test_mathematical.py
-      test_mixins.py
-      test_nanfunctions.py
-      test_ndarray.py
-      test_outer.py
-      test_product.py
-      test_random_state.py
-      test_search.py
-      test_sort.py
-      test_special.py
-      test_statistics.py
-      test_sum.py
-      test_sycl_queue.py
-      test_umath.py
-      test_usm_type.py
-      third_party/cupy/core_tests
-      third_party/cupy/fft_tests
-      third_party/cupy/creation_tests
-      third_party/cupy/indexing_tests
-      third_party/cupy/lib_tests
-      third_party/cupy/linalg_tests
-      third_party/cupy/logic_tests
-      third_party/cupy/manipulation_tests
-      third_party/cupy/math_tests
-      third_party/cupy/sorting_tests
-      third_party/cupy/statistics_tests/test_histogram.py
-      third_party/cupy/statistics_tests/test_meanvar.py
-      third_party/cupy/test_ndim.py
+      tests/test_absolute.py
+      tests/test_amin_amax.py
+      tests/test_arithmetic.py
+      tests/test_arraycreation.py
+      tests/test_arraymanipulation.py
+      tests/test_bitwise.py
+      tests/test_copy.py
+      tests/test_counting.py
+      tests/test_fft.py
+      tests/test_flat.py
+      tests/test_histogram.py
+      tests/test_indexing.py
+      tests/test_linalg.py
+      tests/test_logic.py
+      tests/test_manipulation.py
+      tests/test_mathematical.py
+      tests/test_mixins.py
+      tests/test_nanfunctions.py
+      tests/test_ndarray.py
+      tests/test_outer.py
+      tests/test_product.py
+      tests/test_random_state.py
+      tests/test_search.py
+      tests/test_sort.py
+      tests/test_special.py
+      tests/test_statistics.py
+      tests/test_sum.py
+      tests/test_sycl_queue.py
+      tests/test_umath.py
+      tests/test_usm_type.py
+      tests/third_party/cupy/core_tests
+      tests/third_party/cupy/fft_tests
+      tests/third_party/cupy/creation_tests
+      tests/third_party/cupy/indexing_tests
+      tests/third_party/cupy/lib_tests
+      tests/third_party/cupy/linalg_tests
+      tests/third_party/cupy/logic_tests
+      tests/third_party/cupy/manipulation_tests
+      tests/third_party/cupy/math_tests
+      tests/third_party/cupy/sorting_tests
+      tests/third_party/cupy/statistics_tests/test_histogram.py
+      tests/third_party/cupy/statistics_tests/test_meanvar.py
+      tests/third_party/cupy/test_ndim.py
   VER_JSON_NAME: 'version.json'
   VER_SCRIPT1: "import json; f = open('version.json', 'r'); j = json.load(f); f.close(); "
   VER_SCRIPT2: "d = j['dpnp'][0]; print('='.join((d[s] for s in ('version', 'build'))))"
@@ -177,7 +177,7 @@ jobs:
       channel-path: '${{ github.workspace }}/channel/'
       pkg-path-in-channel: '${{ github.workspace }}/channel/linux-64/'
       extracted-pkg-path: '${{ github.workspace }}/pkg/'
-      tests-path: '${{ github.workspace }}/pkg/info/test/tests/'
+      # tests-path: '${{ github.workspace }}/pkg/info/test/tests/'
       ver-json-path: '${{ github.workspace }}/version.json'
 
     steps:
@@ -258,7 +258,7 @@ jobs:
         if: env.RERUN_TESTS_ON_FAILURE != 'true'
         run: |
           python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
-        working-directory: ${{ env.tests-path }}
+        # working-directory: ${{ env.tests-path }}
 
       - name: Run tests
         if: env.RERUN_TESTS_ON_FAILURE == 'true'

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