ENH: ndimage: specify unsafe casting so the default in NumPy can be t…

…ightened
mwiebe · Jun 15, 2011 · dffed56 · dffed56
1 parent 04fb79d
commit dffed56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/scipy/ndimage/filters.py b/scipy/ndimage/filters.py
@@ -447,7 +447,11 @@ def generic_gradient_magnitude(input, derivative, output = None,
                              *extra_arguments, **extra_keywords)
             numpy.multiply(tmp, tmp, tmp)
             output += tmp
-        numpy.sqrt(output, output)
+        # This allows the sqrt to work with a different default casting
+        if numpy.version.short_version > '1.6.1':
+            numpy.sqrt(output, output, casting='unsafe')
+        else:
+            numpy.sqrt(output, output)
     else:
         output[...] = input[...]
     return return_value

diff --git a/scipy/ndimage/tests/test_ndimage.py b/scipy/ndimage/tests/test_ndimage.py
@@ -669,7 +669,7 @@ def test_gaussian_gradient_magnitude01(self):
             output = ndimage.gaussian_gradient_magnitude(array,
                                                                        1.0)
             expected = tmp1 * tmp1 + tmp2 * tmp2
-            numpy.sqrt(expected, expected)
+            expected = numpy.sqrt(expected).astype(type)
             assert_array_almost_equal(expected, output)
 
     def test_gaussian_gradient_magnitude02(self):
@@ -684,7 +684,7 @@ def test_gaussian_gradient_magnitude02(self):
             ndimage.gaussian_gradient_magnitude(array, 1.0,
                                                            output)
             expected = tmp1 * tmp1 + tmp2 * tmp2
-            numpy.sqrt(expected, expected)
+            expected = numpy.sqrt(expected).astype(type)
             assert_array_almost_equal(expected, output)
 
     def test_generic_gradient_magnitude01(self):