update tests

Author: vtavana

dpnp/backend/extensions/window/hamming_kernel.hpp

@@ -69,14 +69,14 @@ sycl::event hamming_impl(sycl::queue &q,
 
     T *res = reinterpret_cast<T *>(result);
 
-    sycl::event choose_ev = q.submit([&](sycl::handler &cgh) {
+    sycl::event hamming_ev = q.submit([&](sycl::handler &cgh) {
         cgh.depends_on(depends);
 
         cgh.parallel_for(sycl::range<1>(nelems),
                          HammingFunctor<T>(res, nelems));
     });
 
-    return choose_ev;
+    return hamming_ev;
 }
 
 } // namespace dpnp::extensions::window::kernels

dpnp/dpnp_iface_window.py

@@ -41,13 +41,37 @@
 # pylint: disable=protected-access
 
 import dpctl.utils as dpu
+import numpy
 
 import dpnp
 import dpnp.backend.extensions.window._window_impl as wi
 
 __all__ = ["hamming"]
 
 
+def _validate_input(val):
+
+    is_numpy_array = isinstance(val, numpy.ndarray)
+    is_array = dpnp.is_supported_array_type(val) or is_numpy_array
+    if is_array:
+        is_0d_arr = val.ndim == 0
+        is_int_float = dpnp.issubdtype(val.dtype, (dpnp.integer, dpnp.floating))
+        raise_error = not (is_0d_arr and is_int_float)
+        if not raise_error:
+            is_nan = numpy.isnan(val) if is_numpy_array else dpnp.isnan(val)
+            is_inf = numpy.isinf(val) if is_numpy_array else dpnp.isinf(val)
+            raise_error = is_nan or is_inf
+    else:
+        is_int = isinstance(val, (int, numpy.integer, dpnp.integer))
+        is_float = isinstance(val, (float, numpy.floating, dpnp.floating))
+        raise_error = not (is_int or is_float)
+        if not raise_error:
+            raise_error = val in [numpy.inf, -numpy.inf, numpy.nan]
+
+    if raise_error:
+        raise TypeError("M must be an integer")
+
+
 def hamming(M, device=None, usm_type=None, sycl_queue=None):
     r"""
     Return the Hamming window.
@@ -127,8 +151,9 @@ def hamming(M, device=None, usm_type=None, sycl_queue=None):
 
     """
 
-    if not isinstance(M, (int, float, dpnp.integer, dpnp.floating)):
-        raise TypeError("M must be an integer")
+    # if not isinstance(M, (int, float, dpnp.integer, dpnp.floating)):
+    #    raise TypeError("M must be an integer")
+    _validate_input(M)
 
     cfd_kwarg = {
         "device": device,

dpnp/tests/test_window.py

@@ -7,18 +7,44 @@
 from .helper import assert_dtype_allclose
 
 
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
 @pytest.mark.parametrize("func", ["hamming"])
 @pytest.mark.parametrize(
-    "M", [0, 1, 5.0, numpy.int64(0), numpy.int32(1), numpy.float32(5)]
+    "M",
+    [
+        True,
+        False,
+        0,
+        dpnp.int32(1),
+        4,
+        5.0,
+        dpnp.float32(6),
+        dpnp.array(7),
+        numpy.array(8),
+    ],
 )
 def test_window(func, M):
     result = getattr(dpnp, func)(M)
+
+    if isinstance(M, dpnp.ndarray):
+        M = M.asnumpy()
     expected = getattr(numpy, func)(M)
 
     assert_dtype_allclose(result, expected)
 
 
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
 @pytest.mark.parametrize("func", ["hamming"])
-@pytest.mark.parametrize("M", [5 + 4j, numpy.array(5)])
+@pytest.mark.parametrize(
+    "M",
+    [
+        5 + 4j,
+        numpy.array(5 + 4j),
+        dpnp.array([5]),
+        numpy.inf,
+        numpy.array(-numpy.inf),
+        dpnp.array(dpnp.nan),
+    ],
+)
 def test_window_error(func, M):
     assert_raises(TypeError, getattr(dpnp, func), M)