[Numpy-svn] r3922 - in trunk/numpy/core: . src

numpy-svn@scip... numpy-svn@scip...
Sat Jul 28 07:02:56 CDT 2007


Author: pearu
Date: 2007-07-28 07:02:52 -0500 (Sat, 28 Jul 2007)
New Revision: 3922

Modified:
   trunk/numpy/core/setup.py
   trunk/numpy/core/src/umathmodule.c.src
Log:
Trying to use DL_IMPORT for logf, sqrtf.

Modified: trunk/numpy/core/setup.py
===================================================================
--- trunk/numpy/core/setup.py	2007-07-28 11:22:01 UTC (rev 3921)
+++ trunk/numpy/core/setup.py	2007-07-28 12:02:52 UTC (rev 3922)
@@ -126,6 +126,11 @@
             if not nosmp:  # default is to use WITH_THREAD
                 target_f.write('#ifdef WITH_THREAD\n#define NPY_ALLOW_THREADS 1\n#else\n#define NPY_ALLOW_THREADS 0\n#endif\n')
             target_f.close()
+            print 'File:',target
+            target_f = open(target)
+            print target_f.read()
+            target_f.close()
+            print 'EOF'
         else:
             mathlibs = []
             target_f = open(target)
@@ -137,12 +142,6 @@
                         mathlibs.extend(value.split(','))
             target_f.close()
 
-        print 'File:',target
-        target_f = open(target)
-        print target_f.read()
-        target_f.close()
-        print 'EOF'
-
         ext.libraries.extend(mathlibs)
 
         incl_dir = os.path.dirname(target)

Modified: trunk/numpy/core/src/umathmodule.c.src
===================================================================
--- trunk/numpy/core/src/umathmodule.c.src	2007-07-28 11:22:01 UTC (rev 3921)
+++ trunk/numpy/core/src/umathmodule.c.src	2007-07-28 12:02:52 UTC (rev 3922)
@@ -66,8 +66,8 @@
 #undef sqrtf
 #endif
 float log1pf(float);
-float logf(float);
-float sqrtf(float);
+DL_IMPORT(float) logf(float);
+DL_IMPORT(float) sqrtf(float);
 #ifdef acoshf
 #undef acoshf
 #endif



More information about the Numpy-svn mailing list