Changeset 5cf3c33 in sasmodels

Timestamp:

Mar 21, 2016 5:13:19 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c

Parents:

7ff3cf3

Message:

be explicit about int32 in C interface

Location:

sasmodels

Files:

• kernel_header.c (modified) (2 diffs)
• kernel_iq.c (modified) (2 diffs)

sasmodels/kernel_header.c

@@ -45 +45 @@
          }
          #define expm1 cephes_expm1
+         typedef __int32 int32_t
      #else
          #define kernel extern "C"
+         #include <cstdint>
      #endif
      static void SINCOS(double angle, double &svar, double &cvar) { svar=sin(angle); cvar=cos(angle); }
 #  else
+     #include <inttypes.h>  // C99 guarantees that int32_t types is here
      #include <stdio.h>
      #include <tgmath.h> // C99 type-generic math, so sin(float) => sinf
@@ -64 +67 @@
 #  define pown(a,b) pow(a,b)
 #else
+   typedef int int32_t;
 #  if defined(USE_SINCOS)
 #    define SINCOS(angle,svar,cvar) svar=sincos(angle,&cvar)

sasmodels/kernel_iq.c

@@ -18 +18 @@
 
 typedef struct {
-    int pd_par[MAX_PD];     // index of the nth polydispersity variable
-    int pd_length[MAX_PD];  // length of the nth polydispersity weight vector
-    int pd_offset[MAX_PD];  // offset of pd weights in the par & weight vector
-    int pd_stride[MAX_PD];  // stride to move to the next index at this level
-    int pd_isvol[MAX_PD];   // True if parameter is a volume weighting parameter
-    int par_offset[NPARS];  // offset of par values in the par & weight vector
-    int par_coord[NPARS];   // polydispersity coordination bitvector
-    int fast_coord_index[NPARS]; // index of the fast coordination parameters
-    int fast_coord_count;   // number of parameters coordinated with pd 1
-    int theta_var;          // id of spherical correction variable
-    int fast_theta;         // true if spherical correction depends on pd 1
+    int32_t pd_par[MAX_PD];     // index of the nth polydispersity variable
+    int32_t pd_length[MAX_PD];  // length of the nth polydispersity weight vector
+    int32_t pd_offset[MAX_PD];  // offset of pd weights in the par & weight vector
+    int32_t pd_stride[MAX_PD];  // stride to move to the next index at this level
+    int32_t pd_isvol[MAX_PD];   // True if parameter is a volume weighting parameter
+    int32_t par_offset[NPARS];  // offset of par values in the par & weight vector
+    int32_t par_coord[NPARS];   // polydispersity coordination bitvector
+    int32_t fast_coord_index[NPARS]; // index of the fast coordination parameters
+    int32_t fast_coord_count;   // number of parameters coordinated with pd 1
+    int32_t theta_var;          // id of spherical correction variable
+    int32_t fast_theta;         // true if spherical correction depends on pd 1
 } ProblemDetails;
 
@@ -39 +39 @@
 kernel
 void KERNEL_NAME(
-    int nq,                 // number of q values
-    const int pd_start,     // where we are in the polydispersity loop
-    const int pd_stop,      // where we are stopping in the polydispersity loop
+    int32_t nq,                 // number of q values
+    const int32_t pd_start,     // where we are in the polydispersity loop
+    const int32_t pd_stop,      // where we are stopping in the polydispersity loop
     global const ProblemDetails *problem,
     global const double *weights,