Do not allow choose tests to fallback to NumPy

Author: ndgrigorian

dpnp/tests/test_indexing.py

@@ -865,7 +865,6 @@ def test_mode_clip(self):
         assert (result == dpnp.array([-2, 0, -2, 2])).all()
 
 
-@pytest.mark.usefixtures("allow_fall_back_on_numpy")
 def test_choose():
     a = numpy.r_[:4]
     ia = dpnp.array(a)
@@ -874,8 +873,10 @@ def test_choose():
     c = numpy.r_[100:500:100]
     ic = dpnp.array(c)
 
-    expected = numpy.choose([0, 0, 0, 0], [a, b, c])
-    result = dpnp.choose([0, 0, 0, 0], [ia, ib, ic])
+    inds_np = numpy.zeros(4, dtype="i4")
+    inds = dpnp.zeros(4, dtype="i4")
+    expected = numpy.choose(inds_np, [a, b, c])
+    result = dpnp.choose(inds, [ia, ib, ic])
     assert_array_equal(expected, result)
 
 

dpnp/tests/third_party/cupy/indexing_tests/test_indexing.py

@@ -206,39 +206,34 @@ def test_choose(self, xp, dtype):
         c = testing.shaped_arange((3, 4), xp, dtype)
         return a.choose(c)
 
-    @pytest.mark.usefixtures("allow_fall_back_on_numpy")
     @testing.for_all_dtypes()
     @testing.numpy_cupy_array_equal()
     def test_choose_broadcast(self, xp, dtype):
         a = xp.array([[1, 0, 1], [0, 1, 0], [1, 0, 1]])
         c = xp.array([-10, 10]).astype(dtype)
         return a.choose(c)
 
-    @pytest.mark.usefixtures("allow_fall_back_on_numpy")
     @testing.for_all_dtypes()
     @testing.numpy_cupy_array_equal()
     def test_choose_broadcast2(self, xp, dtype):
         a = xp.array([0, 1])
         c = testing.shaped_arange((3, 5, 2), xp, dtype)
         return a.choose(c)
 
-    @pytest.mark.usefixtures("allow_fall_back_on_numpy")
     @testing.for_all_dtypes()
     @testing.numpy_cupy_array_equal()
     def test_choose_wrap(self, xp, dtype):
         a = xp.array([0, 3, -1, 5])
         c = testing.shaped_arange((3, 4), xp, dtype)
         return a.choose(c, mode="wrap")
 
-    @pytest.mark.usefixtures("allow_fall_back_on_numpy")
     @testing.for_all_dtypes()
     @testing.numpy_cupy_array_equal()
     def test_choose_clip(self, xp, dtype):
         a = xp.array([0, 3, -1, 5])
         c = testing.shaped_arange((3, 4), xp, dtype)
         return a.choose(c, mode="clip")
 
-    @pytest.mark.usefixtures("allow_fall_back_on_numpy")
     @testing.with_requires("numpy>=1.19")
     def test_unknown_clip(self):
         for xp in (numpy, cupy):
@@ -247,14 +242,13 @@ def test_unknown_clip(self):
             with pytest.raises(ValueError):
                 a.choose(c, mode="unknown")
 
-    @pytest.mark.usefixtures("allow_fall_back_on_numpy")
+    @pytest.mark.skip("`raise` keyword not implemented")
     def test_raise(self):
         a = cupy.array([2])
         c = cupy.array([[0, 1]])
         with self.assertRaises(ValueError):
             a.choose(c)
 
-    @pytest.mark.usefixtures("allow_fall_back_on_numpy")
     @testing.for_all_dtypes()
     def test_choose_broadcast_fail(self, dtype):
         for xp in (numpy, cupy):