Merge pull request #6438 from juliantaylor/msvc-workaround

charris · charris · commit 696ccc47af8e · 2015-10-11T08:09:53.000-06:00
BUG: mask nan to 1 in ordered compare
diff --git a/numpy/core/src/umath/simd.inc.src b/numpy/core/src/umath/simd.inc.src
@@ -539,11 +539,13 @@ sse2_compress4_to_byte_@TYPE@(@vtype@ r1, @vtype@ r2, @vtype@ r3, @vtype@ * r4,
 static NPY_INLINE int
 sse2_ordered_cmp_@kind@_@TYPE@(const @type@ a, const @type@ b)
 {
+    @vtype@ one = @vpre@_set1_@vsuf@(1);
     @type@ tmp;
     @vtype@ v = @vpre@_@VOP@_@vsufs@(@vpre@_load_@vsufs@(&a),
                                      @vpre@_load_@vsufs@(&b));
+    v = @vpre@_and_@vsuf@(v, one);
     @vpre@_store_@vsufs@(&tmp, v);
-    return !(tmp == 0.);
+    return tmp;
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -539,11 +539,13 @@ sse2_compress4_to_byte_@TYPE@(@vtype@ r1, @vtype@ r2, @vtype@ r3, @vtype@ * r4,`
`539`	`539`	`static NPY_INLINE int`
`540`	`540`	`sse2_ordered_cmp_@kind@_@TYPE@(const @type@ a, const @type@ b)`
`541`	`541`	`{`
	`542`	`+ @vtype@ one = @vpre@_set1_@vsuf@(1);`
`542`	`543`	`@type@ tmp;`
`543`	`544`	`@vtype@ v = @vpre@_@VOP@_@vsufs@(@vpre@_load_@vsufs@(&a),`
`544`	`545`	`@vpre@_load_@vsufs@(&b));`
	`546`	`+ v = @vpre@_and_@vsuf@(v, one);`
`545`	`547`	`@vpre@_store_@vsufs@(&tmp, v);`
`546`		`- return !(tmp == 0.);`
	`548`	`+ return tmp;`
`547`	`549`	`}`
`548`	`550`
`549`	`551`	`static void`