Add tests folder to dpnp conda package

.github/workflows/conda-package.yml

@@ -20,51 +20,51 @@ 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_fill.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
-      third_party/cupy/test_type_routines.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_fill.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
+      tests/third_party/cupy/test_type_routines.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'))))"
@@ -179,7 +179,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:
@@ -260,7 +260,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'

conda-recipe/meta.yaml

@@ -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/run_test.sh

@@ -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

scripts/gen_coverage.py

@@ -70,7 +70,7 @@ def run(
             "--cov-report",
             "term-missing",
             "--pyargs",
-            "tests",
+            "dpnp",
             "-vv",
             *pytest_opts.split(),
         ],

setup.cfg

@@ -2,25 +2,6 @@
 max_line_length = 120
 ignore = E201
 
-[tool:pytest]
-# By default, tests marked as slow will be deselected.
-# To run all tests, use -m "slow and not slow".
-# To run only slow tests, use -m "slow".
-addopts = -m "not slow" --tb=short --strict-markers
-norecursedirs = tests_perf
-testpaths = tests
-markers =
-    slow: marks tests as slow (deselect with '-m "not slow"')
-    multi_gpu: marks tests that require a specified number of GPUs
-filterwarnings =
-    # pkg_resources
-    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
-    ignore:invalid value encountered in arccosh:RuntimeWarning
-
 [versioneer]
 VCS = git
 versionfile_source = dpnp/_version.py

setup.py

@@ -46,6 +46,37 @@ def _get_cmdclass():
 Operating System :: Unix
 """
 
+EXCLUDED_DIRS = ["tests_perf"]
+
+
+def find_tests_files():
+    files_by_destination = {}
+    for root, dirs, files in os.walk("tests"):
+        # Exclude specified directories
+        dirs[:] = [dir for dir in dirs if dir not in EXCLUDED_DIRS]
+
+        for file in files:
+            file_path = os.path.join(root, file)
+            # Get the path relative to `tests`` to keep folder structure
+            relative_path = os.path.relpath(file_path, "tests")
+            destination = os.path.join(
+                "dpnp/tests", os.path.dirname(relative_path)
+            )
+
+            # Add the file to the correct destination folder in the dictionary
+            if destination not in files_by_destination:
+                files_by_destination[destination] = []
+            files_by_destination[destination].append(file_path)
+
+    # Convert the dictionary to the format expected by data_files:
+    # [(destination_folder, [list_of_files])]
+    tests_files = [
+        (dest, files) for dest, files in files_by_destination.items()
+    ]
+
+    return tests_files
+
+
 setup(
     name="dpnp",
     version=__version__,
@@ -67,12 +98,14 @@ def _get_cmdclass():
         "dpnp.linalg",
         "dpnp.random",
     ],
+    data_files=find_tests_files(),
     package_data={
         "dpnp": [
+            "backend/include/*.hpp",
             "libdpnp_backend_c.so",
             "dpnp_backend_c.lib",
             "dpnp_backend_c.dll",
         ]
     },
-    include_package_data=True,
+    include_package_data=False,
 )

tests/__init__.py

@@ -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/conftest.py

@@ -47,7 +47,62 @@ def get_excluded_tests(test_exclude_file):
     if os.path.exists(test_exclude_file):
         with open(test_exclude_file) as skip_names_file:
             excluded_tests = skip_names_file.readlines()
-    return excluded_tests
+    # Remove whitespace and filter out empty lines
+    return [line.strip() for line in excluded_tests if line.strip()]
+
+
+# Normalize the nodeid to a relative path starting
+# from the "tests/" directory
+def normalize_test_name(nodeid):
+    nodeid = nodeid.replace("\n", "").strip()
+
+    if "tests/" in nodeid:
+        nodeid = nodeid.split("tests/")[-1]
+
+    # Add the "tests/"" prefix to ensure the nodeid matches
+    # the paths in the skipped tests files.
+    normalized_nodeid = "tests/" + nodeid
+
+    return normalized_nodeid
+
+
+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):
@@ -85,16 +140,21 @@ def pytest_collection_modifyitems(config, items):
         excluded_tests.extend(get_excluded_tests(test_exclude_file))
 
     for item in items:
-        # some test name contains '\n' in the parameters
-        test_name = item.nodeid.replace("\n", "").strip()
+        test_name = normalize_test_name(item.nodeid)
 
         for item_tbl in excluded_tests:
-            # remove end-of-line character
-            item_tbl_str = item_tbl.strip()
             # exact match of the test name with items from excluded_list
-            if test_name == item_tbl_str:
+            if test_name == item_tbl:
                 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/test_arithmetic.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/test_arraycreation.py

@@ -12,13 +12,13 @@
 )
 
 import dpnp
-from tests.third_party.cupy import testing
 
 from .helper import (
     assert_dtype_allclose,
     get_all_dtypes,
     has_support_aspect64,
 )
+from .third_party.cupy import testing
 
 
 class TestTrace:

tests/test_arraymanipulation.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:

tests/test_indexing.py

@@ -14,9 +14,9 @@
 
 import dpnp
 from dpnp.dpnp_array import dpnp_array
-from tests.third_party.cupy import testing
 
 from .helper import get_all_dtypes, get_integer_dtypes, has_support_aspect64
+from .third_party.cupy import testing
 
 
 def _add_keepdims(func):