diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-10-11 08:09:53 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-10-11 08:09:53 -0600 |
| commit | 696ccc47af8ef9e7fab96ec425b8676150b26d13 (patch) | |
| tree | 7cca326e5d3aaf0f4963d61dcea0d1a137316d3b | |
| parent | 014e631a370b0a16c2b88a8fd9cec32464520fef (diff) | |
| parent | fbf549b9c2912a356dfeb71f3a411874879c9556 (diff) | |
| download | numpy-696ccc47af8ef9e7fab96ec425b8676150b26d13.tar.gz | |
Merge pull request #6438 from juliantaylor/msvc-workaround
BUG: mask nan to 1 in ordered compare
| -rw-r--r-- | numpy/core/src/umath/simd.inc.src | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/core/src/umath/simd.inc.src b/numpy/core/src/umath/simd.inc.src index 77cc54711..84695f5d6 100644 --- 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 |