Changeset 13b99fd in sasmodels for sasmodels/kerneldll.py

Timestamp:

Apr 27, 2016 12:34:42 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:

da63656

Parents:

ed246ab (diff), fb69211 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into polydisp

Conflicts:

.gitignore
sasmodels/kerneldll.py

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  # type: ignore
@@ -86 +87 @@
         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 += " -fopenmp"
+    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 within the sasmodel directory.
-DLL_PATH = os.path.join(os.path.split(os.path.realpath(__file__))[0], "models", "dll")
+# Assume the default location of module DLLs is in top level /models dir.
+DLL_PATH = joinpath(splitpath(realpath(sys.argv[0]))[0], "models")
 
 ALLOW_SINGLE_PRECISION_DLLS = True
@@ -153 +156 @@
         os.fdopen(fid, "w").write(source)
         command = COMPILE%{"source":filename, "output":dll}
-        print("Compile command: "+command)
         status = os.system(command)
         if status != 0 or not os.path.exists(dll):