Changeset f3f46cd in sasmodels

Timestamp:

Mar 26, 2015 2:07:14 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:

f224873

Parents:

6ee9d39

Message:

default to no openmp for windows compiler

File:

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

sasmodels/kerneldll.py

@@ -29 +29 @@
         # 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"
+        #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"
+        COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
     else:
         #COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"
@@ -148 +148 @@
         try:
             self.dll = ct.CDLL(self.dllpath)
+        except WindowsError, exc:
+            # TODO: update annotate_exception so it can handle WindowsError
+            raise RuntimeError(str(exc)+" while loading "+self.dllpath)
         except Exception, exc:
-            annotate_exception("while loading "+self.dllpath)
+            annotate_exception(exc, "while loading "+self.dllpath)
             raise