Merge pull request #1409 from IntelPython/install-tests-elementwise-files

Install missing elementwise test files into the dpctl prefix

Author: oleksandr-pavlyk

conda-recipe/meta.yaml

@@ -27,7 +27,7 @@ requirements:
         - wheel
     run:
         - python
-        - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }}
+        - {{ pin_compatible('numpy', min_pin='x.x', upper_bound='1.26') }}
         - dpcpp-cpp-rt >=2023.2
         - level-zero  # [linux]
 

dpctl/tensor/_elementwise_common.py

@@ -316,7 +316,7 @@ def _resolve_weak_types(o1_dtype, o2_dtype, dev):
         o2_kind_num = _strong_dtype_num_kind(o2_dtype)
         if o1_kind_num > o2_kind_num:
             if isinstance(o1_dtype, WeakIntegralType):
-                return dpt.int64, o2_dtype
+                return dpt.dtype(ti.default_device_int_type(dev)), o2_dtype
             if isinstance(o1_dtype, WeakComplexType):
                 if o2_dtype is dpt.float16 or o2_dtype is dpt.float32:
                     return dpt.complex64, o2_dtype
@@ -335,7 +335,7 @@ def _resolve_weak_types(o1_dtype, o2_dtype, dev):
         o2_kind_num = _weak_type_num_kind(o2_dtype)
         if o2_kind_num > o1_kind_num:
             if isinstance(o2_dtype, WeakIntegralType):
-                return o1_dtype, dpt.int64
+                return o1_dtype, dpt.dtype(ti.default_device_int_type(dev))
             if isinstance(o2_dtype, WeakComplexType):
                 if o1_dtype is dpt.float16 or o1_dtype is dpt.float32:
                     return o1_dtype, dpt.complex64

dpctl/tests/elementwise/test_hyperbolic.py

@@ -15,6 +15,7 @@
 #  limitations under the License.
 
 import itertools
+import os
 
 import numpy as np
 import pytest
@@ -270,6 +271,7 @@ def test_hyper_real_special_cases(np_call, dpt_call, dtype):
     assert_allclose(dpt.asnumpy(dpt_call(yf)), Y_np, atol=tol, rtol=tol)
 
 
+@pytest.mark.skipif(os.name == "nt", reason="Known problems on Windows")
 @pytest.mark.parametrize("np_call, dpt_call", _all_funcs)
 @pytest.mark.parametrize("dtype", ["c8", "c16"])
 def test_hyper_complex_special_cases(np_call, dpt_call, dtype):

dpctl/tests/elementwise/test_trigonometric.py

@@ -15,6 +15,7 @@
 #  limitations under the License.
 
 import itertools
+import os
 
 import numpy as np
 import pytest
@@ -267,6 +268,7 @@ def test_trig_real_special_cases(np_call, dpt_call, dtype):
     assert_allclose(dpt.asnumpy(dpt_call(yf)), Y_np, atol=tol, rtol=tol)
 
 
+@pytest.mark.skipif(os.name == "nt", reason="Known problem on Windows")
 @pytest.mark.parametrize("np_call, dpt_call", _all_funcs)
 @pytest.mark.parametrize("dtype", ["c8", "c16"])
 def test_trig_complex_special_cases(np_call, dpt_call, dtype):
@@ -297,6 +299,9 @@ def test_trig_out_overlap(np_call, dpt_call, dtype):
     q = get_queue_or_skip()
     skip_if_dtype_not_supported(dtype, q)
 
+    if os.name == "nt" and dpt.isdtype(dpt.dtype(dtype), "complex floating"):
+        pytest.skip("Know problems on Windows")
+
     if np_call == np.tan:
         X = dpt.linspace(-np.pi / 2, np.pi / 2, 64, dtype=dtype, sycl_queue=q)[
             2:-2

setup.py

@@ -175,7 +175,9 @@ def _get_cmdclass():
         "dpctl.program",
         "dpctl.utils",
     ],
-    package_data={"dpctl": ["tests/*.*", "tests/helper/*.py"]},
+    package_data={
+        "dpctl": ["tests/*.*", "tests/helper/*.py", "tests/elementwise/*.py"]
+    },
     include_package_data=True,
     zip_safe=False,
     setup_requires=["Cython"],