Changeset a30cdd5 in sasmodels

Timestamp:

Nov 24, 2015 3:29:36 PM (9 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:

5753e4e

Parents:

7be65ea

Message:

use SAS_OPENMP=1 in environment to use openmp for dlls

File:

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

sasmodels/kerneldll.py

@@ -26 +26 @@
     # call vcvarsall.bat before compiling to set path, headers, libs, etc.
     if "VCINSTALLDIR" in os.environ:
-        # MSVC compiler is available, so use it.
+        # MSVC compiler is available, so use it.  OpenMP requires a copy of
+        # vcomp90.dll on the path.  One may be found here:
+        #       C:/Windows/winsxs/x86_microsoft.vc90.openmp*/vcomp90.dll
+        # Copy this to the python directory and uncomment the OpenMP COMPILE
         # TODO: remove intermediate OBJ file created in the directory
         # TODO: maybe don't use randomized name for the c file
-        #COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /openmp /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
-        # Can't find VCOMP90.DLL (don't know why), so remove openmp support
-        # from windows compiler build
-        COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
+        CC = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s "
+        LN = "/link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
+        if "SAS_OPENMP" in os.environ:
+            COMPILE = " ".join((CC, "/openmp", LN))
+        else:
+            COMPILE = " ".join((CC, LN))
     else:
-        #COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"
         COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
+        if "SAS_OPENMP" in os.environ:
+            COMPILE = COMPILE + " -fopenmp"
 else:
-    COMPILE = "cc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"
+    COMPILE = "cc -shared -fPIC -fopenmp -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
 
 DLL_PATH = tempfile.gettempdir()