Merge pull request cupy#8877 from asi1024/value-error-3dim-sparse

Raise ValueError upon attempts to create 3-dim sparse array
chainer-ci · Jan 20, 2025 · b7bd5ca · b7bd5ca
1 parent c2d9245
commit b7bd5ca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cupyx/scipy/sparse/_compressed.py b/cupyx/scipy/sparse/_compressed.py
@@ -256,7 +256,7 @@ def __init__(self, arg1, shape=None, dtype=None, copy=False):
 
         elif _base.isdense(arg1):
             if arg1.ndim > 2:
-                raise TypeError('expected dimension <= 2 array or matrix')
+                raise ValueError('expected dimension <= 2 array or matrix')
             elif arg1.ndim == 1:
                 arg1 = arg1[None]
             elif arg1.ndim == 0:

diff --git a/tests/cupyx_tests/scipy_tests/sparse_tests/test_csc.py b/tests/cupyx_tests/scipy_tests/sparse_tests/test_csc.py
@@ -203,10 +203,10 @@ def test_init_data_row_col(self):
         cupy.testing.assert_array_equal(n.indptr, self.m.indptr)
         assert n.shape == self.m.shape
 
-    @testing.with_requires('scipy')
+    @testing.with_requires('scipy>=1.15')
     def test_init_dense_invalid_ndim(self):
         for xp, sp in ((numpy, scipy.sparse), (cupy, sparse)):
-            with pytest.raises(TypeError):
+            with pytest.raises(ValueError):
                 m = xp.zeros((1, 1, 1), dtype=self.dtype)
                 sp.csc_matrix(m)
 

diff --git a/tests/cupyx_tests/scipy_tests/sparse_tests/test_csr.py b/tests/cupyx_tests/scipy_tests/sparse_tests/test_csr.py
@@ -247,11 +247,11 @@ def test_init_data_row_col(self):
         cupy.testing.assert_array_equal(n.indptr, self.m.indptr)
         assert n.shape == self.m.shape
 
-    @testing.with_requires('scipy')
+    @testing.with_requires('scipy>=1.15')
     def test_init_dense_invalid_ndim(self):
         for xp, sp in ((numpy, scipy.sparse), (cupy, sparse)):
             m = xp.zeros((1, 1, 1), dtype=self.dtype)
-            with pytest.raises(TypeError):
+            with pytest.raises(ValueError):
                 sp.csr_matrix(m)
 
     def test_copy(self):