Changeset 1855 for inundation

Timestamp:

Sep 28, 2005, 6:00:46 PM (19 years ago)

Author:

ole

Message:

Better interface to meshing for karratha + some pypar work

Location:

inundation/pypar/mandelbrot_example

Files:

• compile.py (modified) (3 diffs)
• mandel_ext.c (modified) (4 diffs)

inundation/pypar/mandelbrot_example/compile.py

@@ -111 +111 @@
   include = os.path.join(os.path.join(sys.exec_prefix, 'include'),
                      'python'+sys.version[:3])
-  headerfile = os.path.join(include, 'Python.h')
   
+  
+  # Check existence of Python.h
+  #
+  headerfile = include + '/Python.h'
   try:
-    # unix style include directory
     open(headerfile, 'r')
   except:
-    # windows style include directory
-    include = os.path.join(sys.exec_prefix, 'include')
-    headerfile = os.path.join(include, 'Python.h')
-    try:
-      open(headerfile, 'r')
-    except:
-      raise """Did not find Python header file.
-      Make sure files for Python C-extensions are installed.""" 
+    raise """Did not find Python header file %s.
+    Make sure files for Python C-extensions are installed. 
+    In debian linux, for example, you need to install a
+    package called something like python2.1-dev""" %headerfile
+  
   
   # Check filename(s)
@@ -147 +146 @@
     # Compile
     #
+    s = "%s -c %s -I%s -o %s.o" %(compiler, FN, include, root)
+    if os.name == 'posix' and os.uname()[4] == 'x86_64':
+      #Extra flags for 64 bit architectures
+      #s += ' -fPIC -m64' #gcc
+      s += ' -fPIC -tp amd64' #pgcc
+      
     
-    s = "%s -c %s -I%s -o %s.o -Wall -O" %(compiler, FN, include, root)
     if verbose:
       print s
@@ -161 +165 @@
   
   # Make shared library (*.so)
+  s = "%s -%s %s -o %s.so" %(loader, sharedflag, object_files, root1)
+
+  if os.name == 'posix' and os.uname()[4] == 'x86_64':
+      #Extra flags for 64 bit architectures using Portland compilers
+      s += ' -mcmodel=medium'
   
-  s = "%s -%s %s -o %s.so -lm" %(loader, sharedflag, object_files, root1)
   if verbose:
     print s

inundation/pypar/mandelbrot_example/mandel_ext.c

@@ -1 @@
-// Python - C extension for fast computation of the Mandelbrot iteration
+/* Python - C extension for fast computation of the Mandelbrot iteration
 //
 // To compile:
@@ -12 +12 @@
 // k = calculate_point(c, kmax)
 //
-// Ole Nielsen, SUT 2003
+// Ole Nielsen, SUT 2003 */
         
 #include "Python.h"
 
-// Computational function
+/* Computational function */
 int _calculate_point(Py_complex c, int kmax) {
   int count;
@@ -37 +37 @@
 
 
-// Interface to Python
+/* Interface to Python */
 PyObject *calculate_point(PyObject *self, PyObject *args) {
-  PyComplexObject *C;  // Python Complex object
-  Py_complex c;        // C Complex structure
+  PyComplexObject *C;  /* Python Complex object */
+  Py_complex c;        /* C Complex structure */
   int kmax, count;
 
-  // Convert Python arguments to C  
+  /* Convert Python arguments to C  */
   if (!PyArg_ParseTuple(args, "Oi", &C, &kmax))
     return NULL;
   c = PyComplex_AsCComplex((PyObject*) C);   
   
-  // Call underlying routine
+  /* Call underlying routine */
   count = _calculate_point(c, kmax); 
 
-  // Return results as a Python object
+  /* Return results as a Python object */
   return Py_BuildValue("i", count);
 }
 
 
-// Method table for python module
+/* Method table for python module */
 static struct PyMethodDef MethodTable[] = {
   {"calculate_point", calculate_point, METH_VARARGS},  
@@ -63 +63 @@
 
 
-// Module initialisation   
+/* Module initialisation  */
 void initmandel_ext(void){
   Py_InitModule("mandel_ext", MethodTable);