Merge pull request #7678 from lesteve/fix-python35-windows-clip-with-nan-bug

juliantaylor · juliantaylor · commit a075c3601254 · 2016-05-26T14:43:36.000+02:00
BUG: Fix np.clip bug NaN handling for Visual Studio 2015
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
@@ -3763,6 +3763,12 @@ static void
         }
     }
     else {
+// Visual Studio 2015 loop vectorizer handles NaN in an unexpected manner, see:
+// https://github.com/numpy/numpy/issues/7601
+// https://connect.microsoft.com/VisualStudio/feedback/details/2723801/unexpected-nan-handling-in-vectorized-loop
+#if (_MSC_VER == 1900)
+#pragma loop( no_vector )
+#endif
         for (i = 0; i < ni; i++) {
             if (@lt@(in[i], min_val)) {
                 out[i]   = min_val;
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
@@ -3452,6 +3452,12 @@ def test_max_or_min(self):
         x = val.clip(max=4)
         assert_(np.all(x <= 4))
 
+    def test_nan(self):
+        input_arr = np.array([-2., np.nan, 0.5, 3., 0.25, np.nan])
+        result = input_arr.clip(-1, 1)
+        expected = np.array([-1., np.nan, 0.5, 1., 0.25, np.nan])
+        assert_array_equal(result, expected)
+
 
 class TestCompress(TestCase):
     def test_axis(self):

Original file line number	Diff line number	Diff line change
`@@ -3763,6 +3763,12 @@ static void`
`3763`	`3763`	`}`
`3764`	`3764`	`}`
`3765`	`3765`	`else {`
	`3766`	`+// Visual Studio 2015 loop vectorizer handles NaN in an unexpected manner, see:`
	`3767`	`+// https://github.com/numpy/numpy/issues/7601`
	`3768`	`+// https://connect.microsoft.com/VisualStudio/feedback/details/2723801/unexpected-nan-handling-in-vectorized-loop`
	`3769`	`+#if (_MSC_VER == 1900)`
	`3770`	`+#pragma loop( no_vector )`
	`3771`	`+#endif`
`3766`	`3772`	`for (i = 0; i < ni; i++) {`
`3767`	`3773`	`if (@lt@(in[i], min_val)) {`
`3768`	`3774`	`out[i] = min_val;`