Merge pull request #8084 from chainer-ci/bp-8059-v13-fix-medfilt-erro…

…rtype [backport] Fix `scp.signal.{medfilt,medfilt2d}` to raise ValueError for complex64 inputs
cupy · Jan 28, 2024 · e34e2a0 · e34e2a0
2 parents 6ba9395 9329927
commit e34e2a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tests/cupyx_tests/scipy_tests/signal_tests/test_fir_filter_design.py b/tests/cupyx_tests/scipy_tests/signal_tests/test_fir_filter_design.py
@@ -337,13  337,15 @@ def test_firls_freqz(self, xp, scp):
     @testing.numpy_cupy_allclose(scipy_name='scp')
     def test_compare(self, xp, scp):
         # compare to OCTAVE output
-        taps = scp.signal.firls(9, [0, 0.5, 0.55, 1], [1, 1, 0, 0], [1, 2])
         taps = scp.signal.firls(
             9, [0, 0.5, 0.55, 1], [1, 1, 0, 0], weight=[1, 2])
         return taps
 
     @testing.numpy_cupy_allclose(scipy_name='scp')
     def test_compare_2(self, xp, scp):
         # compare to MATLAB output
-        taps = scp.signal.firls(11, [0, 0.5, 0.5, 1], [1, 1, 0, 0], [1, 2])
         taps = scp.signal.firls(
             11, [0, 0.5, 0.5, 1], [1, 1, 0, 0], weight=[1, 2])
         return taps
 
     @testing.numpy_cupy_allclose(scipy_name='scp')

diff --git a/tests/cupyx_tests/scipy_tests/signal_tests/test_signaltools.py b/tests/cupyx_tests/scipy_tests/signal_tests/test_signaltools.py
@@ -369,7  369,7 @@ def test_medfilt_no_complex(self, xp, scp, dtype):
             kernel_size = kernel_size[:volume.ndim]
         return scp.signal.medfilt(volume, kernel_size)
 
-    @testing.with_requires('scipy>=1.11.0')
     @testing.with_requires('scipy>=1.11.0', 'scipy<1.12.0rc1')
     @testing.for_all_dtypes()
     @testing.numpy_cupy_allclose(
         atol=1e-8, rtol=1e-8, scipy_name='scp',
@@ -400,7  400,7 @@ def test_medfilt2d_no_complex(self, xp, scp, dtype):
         kernel_size = self.kernel_size
         return scp.signal.medfilt2d(input, kernel_size)
 
-    @testing.with_requires('scipy>=1.11.0')
     @testing.with_requires('scipy>=1.11.0', 'scipy<1.12.0rc1')
     @testing.for_all_dtypes()
     @testing.numpy_cupy_allclose(
         atol=1e-8, rtol=1e-8, scipy_name='scp',