Changeset da63656 in sasmodels for sasmodels/kerneldll.py

Timestamp:

May 4, 2016 9:37: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:

24d5b30

Parents:

13b99fd (diff), 47e498b (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:

sasmodels/generate.py
sasmodels/kerneldll.py

File:

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

sasmodels/kerneldll.py

@@ -48 +48 @@
 import sys
 import os
-from os.path import join as joinpath, split as splitpath, realpath, splitext
+from os.path import join as joinpath, split as splitpath, splitext
 import tempfile
 import ctypes as ct  # type: ignore
@@ -87 +87 @@
         else:
             COMPILE = " ".join((CC, LN))
-    elif True:  # Don't use mingw
+    elif True:
+        # If MSVC compiler is not available, try using mingw
         # fPIC is not needed on windows
         COMPILE = "gcc -shared -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
@@ -93 +94 @@
             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"
@@ -98 +100 @@
     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 = joinpath(splitpath(realpath(sys.argv[0]))[0], "models")
+# Windows-specific solution
+if os.name == 'nt':
+    # Assume the default location of module DLLs is in .sasmodels/compiled_models.
+    DLL_PATH = os.path.join(os.path.expanduser("~"), ".sasmodels", "compiled_models")
+    if not os.path.exists(DLL_PATH):
+        os.makedirs(DLL_PATH)
+else:
+    # Set up the default path for compiled modules.
+    DLL_PATH = tempfile.gettempdir()
 
 ALLOW_SINGLE_PRECISION_DLLS = True
@@ -111 +120 @@
     """
     bits = 8*dtype.itemsize
-    return "sas_%s%d"%(model_info.id, bits)
+    return "sas%d_%s"%(bits, model_info.id)
 
 
@@ -148 +157 @@
     # Note: dtype may be F128 for long double precision
 
-    newest = generate.timestamp(model_info)
     dll = dll_path(model_info, dtype)
-    if not os.path.exists(dll) or os.path.getmtime(dll) < newest:
+
+    if not os.path.exists(dll):
+        need_recompile = True
+    elif getattr(sys, 'frozen', False):
+        # TODO: don't suppress time stamp
+        # Currently suppressing recompile when running in a frozen environment
+        need_recompile = False
+    else:
+        dll_time = os.path.getmtime(dll)
+        newest_source = generate.timestamp(model_info)
+        need_recompile = dll_time < newest_source
+    if need_recompile:
         basename = dll_name(model_info, dtype) + "_"
         fid, filename = tempfile.mkstemp(suffix=".c", prefix=basename)
@@ -251 +270 @@
             del dll, self._dll
             self._dll = None
-            #_ctypes.FreeLibrary(libHandle)
             ct.windll.kernel32.FreeLibrary(libHandle)
         else: