Changeset 1557a1e in sasmodels

Timestamp:

Jul 27, 2016 6:45:08 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:

ee5d14d

Parents:

1596de3

Message:

windows MSVC runtime is missing erf

Location:

sasmodels

Files:

• kernel_header.c (modified) (6 diffs)
• models/lib/sas_erf.c (added)

sasmodels/kernel_header.c

@@ -7 +7 @@
 // If opencl is not available, then we are compiling a C function
 // Note: if using a C++ compiler, then define kernel as extern "C"
-#ifndef USE_OPENCL
+#ifdef USE_OPENCL
+   typedef int int32_t;
+#  if defined(USE_SINCOS)
+#    define SINCOS(angle,svar,cvar) svar=sincos(angle,&cvar)
+#  else
+#    define SINCOS(angle,svar,cvar) do {const double _t_=angle; svar=sin(_t_);cvar=cos(_t_);} while (0)
+#  endif
+   // OpenCL only has type generic math
+   #define erff erf
+   #define erfcf erfc
+#else // !USE_OPENCL
 // Use SAS_DOUBLE to force the use of double even for float kernels
 #  define SAS_DOUBLE dou ## ble
@@ -26 +36 @@
          #define NAN (std::numeric_limits<double>::quiet_NaN()) // non-signalling NaN
          #define INFINITY (std::numeric_limits<double>::infinity())
+         #define NEED_ERF
          #define NEED_EXPM1
          #define NEED_TGAMMA
@@ -33 +44 @@
      #endif
      inline void SINCOS(double angle, double &svar, double &cvar) { svar=sin(angle); cvar=cos(angle); }
-#  else
+#  else // !__cplusplus
      #include <inttypes.h>  // C99 guarantees that int32_t types is here
      #include <stdio.h>
@@ -47 +58 @@
          inline SAS_DOUBLE fmin(SAS_DOUBLE x, SAS_DOUBLE y) { return x>y ? y : x; }
          inline SAS_DOUBLE fmax(SAS_DOUBLE x, SAS_DOUBLE y) { return x<y ? y : x; }
+         #define NEED_ERF
          #define NEED_EXPM1
          #define NEED_TGAMMA
@@ -55 +67 @@
      #define kernel
      #define SINCOS(angle,svar,cvar) do {const double _t_=angle; svar=sin(_t_);cvar=cos(_t_);} while (0)
-#  endif
+#  endif  // !__cplusplus
 #  define global
 #  define local
@@ -63 +75 @@
 #  define powr(a,b) pow(a,b)
 #  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)
-#  else
-#    define SINCOS(angle,svar,cvar) do {const double _t_=angle; svar=sin(_t_);cvar=cos(_t_);} while (0)
-#  endif
-#endif
+#endif // !USE_OPENCL
 
 #if defined(NEED_EXPM1)