Changeset 98cb4d7 in sasmodels

Timestamp:

Apr 26, 2016 1:00:14 PM (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, 2a55a6f

Parents:

e9dc7df

Message:

only define tgamma when compiling for MSVC

Location:

sasmodels

Files:

• kernel_template.c (modified) (2 diffs)
• models/lib/sas_gamma.c (modified) (4 diffs)

sasmodels/kernel_template.c

@@ -24 +24 @@
          inline double isnan(double x) { return _isnan(x); }
          #define NAN (std::numeric_limits<double>::quiet_NaN()) // non-signalling NaN
-         static double cephes_expm1(double x) {
-            // Adapted from the cephes math library.
-            // Copyright 1984 - 1992 by Stephen L. Moshier
-            if (x != x || x == 0.0) {
-               return x; // NaN and +/- 0
-            } else if (x < -0.5 || x > 0.5) {
-               return exp(x) - 1.0;
-            } else {
-               const double xsq = x*x;
-               const double p = (((
-                  +1.2617719307481059087798E-4)*xsq
-                  +3.0299440770744196129956E-2)*xsq
-                  +9.9999999999999999991025E-1);
-               const double q = ((((
-                  +3.0019850513866445504159E-6)*xsq
-                  +2.5244834034968410419224E-3)*xsq
-                  +2.2726554820815502876593E-1)*xsq
-                  +2.0000000000000000000897E0);
-               double r = x * p;
-               r =  r / (q - r);
-               return r+r;
-             }
-         }
-         #define expm1 cephes_expm1
+         #define NEED_EXPM1
+         #define NEED_TGAMMA
      #else
          #define kernel extern "C"
@@ -74 +52 @@
 #endif
 
+#if defined(NEED_EXPM1)
+   static double expm1(double x) {
+      // Adapted from the cephes math library.
+      // Copyright 1984 - 1992 by Stephen L. Moshier
+      if (x != x || x == 0.0) {
+         return x; // NaN and +/- 0
+      } else if (x < -0.5 || x > 0.5) {
+         return exp(x) - 1.0;
+      } else {
+         const double xsq = x*x;
+         const double p = (((
+            +1.2617719307481059087798E-4)*xsq
+            +3.0299440770744196129956E-2)*xsq
+            +9.9999999999999999991025E-1);
+         const double q = ((((
+            +3.0019850513866445504159E-6)*xsq
+            +2.5244834034968410419224E-3)*xsq
+            +2.2726554820815502876593E-1)*xsq
+            +2.0000000000000000000897E0);
+         double r = x * p;
+         r =  r / (q - r);
+         return r+r;
+       }
+   }
+#endif
+
 // Standard mathematical constants:
 //   M_E, M_LOG2E, M_LOG10E, M_LN2, M_LN10, M_PI, M_PI_2=pi/2, M_PI_4=pi/4,

sasmodels/models/lib/sas_gamma.c

@@ -1 +1 @@
 /*
 The wrapper for gamma function from OpenCL and standard libraries
-The OpenCL gamma function fails misserably on values lower than 1.0
+The OpenCL gamma function fails miserably on values lower than 1.0
 while works fine on larger values.
 We use gamma definition Gamma(t + 1) = t * Gamma(t) to compute
@@ -7 +7 @@
 */
 
-#ifdef tgamma
-inline double sas_gamma( double x) { return tgamma(x+1)/x; }
-#else
+#if defined(NEED_TGAMMA)
 static double cephes_stirf(double x)
 {
@@ -39 +37 @@
 }
 
-double sas_gamma(double x) {
+static double tgamma(double x) {
         double p, q, z;
         int sgngam;
@@ -137 +135 @@
 }
 #endif
+
+
+inline double sas_gamma( double x) { return tgamma(x+1)/x; }