Changeset 2a55a6f in sasmodels

Timestamp:

Apr 26, 2016 6:50:12 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:

a062d18

Parents:

98cb4d7

Message:

add support for tinycc

Files:

• .gitignore (modified) (1 diff)
• sasmodels/kernel_template.c (modified) (2 diffs)
• sasmodels/kerneldll.py (modified) (1 diff)

.gitignore

@@ -5 +5 @@
 *.pyc
 *.cl
+*.def
 *.so
 *.obj

sasmodels/kernel_template.c

@@ -22 +22 @@
          inline double fmin(double x, double y) { return x>y ? y : x; }
          inline double fmax(double x, double y) { return x<y ? y : x; }
-         inline double isnan(double x) { return _isnan(x); }
+         #define isnan(x) _isnan(x)
+         #define isinf(x) (!_finite(x))
+         #define isfinite(x) _finite(x)
          #define NAN (std::numeric_limits<double>::quiet_NaN()) // non-signalling NaN
+         #define INFINITY (std::numeric_limits<double>::infinity())
          #define NEED_EXPM1
          #define NEED_TGAMMA
@@ -32 +35 @@
 #  else
      #include <stdio.h>
-     #include <tgmath.h> // C99 type-generic math, so sin(float) => sinf
+     #if defined(__TINYC__)
+         #include <math.h>
+         inline double trunc(double x) { return x>=0?floor(x):-floor(-x); }
+         inline double fmin(double x, double y) { return x>y ? y : x; }
+         inline double fmax(double x, double y) { return x<y ? y : x; }
+         // TODO: test isnan
+         inline double _isnan(double x) { return x != x; } // hope this doesn't optimize away!
+         #undef isnan
+         #define isnan(x) _isnan(x)
+         #define NEED_EXPM1
+         #define NEED_TGAMMA
+     #else
+         #include <tgmath.h> // C99 type-generic math, so sin(float) => sinf
+     #endif
      // MSVC doesn't support C99, so no need for dllexport on C99 branch
      #define kernel

sasmodels/kerneldll.py

@@ -84 +84 @@
         if "SAS_OPENMP" in os.environ:
             COMPILE = COMPILE + " -fopenmp"
+        #COMPILE = "z:/tcc/tcc -shared -rdynamic -Wall %(source)s -o %(output)s"
 else:
     COMPILE = "cc -shared -fPIC -fopenmp -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"