Changeset 2508

Timestamp:

Mar 9, 2006, 12:25:31 PM (19 years ago)

Author:

ole

Message:

First step towards moving util_ext.h out from pyvolution as per ticket:31

Location:

inundation

Files:

• pyvolution/util.py (modified) (2 diffs)
• utilities/compile.py (modified) (6 diffs)
• utilities/numerical_tools.py (modified) (1 diff)
• utilities/util_ext.c (moved) (moved from inundation/pyvolution/util_ext.c)
• utilities/util_ext.h (moved) (moved from inundation/pyvolution/util_ext.h)

inundation/pyvolution/util.py

@@ -48 +48 @@
 
 from utilities.polygon import Polygon_function #No warning
+from utilities.numerical_tools import gradient, gradient2, gradient_python #No warning
+
 
 
@@ -547 +549 @@
 
 
-####################################################################
-#Python versions of function that are also implemented in util_gateway.c
-#
-
-def gradient_python(x0, y0, x1, y1, x2, y2, q0, q1, q2):
-    """
-    """
-
-    det = (y2-y0)*(x1-x0) - (y1-y0)*(x2-x0)
-    a = (y2-y0)*(q1-q0) - (y1-y0)*(q2-q0)
-    a /= det
-
-    b = (x1-x0)*(q2-q0) - (x2-x0)*(q1-q0)
-    b /= det
-
-    return a, b
-
-
-def gradient2_python(x0, y0, x1, y1, q0, q1):
-    """Compute radient based on two points and enforce zero gradient
-    in the direction orthogonal to (x1-x0), (y1-y0) 
-    """
-
-    #Old code
-    #det = x0*y1 - x1*y0
-    #if det != 0.0:
-    #    a = (y1*q0 - y0*q1)/det
-    #    b = (x0*q1 - x1*q0)/det
-
-    #Correct code (ON)
-    det = (x1-x0)**2 + (y1-y0)**2
-    if det != 0.0:
-        a = (x1-x0)*(q1-q0)/det
-        b = (y1-y0)*(q1-q0)/det
-        
-    return a, b        
-
-
-##############################################
-#Initialise module
-
-from utilities import compile
-if compile.can_use_C_extension('util_ext.c'):
-    from util_ext import gradient, gradient2#, point_on_line
-    #separate_points_by_polygon = separate_points_by_polygon_c
-else:
-    gradient = gradient_python
-    gradient2 = gradient2_python    
-
-
-if __name__ == "__main__":
-    pass
-
-
-
-
+
+
+

inundation/utilities/compile.py

@@ -156 +156 @@
   #
   if sys.platform == 'win32':  #Windows
-    include = os.path.join(sys.exec_prefix, 'include')    
+    python_include = os.path.join(sys.exec_prefix, 'include')    
   else:  
-    include = os.path.join(os.path.join(sys.exec_prefix, 'include'),
-                           'python' + version)
-
-  #FIXME: Add path to includelist (see ticket:31)                          
-                           
+    python_include = os.path.join(os.path.join(sys.exec_prefix, 'include'),
+                                  'python' + version)
+
   # Check existence of Python.h
   #
-  headerfile = include + os.sep + 'Python.h'
+  headerfile = python_include + os.sep + 'Python.h'
   try:
     open(headerfile, 'r')
@@ -173 +171 @@
     In debian linux, for example, you need to install a
     package called something like python2.3-dev""" %headerfile
+
+
+
+  #Add Python path + utilities to includelist (see ticket:31)
+  #Assume there is only one utilities dir under path dirs
+
+  utilities_include_dir = None
+  for pathdir in sys.path:
+    utilities_include_dir = pathdir + os.sep + 'utilities'
+
+    try:
+      os.stat(utilities_include_dir)
+    except OSError:
+      pass
+    else:
+      #print 'Found %s to be used as include dir' %utilities_include_dir
+      break
+
+     
+
+      
+
   
   
@@ -186 +206 @@
     
     try:
-      open(FN,'r')
-    except:    
+      open(FN, 'r')
+    except:
+      #print 'CWD:', os.getcwd()      
       raise Exception, "Could not open: " + FN
 
@@ -196 +217 @@
     # Compile
     #
-    s = "%s -c %s -I%s -o %s.o -Wall -O3" %(compiler, FN, include, root)
+    if utilities_include_dir is None:    
+      s = '%s -c %s -I%s -o %s.o -Wall -O3'\
+          %(compiler, FN, python_include, root)
+    else:
+      s = '%s -c %s -I%s -I%s -o %s.o -Wall -O3'\
+          %(compiler, FN, python_include, utilities_include_dir, root)
 
     if os.name == 'posix' and os.uname()[4] == 'x86_64':
@@ -262 +288 @@
         else:    
             print '------- Trying to compile c-extension %s' %filename
-        
+
+            #compile(filename)        
             try:
                 compile(filename)
@@ -320 +347 @@
                   pass
 
-          print '--------------- Trying to compile c-extension %s' %filename
+          print '--------------------------------------'      
+          print 'Trying to compile c-extension %s in %s'\
+                %(filename, os.getcwd())
+
           try:
               compile(filename)
-          except:
-              print 'Could not compile C extension %s' %filename            
+          except Exception, e:
+              print 'Could not compile C extension %s' %filename
           else:
               print 'C extension %s OK' %filename

inundation/utilities/numerical_tools.py

@@ -124 +124 @@
 
 
+####################################################################
+#Python versions of function that are also implemented in numerical_tools_ext.c
+#
+
+def gradient_python(x0, y0, x1, y1, x2, y2, q0, q1, q2):
+    """
+    """
+
+    det = (y2-y0)*(x1-x0) - (y1-y0)*(x2-x0)
+    a = (y2-y0)*(q1-q0) - (y1-y0)*(q2-q0)
+    a /= det
+
+    b = (x1-x0)*(q2-q0) - (x2-x0)*(q1-q0)
+    b /= det
+
+    return a, b
+
+
+def gradient2_python(x0, y0, x1, y1, q0, q1):
+    """Compute radient based on two points and enforce zero gradient
+    in the direction orthogonal to (x1-x0), (y1-y0) 
+    """
+
+    #Old code
+    #det = x0*y1 - x1*y0
+    #if det != 0.0:
+    #    a = (y1*q0 - y0*q1)/det
+    #    b = (x0*q1 - x1*q0)/det
+
+    #Correct code (ON)
+    det = (x1-x0)**2 + (y1-y0)**2
+    if det != 0.0:
+        a = (x1-x0)*(q1-q0)/det
+        b = (y1-y0)*(q1-q0)/det
+        
+    return a, b        
+
+
+##############################################
+#Initialise module
+
+from utilities import compile
+if compile.can_use_C_extension('util_ext.c'):
+    from util_ext import gradient, gradient2#, point_on_line
+else:
+    gradient = gradient_python
+    gradient2 = gradient2_python    
+
+
+if __name__ == "__main__":
+    pass
+