Changeset ff97458 in sasmodels

Timestamp:

Apr 28, 2016 4:31:25 AM (9 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:

a6ffaa8, 3ecf034

Parents:

fb69211

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (04/28/16 04:28:37)

git-committer:

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

Message:

Precompiled models are a Windows-only feature.

Files:

• sasmodels/kerneldll.py (modified) (1 diff)
• setup.py (modified) (1 diff)

sasmodels/kerneldll.py

@@ -90 +90 @@
     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 top level /models dir.
+    # Relying on the Windows installer placing target items in the right place
+    DLL_PATH = os.path.join(os.path.split(os.path.realpath(sys.argv[0]))[0], "models")
+else:
+    # Set up the default path for compiled modules.
+    DLL_PATH = tempfile.gettempdir()
 
 ALLOW_SINGLE_PRECISION_DLLS = True

setup.py

@@ -2 +2 @@
 from setuptools import setup,find_packages
 
-# Create the model .so's
-os.system("python gen_so.py")
+if os.name == 'nt':
+    # Create the model .so's on windows
+    os.system("python gen_so.py")
 
 packages = find_packages(exclude=['contrib', 'docs', 'tests*'])