Changeset 8710

Timestamp:

Feb 21, 2013, 3:16:55 PM (12 years ago)

Author:

wilsonp

Message:

Updating sparse_ext.c and quad_tree_ext.c with PyCObject code

Location:

trunk/anuga_core/source/anuga/utilities

Files:

• quad_tree_ext.c (modified) (1 diff)
• sparse_matrix_ext.c (modified) (5 diffs)

trunk/anuga_core/source/anuga/utilities/quad_tree_ext.c

@@ -165 +165 @@
 */
 
-static void delete_quad_tree_cap(PyObject * cap){
-
+#ifdef PYVERSION273
+
+
+void delete_quad_tree_cap(PyObject * cap){
     quad_tree * kill = (quad_tree*) PyCapsule_GetPointer(cap,"quad tree");
     if(kill!=NULL){
         delete_quad_tree(kill);
-    }
-}
+    } else{
+    }
+}
+
+
+
+#else
+
+// If using python earlier version, build with PyCObject
+
+// Delete cobj containing a quad tree
+void delete_quad_tree_cobj(void * cobj){
+    quad_tree * kill = (quad_tree*) cobj;
+    if(kill!=NULL){
+        delete_quad_tree(kill);
+    }
+}
+
+
+#endif
 
 //----------------------- PYTHON WRAPPER FUNCTION -----------------------------

trunk/anuga_core/source/anuga/utilities/sparse_matrix_ext.c

@@ -11 +11 @@
 #include "sparse_dok.h"
 
-
+#include "patchlevel.h"
+
+// PYVERSION273 used to check python version for use of PyCapsule
+#if PY_MAJOR_VERSION>=2 && PY_MINOR_VERSION>=7 && PY_MICRO_VERSION>=3
+    #define PYVERSION273
+#endif
 
 
@@ -92 +97 @@
 };
 
+// ----------------------------------------------------------------------------
+
+// If using python 2.7.3 or later, build with PyCapsules
+
+// Delete capsule containing a quad tree - name of capsule must be exactly
+// "quad tree".
+
+#ifdef PYVERSION273
 
 // Delete capsule containing a sparse_dok - name of capsule must be exactly
 // "sparse dok".
-static void delete_sparse_dok_cap(PyObject *cap){
+void delete_dok_cap(PyObject *cap){
 
     sparse_dok * kill = (sparse_dok*) PyCapsule_GetPointer(cap,"sparse dok");
@@ -101 +114 @@
         delete_dok_matrix(kill);
     }
-
-}
+}
+
+#else
+
+// If using python earlier version, build with PyCObject
+
+
+// Delete cobj containing a sparse_dok
+void delete_dok_cobj(void *cobj){
+
+    sparse_dok * kill = (sparse_dok*) cobj;
+    if(kill!=NULL){
+        delete_dok_matrix(kill);
+    }
+}
+
+#endif
 //----------------------- PYTHON WRAPPER FUNCTION -----------------------------
 
@@ -119 +147 @@
       return NULL;
     }
-
+    #ifdef PYVERSION273
     sparse_dok * dok = (sparse_dok*) PyCapsule_GetPointer(sparse_dok_cap,"sparse dok");
+    #else
+    sparse_dok * dok = (sparse_dok*) PyCObject_AsVoidPtr(sparse_dok_cap);
+    #endif
 
     serial_sparse_dok = PyDict_New();
@@ -155 +186 @@
     err = _deserialise(dok,serial_sparse_dok);
 
+    #ifdef PYVERSION273
     return  PyCapsule_New((void*) dok,
                       "sparse dok",
-                      &delete_sparse_dok_cap); 
+                      &delete_dok_cap); 
+    #else
+    return  PyCObject_FromVoidPtr((void*) dok,
+                      &delete_dok_obj);
+    #endif
 
 }