Changeset 750ffa5 in sasmodels for sasmodels/kernel_template.c

Timestamp:

Mar 9, 2015 4:04:55 PM (9 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:

48f0194

Message:

allow test of dll using single precision

File:

• sasmodels/kernel_template.c (modified) (7 diffs)

sasmodels/kernel_template.c

@@ -12 +12 @@
      #include <cstdio>
      #include <cmath>
+     using namespace std;
      #if defined(_MSC_VER)
-     #define kernel extern "C" __declspec( dllexport )
+     #   define kernel extern "C" __declspec( dllexport )
+         inline double trunc(double x) { return x>=0?floor(x):-floor(-x); }
      #else
-     #define kernel extern "C"
+     #   define kernel extern "C"
      #endif
-     using namespace std;
-     inline void SINCOS(double angle, double &svar, double &cvar)
-       { svar=sin(angle); cvar=cos(angle); }
+     inline void SINCOS(double angle, double &svar, double &cvar) { svar=sin(angle); cvar=cos(angle); }
 #  else
      #include <stdio.h>
-     #include <math.h>
-     #if defined(_MSC_VER)
-     #define kernel __declspec( dllexport )
-     #else
+     #include <tgmath.h> // C99 type-generic math, so sin(float) => sinf
+     // MSVC doesn't support C99, so no need for dllexport on C99 branch
      #define kernel
-     #endif
-     #define SINCOS(angle,svar,cvar) do {svar=sin(angle);cvar=cos(angle);} while (0)
+     #define SINCOS(angle,svar,cvar) do {const double _t_=angle; svar=sin(_t_);cvar=cos(_t_);} while (0)
 #  endif
-     #if defined(_MSC_VER)
-     inline double trunc(double x) { return x>=0?floor(x):-floor(-x); }
-     #endif
 #  define global
 #  define local
 #  define constant const
+// OpenCL powr(a,b) = C99 pow(a,b), b >= 0
+// OpenCL pown(a,b) = C99 pow(a,b), b integer
 #  define powr(a,b) pow(a,b)
 #  define pown(a,b) pow(a,b)
@@ -42 +38 @@
 #    define SINCOS(angle,svar,cvar) svar=sincos(angle,&cvar)
 #  else
-#    define SINCOS(angle,svar,cvar) do {svar=sin(angle);cvar=cos(angle);} while (0)
+#    define SINCOS(angle,svar,cvar) do {const double _t_=angle; svar=sin(_t_);cvar=cos(_t_);} while (0)
 #  endif
 #endif
@@ -126 +122 @@
     const double weight = IQ_WEIGHT_PRODUCT;
     if (weight > cutoff) {
-      const double I = Iq(qi, IQ_PARAMETERS);
-      if (I>=0.0) { // scattering cannot be negative
-        ret += weight*I;
+      const double scattering = Iq(qi, IQ_PARAMETERS);
+      if (scattering >= 0.0) { // scattering cannot be negative
+        ret += weight*scattering;
         norm += weight;
       #ifdef VOLUME_PARAMETERS
@@ -136 +132 @@
       #endif
       }
-    //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,I); }
+    //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,scattering); }
     }
     IQ_CLOSE_LOOPS
@@ -199 +195 @@
     if (weight > cutoff) {
 
-      const double I = Iqxy(qxi, qyi, IQXY_PARAMETERS);
-      if (I>=0.0) { // scattering cannot be negative
+      const double scattering = Iqxy(qxi, qyi, IQXY_PARAMETERS);
+      if (scattering >= 0.0) { // scattering cannot be negative
         // TODO: use correct angle for spherical correction
         // Definition of theta and phi are probably reversed relative to the
@@ -211 +207 @@
         const double spherical_correction
           = (Ntheta>1 ? fabs(cos(M_PI_180*theta))*M_PI_2:1.0);
-        ret += spherical_correction * weight * I;
+        ret += spherical_correction * weight * scattering;
       #else
-        ret += weight * I;
+        ret += weight * scattering;
       #endif
         norm += weight;
@@ -222 +218 @@
         norm_vol += vol_weight;
       }
-      //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,I); }
+      //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,scattering); }
     }
     IQXY_CLOSE_LOOPS