Changeset 639c4e3 in sasmodels for sasmodels/kerneldll.py

Timestamp:

Apr 26, 2016 9:43:53 AM (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:

ed246ab

Parents:

cebbb5a (diff), fa227d3 (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/kerneldll.py
sasmodels/models/rpa.c

File:

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

sasmodels/kerneldll.py

@@ -87 +87 @@
             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 += " -fopenmp"
@@ -93 +95 @@
     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