Changeset fb69211 in sasmodels

Timestamp:

Apr 27, 2016 11:06:41 AM (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, ff97458

Parents:

9ccf580

Message:

get tinycc exe location from tinycc package

File:

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

sasmodels/kerneldll.py

@@ -48 +48 @@
 import sys
 import os
+from os.path import join as joinpath, split as splitpath, realpath, splitext
 import tempfile
 import ctypes as ct
@@ -78 +79 @@
         else:
             COMPILE = " ".join((CC, LN))
-    else:
-        # fPIC is unused on windows
-        # COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
+    elif True:  # Don't use mingw
+        # fPIC is not needed on windows
         COMPILE = "gcc -shared -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
         if "SAS_OPENMP" in os.environ:
             COMPILE = COMPILE + " -fopenmp"
-        #COMPILE = "z:/tcc/tcc -shared -rdynamic -Wall %(source)s -o %(output)s"
+    else:
+        from tinycc import TCC
+        COMPILE = 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"
 
 # Assume the default location of module DLLs is in top level /models dir.
-DLL_PATH = os.path.join(os.path.split(os.path.realpath(sys.argv[0]))[0], "models")
+DLL_PATH = joinpath(splitpath(realpath(sys.argv[0]))[0], "models")
 
 ALLOW_SINGLE_PRECISION_DLLS = True
@@ -98 +100 @@
     Path to the compiled model defined by *model_info*.
     """
-    from os.path import join as joinpath, split as splitpath, splitext
     basename = splitext(splitpath(model_info['filename'])[1])[0]
     if np.dtype(dtype) == generate.F32: