Changeset f54e82cf in sasview for src/sas/sascalc/calculator/c_extensions/sld2i_module.c

Timestamp:

Jul 31, 2018 4:36:52 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

d9b7197

Parents:

3067196

git-author:

Torin Cooper-Bennun <torin.cooper-bennun@…> (07/30/18 10:35:02)

git-committer:

Torin Cooper-Bennun <torin.cooper-bennun@…> (07/31/18 04:36:52)

Message:

Cherry-pick changes from master for tinycc compatibility (note: tinycc compilation not yet supported fully):

144e032af2 tinycc doesn't return structures, so must pass return structure as pointer
a1daf86c0d hack around broken isfinite/isnan in tinycc
7e82256ecb declare all variables at the start of the block so C89 compilers don't complain

File:

• src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) (7 diffs)

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

@@ -4 +4 @@
 #include <Python.h>
 #include <stdio.h>
-#include <sld2i.h>
+#include "sld2i.h"
 
 #if PY_MAJOR_VERSION < 3
@@ -68 +68 @@
         double outspin;
         double stheta;
+        GenI *sld2i;
 
         if (!PyArg_ParseTuple(args, "iOOOOOOOOddd", &n_pix, &x_val_obj, &y_val_obj, &z_val_obj, &sldn_val_obj, &mx_val_obj, &my_val_obj, &mz_val_obj, &vol_pix_obj, &inspin, &outspin, &stheta)) return NULL;
@@ -78 +79 @@
         OUTVECTOR(mz_val_obj, mz_val, n_x);
         OUTVECTOR(vol_pix_obj, vol_pix, n_x);
-        GenI* sld2i =  PyMem_Malloc(sizeof(GenI));
+        sld2i =  PyMem_Malloc(sizeof(GenI));
         if (sld2i != NULL) {
                 initGenI(sld2i, n_pix,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,vol_pix,inspin,outspin,stheta);
@@ -98 +99 @@
         double *I_out;
         PyObject *gen_obj;
+        GenI *sld2i;
 
         if (!PyArg_ParseTuple(args, "OiOOO",  &gen_obj, &npoints, &qx_obj, &qy_obj, &I_out_obj)) return NULL;
@@ -108 +110 @@
 
         // Set the array pointers
-        GenI* sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
+        sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
 
         genicomXY(sld2i, npoints, qx, qy, I_out);
@@ -126 +128 @@
         double *I_out;
         PyObject *gen_obj;
+        GenI *sld2i;
 
         if (!PyArg_ParseTuple(args, "OiOO",  &gen_obj, &npoints, &q_obj, &I_out_obj)) return NULL;
@@ -135 +138 @@
 
         // Set the array pointers
-        GenI *sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
+        sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
 
         genicom(sld2i, npoints, q, I_out);