Changeset d04ac05 in sasview for src/sas/sascalc/calculator

Timestamp:

Sep 23, 2017 1:47:05 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

9e308a3

Parents:

7b50f14

Message:

add python 3 support for C modules

File:

• src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified) (6 diffs)

src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp

@@ -5 +5 @@
 #include <stdio.h>
 #include <sld2i.hh>
+
+#if PY_MAJOR_VERSION < 3
+typedef void (*PyCapsule_Destructor)(PyObject *);
+typedef void (*PyCObject_Destructor)(void *);
+#define PyCapsule_New(pointer, name, destructor) (PyCObject_FromVoidPtr(pointer, (PyCObject_Destructor)destructor))
+#define PyCapsule_GetPointer(capsule, name) (PyCObject_AsVoidPtr(capsule))
+#endif
+
 
 // Utilities
@@ -25 +33 @@
  * Delete a GenI object
  */
-void del_sld2i(void *ptr){
-        GenI* sld2i = static_cast<GenI *>(ptr);
+void
+del_sld2i(PyObject *obj){
+        GenI* sld2i = static_cast<GenI *>(PyCapsule_GetPointer(obj, "GenI"));
         delete sld2i;
         return;
@@ -71 +80 @@
         OUTVECTOR(vol_pix_obj, vol_pix, n_x);
         GenI* sld2i = new GenI(n_pix,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,vol_pix,inspin,outspin,stheta);
-        return PyCObject_FromVoidPtr(sld2i, del_sld2i);
+        return PyCapsule_New(sld2i, "GenI", del_sld2i);
 }
 
@@ -97 +106 @@
 
         // Set the array pointers
-        void *temp = PyCObject_AsVoidPtr(gen_obj);
+        void *temp = PyCapsule_GetPointer(gen_obj, "GenI");
         GenI* s = static_cast<GenI *>(temp);
 
@@ -125 +134 @@
 
         // Set the array pointers
-        void *temp = PyCObject_AsVoidPtr(gen_obj);
+        void *temp = PyCapsule_GetPointer(gen_obj, "GenI");
         GenI* s = static_cast<GenI *>(temp);
 
@@ -146 +155 @@
 };
 
-
-#ifndef PyMODINIT_FUNC  /* declarations for DLL import/export */
-#define PyMODINIT_FUNC void
+#define MODULE_DOC "Sld2i C Library"
+#define MODULE_NAME "sld2i"
+#define MODULE_INIT2 initsld2i
+#define MODULE_INIT3 PyInit_reflmodule
+#define MODULE_METHODS module_methods
+
+/* ==== boilerplate python 2/3 interface bootstrap ==== */
+
+
+#if defined(WIN32) && !defined(__MINGW32__)
+    #define DLL_EXPORT __declspec(dllexport)
+#else
+    #define DLL_EXPORT
 #endif
-PyMODINIT_FUNC
-initsld2i(void)
-{
-    Py_InitModule3("sld2i", module_methods, "Sld2i module");
-}
+
+#if PY_MAJOR_VERSION >= 3
+
+  DLL_EXPORT PyMODINIT_FUNC MODULE_INIT3(void)
+  {
+    static struct PyModuleDef moduledef = {
+      PyModuleDef_HEAD_INIT,
+      MODULE_NAME,         /* m_name */
+      MODULE_DOC,          /* m_doc */
+      -1,                  /* m_size */
+      MODULE_METHODS,      /* m_methods */
+      NULL,                /* m_reload */
+      NULL,                /* m_traverse */
+      NULL,                /* m_clear */
+      NULL,                /* m_free */
+    };
+    return PyModule_Create(&moduledef);
+  }
+
+#else /* !PY_MAJOR_VERSION >= 3 */
+
+  DLL_EXPORT PyMODINIT_FUNC MODULE_INIT2(void)
+  {
+    Py_InitModule4(MODULE_NAME,
+                 MODULE_METHODS,
+                 MODULE_DOC,
+                 0,
+                 PYTHON_API_VERSION
+                 );
+  }
+
+#endif /* !PY_MAJOR_VERSION >= 3 */