Changeset 5891 for anuga_core/source/anuga/utilities/compile.py

Timestamp:

Nov 5, 2008, 4:19:05 PM (16 years ago)

Author:

rwilson

Message:

Converted to full numpy.

File:

• anuga_core/source/anuga/utilities/compile.py (modified) (2 diffs)

anuga_core/source/anuga/utilities/compile.py

@@ -10 +10 @@
    Ole Nielsen, Duncan Gray Oct 2001      
 """     
+
+#NumPy ------------------------------------
+# Something like these lines recommended in "Converting from NUMARRAY to NUMPY"
+import numpy
+numpyincludedirs = numpy.get_include()
+I_dirs = '-I"%s" ' % numpyincludedirs
+#NumPy ------------------------------------
 
 # FIXME (Ole): Although this script says it works with a range of compilers,
@@ -255 +262 @@
     else:
       if FN == "triangle.c" or FN == "mesh_engine_c_layer.c":
-        s = '%s -c %s -I"%s" -I"%s" -o "%s.o" -O3 -DTRILIBRARY=1 -DNO_TIMER=1'\
-            %(compiler, FN, python_include, utilities_include_dir, root)
+#NumPy        s = '%s -c %s -I"%s" -I"%s" -o "%s.o" -O3 -DTRILIBRARY=1 -DNO_TIMER=1'\
+        s = '%s -c %s %s -I"%s" -I"%s" -o "%s.o" -O3 -DTRILIBRARY=1 -DNO_TIMER=1'\
+            %(compiler, FN, I_dirs, python_include, utilities_include_dir, root)
       else:
-        s = '%s -c %s -I"%s" -I"%s" -o "%s.o" -Wall -O3'\
-            %(compiler, FN, python_include, utilities_include_dir, root)
+#NumPy        s = '%s -c %s -I"%s" -I"%s" -o "%s.o" -Wall -O3'\
+        s = '%s -c %s %s -I"%s" -I"%s" -o "%s.o" -Wall -O3'\
+            %(compiler, FN, I_dirs, python_include, utilities_include_dir, root)
 
     if os.name == 'posix' and os.uname()[4] == 'x86_64':