[Numpy-svn] r6533 - trunk/numpy/core/src

[numpy-svn at scipy.org]

Author: cdavid
Date: 2009-03-02 13:28:17 -0600 (Mon, 02 Mar 2009)
New Revision: 6533

Modified:
   trunk/numpy/core/src/umath_loops.inc.src
Log:
Some missing spots when using npymath lib instead of raw math C libm in umath.

Modified: trunk/numpy/core/src/umath_loops.inc.src
===================================================================
--- trunk/numpy/core/src/umath_loops.inc.src	2009-03-02 19:27:55 UTC (rev 6532)
+++ trunk/numpy/core/src/umath_loops.inc.src	2009-03-02 19:28:17 UTC (rev 6533)
@@ -910,7 +910,7 @@
     BINARY_LOOP {
         const @type@ in1 = *(@type@ *)ip1;
         const @type@ in2 = *(@type@ *)ip2;
-        *((@type@ *)op1) = floor at c@(in1/in2);
+        *((@type@ *)op1) = npy_floor at c@(in1/in2);
     }
 }
 
@@ -920,7 +920,7 @@
     BINARY_LOOP {
         const @type@ in1 = *(@type@ *)ip1;
         const @type@ in2 = *(@type@ *)ip2;
-        const @type@ res = fmod at c@(in1,in2);
+        const @type@ res = npy_fmod at c@(in1,in2);
         if (res && ((in2 < 0) != (res < 0))) {
             *((@type@ *)op1) = res + in2;
         }
@@ -1000,7 +1000,7 @@
 {
     UNARY_LOOP_TWO_OUT {
         const @type@ in1 = *(@type@ *)ip1;
-        *((@type@ *)op1) = modf at c@(in1, (@type@ *)op2);
+        *((@type@ *)op1) = npy_modf at c@(in1, (@type@ *)op2);
     }
 }
 
@@ -1107,7 +1107,7 @@
         const @type@ in2r = ((@type@ *)ip2)[0];
         const @type@ in2i = ((@type@ *)ip2)[1];
         @type@ d = in2r*in2r + in2i*in2i;
-        ((@type@ *)op1)[0] = floor at c@((in1r*in2r + in1i*in2i)/d);
+        ((@type@ *)op1)[0] = npy_floor at c@((in1r*in2r + in1i*in2i)/d);
         ((@type@ *)op1)[1] = 0;
     }
 }
@@ -1204,7 +1204,7 @@
     UNARY_LOOP {
         const @type@ in1r = ((@type@ *)ip1)[0];
         const @type@ in1i = ((@type@ *)ip1)[1];
-        if (fabs at c@(in1i) <= fabs at c@(in1r)) {
+        if (npy_fabs at c@(in1i) <= npy_fabs at c@(in1r)) {
             const @type@ r = in1i/in1r;
             const @type@ d = in1r + in1i*r;
             ((@type@ *)op1)[0] = 1/d;
@@ -1243,7 +1243,7 @@
     UNARY_LOOP {
         const @type@ in1r = ((@type@ *)ip1)[0];
         const @type@ in1i = ((@type@ *)ip1)[1];
-        *((@type@ *)op1) = sqrt at c@(in1r*in1r + in1i*in1i);
+        *((@type@ *)op1) = npy_sqrt at c@(in1r*in1r + in1i*in1i);
     }
 }