Changeset 29464ba in sasmodels for sasmodels/kerneldll.py

Timestamp:

Apr 27, 2016 8:26:19 AM (8 years ago)

Author:

piotr

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:

9ccf580

Parents:

a062d18

Message:

Separate location for precompiled dlls. Py2exe on windows doesn't allow bundling non-py files insise the zip.

File:

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

sasmodels/kerneldll.py

@@ -88 +88 @@
     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 = os.path.join(os.path.split(os.path.realpath(sys.argv[0]))[0], "models")
 
 ALLOW_SINGLE_PRECISION_DLLS = True
@@ -154 +154 @@
         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):