address comments

Author: Vahid Tavanashad

mkl_umath/src/mkl_umath_loops.c.src

@@ -317,7 +317,8 @@ mkl_umath_@TYPE@_exp(char **args, const npy_intp *dimensions, const npy_intp *st
             can_vectorize
             ,
             const @type@ in1 = *(@type@ *)ip1;
-            ignore_fpstatus = npy_isnan(in1) || in1 == NPY_INFINITY || in1 == -NPY_INFINITY;
+            const int invalid_cases = npy_isnan(in1) || in1 == NPY_INFINITY || in1 == -NPY_INFINITY;
+            ignore_fpstatus |= invalid_cases;
             *(@type@ *)op1 = @scalarf@(in1);
         )
     }
@@ -355,7 +356,8 @@ mkl_umath_@TYPE@_exp2(char **args, const npy_intp *dimensions, const npy_intp *s
             can_vectorize
             ,
             const @type@ in1 = *(@type@ *)ip1;
-            ignore_fpstatus = npy_isnan(in1) || in1 == NPY_INFINITY || in1 == -NPY_INFINITY;
+            const int invalid_cases = npy_isnan(in1) || in1 == NPY_INFINITY || in1 == -NPY_INFINITY;
+            ignore_fpstatus |= invalid_cases;
             *(@type@ *)op1 = @scalarf@(in1);
         )
     }
@@ -492,7 +494,8 @@ mkl_umath_@TYPE@_log2(char **args, const npy_intp *dimensions, const npy_intp *s
             can_vectorize
             ,
             const @type@ in1 = *(@type@ *)ip1;
-            ignore_fpstatus = in1 < 0 || in1 == 0 || npy_isnan(in1) || in1 == -NPY_INFINITY;
+            const int invalid_cases = in1 < 0 || in1 == 0 || npy_isnan(in1) || in1 == -NPY_INFINITY;
+            ignore_fpstatus |= invalid_cases;
             *(@type@ *)op1 = @scalarf@(in1);
         )
     }
@@ -2122,9 +2125,10 @@ mkl_umath_@TYPE@_remainder(char **args, const npy_intp *dimensions, const npy_in
         BINARY_LOOP {
             const @type@ in1 = *(@type@ *)ip1;
             const @type@ in2 = *(@type@ *)ip2;
-            ignore_fpstatus = !npy_isnan(in1) && in2 == 0;
-            ignore_fpstatus |= (in1 == NPY_INFINITY || in1 == -NPY_INFINITY) && !npy_isnan(in2);
-            ignore_fpstatus |= (in1 != NPY_INFINITY && in1 != -NPY_INFINITY) && (in2 == NPY_INFINITY || in2 == -NPY_INFINITY);
+            int invalid_cases = !npy_isnan(in1) && in2 == 0;
+            invalid_cases |= (in1 == NPY_INFINITY || in1 == -NPY_INFINITY) && !npy_isnan(in2);
+            invalid_cases |= (in1 != NPY_INFINITY && in1 != -NPY_INFINITY) && (in2 == NPY_INFINITY || in2 == -NPY_INFINITY);
+            ignore_fpstatus |= invalid_cases;
             divmod@c@(in1, in2, (@type@ *)op1);
         }
     }
@@ -2666,13 +2670,13 @@ mkl_umath_@TYPE@_conjugate(char **args, const npy_intp *dimensions, const npy_in
         CHUNKED_VML_CALL2(v@s@Conj, dimensions[0], @type@, args[0], args[1]);
         /* v@s@Conj(dimensions[0], (@type@*) args[0], (@type@*) args[1]); */
     } else {
-		UNARY_LOOP {
-			const @ftype@ in1r = ((@ftype@ *)ip1)[0];
-			const @ftype@ in1i = ((@ftype@ *)ip1)[1];
-			((@ftype@ *)op1)[0] = in1r;
-			((@ftype@ *)op1)[1] = -in1i;
-		}
-	}
+        UNARY_LOOP {
+            const @ftype@ in1r = ((@ftype@ *)ip1)[0];
+            const @ftype@ in1i = ((@ftype@ *)ip1)[1];
+            ((@ftype@ *)op1)[0] = in1r;
+            ((@ftype@ *)op1)[1] = -in1i;
+        }
+    }
 }
 
 void
@@ -2691,7 +2695,6 @@ mkl_umath_@TYPE@_absolute(char **args, const npy_intp *dimensions, const npy_int
         UNARY_LOOP {
             const @ftype@ in1r = ((@ftype@ *)ip1)[0];
             const @ftype@ in1i = ((@ftype@ *)ip1)[1];
-            ignore_fpstatus = npy_isnan(in1r) && npy_isnan(in1i);
             *((@ftype@ *)op1) = hypot@c@(in1r, in1i);
         }
     }