Changeset e1454ab in sasmodels

Timestamp:

Apr 25, 2016 7:46:46 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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

Parents:

81cd2a2

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (04/14/16 03:44:48)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (04/25/16 07:46:46)

Message:

Ticket #539: Precompile model dlls and reuse them.

Files:

• gen_so.py (added)
• sasmodels/kerneldll.py (modified) (4 diffs)
• sasmodels/models/dll/__init__.py (added)
• setup.py (modified) (2 diffs)

sasmodels/kerneldll.py

@@ -79 +79 @@
             COMPILE = " ".join((CC, LN))
     else:
-        COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
+        # fPIC is unused on windows
+        # COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
+        COMPILE = "gcc -shared -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
         if "SAS_OPENMP" in os.environ:
             COMPILE = COMPILE + " -fopenmp"
@@ -85 +87 @@
     COMPILE = "cc -shared -fPIC -fopenmp -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
 
-DLL_PATH = tempfile.gettempdir()
+# 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")
 
 ALLOW_SINGLE_PRECISION_DLLS = True
@@ -103 +106 @@
         basename += "128"
     return joinpath(DLL_PATH, basename+'.so')
-
 
 def make_dll(source, model_info, dtype="double"):
@@ -143 +145 @@
     source_files = generate.model_sources(model_info) + [model_info['filename']]
     dll = dll_path(model_info, dtype)
-    newest = max(os.path.getmtime(f) for f in source_files)
-    if not os.path.exists(dll) or os.path.getmtime(dll) < newest:
+
+    #newest = max(os.path.getmtime(f) for f in source_files)
+    #if not os.path.exists(dll) or os.path.getmtime(dll) < newest:
+    if not os.path.exists(dll):
         # Replace with a proper temp file
         fid, filename = tempfile.mkstemp(suffix=".c", prefix=tempfile_prefix)

setup.py

@@ +1 @@
+import os
 from setuptools import setup,find_packages
+
+# Create the model .so's
+os.system("python gen_so.py")
 
 packages = find_packages(exclude=['contrib', 'docs', 'tests*'])
@@ -5 +9 @@
     'sasmodels.models': ['*.c','lib/*.c'],
     'sasmodels': ['*.c'],
+    'sasmodels.models.dll': ['*.so'],
 }
 required = []