Changeset 2546

Timestamp:

Mar 15, 2006, 11:15:54 AM (19 years ago)

Author:

ole

Message:

Got Numpy to work on Linux

Location:

inundation-numpy-branch/utilities

Files:

• compile.py (modified) (4 diffs)
• test_numerical_tools.py (modified) (1 diff)

inundation-numpy-branch/utilities/compile.py

@@ -28 +28 @@
   
   import os, string, sys, types
+  from os import sep
   
   # Input check
@@ -163 +164 @@
   # Check existence of Python.h
   #
-  headerfile = python_include + os.sep + 'Python.h'
+  headerfile = python_include + sep + 'Python.h'
   try:
     open(headerfile, 'r')
@@ -174 +175 @@
 
   # Add location of arrayobject.h
-
-  arraypath = 'Lib' + os.sep + 'site-packages' + os.sep + 'numpy' + os.sep + 'core' + os.sep + 'include' + os.sep + 'numpy'
+  arraypath = 'site-packages%snumpy%score%sinclude%snumpy' %((sep,)*4)
   if sys.platform == 'win32':  #Windows
-    array_include = os.path.join(sys.exec_prefix, arraypath)
+    array_include = os.path.join(sys.exec_prefix, 'lib' + sep + arraypath)
   else:
-    #FIXME: Not done yet
-    python_include = os.path.join(os.path.join(sys.exec_prefix, 'include'),
-                                  'python' + version)
+    array_include = os.path.join(sys.exec_prefix, 
+                                 'lib' + sep + 'python' + version +
+                                 sep + arraypath)
+    
 
   # Check existence of arrayobject.h
-  #
   array_headerfile = array_include + os.sep + 'arrayobject.h'
   try:
@@ -372 +372 @@
               compile(filename)
           except Exception, e:
-              print 'Could not compile C extension %s' %filename
+              print 'Could not compile C extension %s: %s' %(filename, e)
           else:
               print 'C extension %s OK' %filename

inundation-numpy-branch/utilities/test_numerical_tools.py

@@ -208 +208 @@
 
         from numpy.random import uniform, seed
-        #seed(17, 53)
-        seed(17)
+        seed((17,53))
 
         x0, x1, x2, y0, y1, y2 = uniform(0.0,3.0,6)