Changeset 5efe850 in sasmodels for sasmodels/kerneldll.py

Timestamp:

May 20, 2016 10:53:41 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:

c98c772, 4bfbca2

Parents:

33af590

Message:

Use tinycc if available; support float32 models in tinycc

File:

• sasmodels/kerneldll.py (modified) (3 diffs)

sasmodels/kerneldll.py

@@ -60 +60 @@
 from .exception import annotate_exception
 
-# Compiler platform details
-if sys.platform == 'darwin':
-    #COMPILE = "gcc-mp-4.7 -shared -fPIC -std=c99 -fopenmp -O2 -Wall %s -o %s -lm -lgomp"
-    COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
-elif os.name == 'nt':
+if os.name == 'nt':
+    # Windows compiler; check if TinyCC is available
+    try:
+        from tinycc import TCC
+    except ImportError:
+        TCC = None
     # call vcvarsall.bat before compiling to set path, headers, libs, etc.
     if "VCINSTALLDIR" in os.environ:
@@ -73 +74 @@
         # TODO: remove intermediate OBJ file created in the directory
         # TODO: maybe don't use randomized name for the c file
+        # TODO: maybe ask distutils to find MSVC
         CC = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s "
         LN = "/link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
@@ -79 +81 @@
         else:
             COMPILE = " ".join((CC, LN))
-    elif True:
-        # If MSVC compiler is not available, try using mingw
-        # fPIC is not needed on windows
+    elif TCC:
+        # TinyCC compiler.
+        COMPILE = TCC + " -shared -rdynamic -Wall %(source)s -o %(output)s"
+    else:
+        # MinGW compiler.
         COMPILE = "gcc -shared -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
         if "SAS_OPENMP" in os.environ:
-            COMPILE = COMPILE + " -fopenmp"
-    else:
-        # If MSVC compiler is not available, try using tinycc
-        from tinycc import TCC
-        COMPILE = TCC + " -shared -rdynamic -Wall %(source)s -o %(output)s"
+            COMPILE += " -fopenmp"
 else:
-    COMPILE = "cc -shared -fPIC -fopenmp -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
+    # Generic unix compile
+    # On mac users will need the X code command line tools installed
+    COMPILE = "cc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
+
+    # add openmp support if not running on a mac
+    if sys.platform != 'darwin':
+        #COMPILE = "gcc-mp-4.7 -shared -fPIC -std=c99 -fopenmp -O2 -Wall %s -o %s -lm -lgomp"
+        COMPILE += " -fopenmp"
 
 # Windows-specific solution