update a test + keep functionin alphabetic order

Author: vtavana

dpnp/fft/dpnp_utils_fft.py

@@ -72,37 +72,6 @@ def _check_norm(norm):
         )
 
 
-# TODO: c2r keyword is place holder for irfftn
-def _cook_nd_args(a, s=None, axes=None, c2r=False):
-    if s is None:
-        shapeless = True
-        if axes is None:
-            s = list(a.shape)
-        else:
-            s = numpy.take(a.shape, axes)
-    else:
-        shapeless = False
-
-    for s_i in s:
-        if s_i is not None and s_i < 1 and s_i != -1:
-            raise ValueError(
-                f"Invalid number of FFT data points ({s_i}) specified."
-            )
-
-    if axes is None:
-        axes = list(range(-len(s), 0))
-
-    if len(s) != len(axes):
-        raise ValueError("Shape and axes have different lengths.")
-
-    s = list(s)
-    if c2r and shapeless:
-        s[-1] = (a.shape[axes[-1]] - 1) * 2
-    # use the whole input array along axis `i` if `s[i] == -1`
-    s = [a.shape[_a] if _s == -1 else _s for _s, _a in zip(s, axes)]
-    return s, axes
-
-
 def _commit_descriptor(a, in_place, c2c, a_strides, index, axes):
     """Commit the FFT descriptor for the input array."""
 
@@ -197,6 +166,37 @@ def _compute_result(dsc, a, out, forward, c2c, a_strides):
     return result
 
 
+# TODO: c2r keyword is place holder for irfftn
+def _cook_nd_args(a, s=None, axes=None, c2r=False):
+    if s is None:
+        shapeless = True
+        if axes is None:
+            s = list(a.shape)
+        else:
+            s = numpy.take(a.shape, axes)
+    else:
+        shapeless = False
+
+    for s_i in s:
+        if s_i is not None and s_i < 1 and s_i != -1:
+            raise ValueError(
+                f"Invalid number of FFT data points ({s_i}) specified."
+            )
+
+    if axes is None:
+        axes = list(range(-len(s), 0))
+
+    if len(s) != len(axes):
+        raise ValueError("Shape and axes have different lengths.")
+
+    s = list(s)
+    if c2r and shapeless:
+        s[-1] = (a.shape[axes[-1]] - 1) * 2
+    # use the whole input array along axis `i` if `s[i] == -1`
+    s = [a.shape[_a] if _s == -1 else _s for _s, _a in zip(s, axes)]
+    return s, axes
+
+
 def _copy_array(x, complex_input):
     """
     Creating a C-contiguous copy of input array if input array has a negative

tests/test_fft.py

@@ -361,10 +361,10 @@ class TestFft2:
     def setup_method(self):
         numpy.random.seed(42)
 
-    @pytest.mark.parametrize("dtype", get_all_dtypes(no_bool=True))
+    @pytest.mark.parametrize("dtype", get_all_dtypes(no_complex=True))
     def test_fft2(self, dtype):
         x1 = numpy.random.uniform(-10, 10, 24)
-        a_np = numpy.array(x1).reshape(2, 3, 4)
+        a_np = numpy.array(x1, dtype=dtype).reshape(2, 3, 4)
         a = dpnp.asarray(a_np)
 
         result = dpnp.fft.fft2(a)