Changeset 8fff00e in sasmodels

Timestamp:

Feb 13, 2015 3:47:26 AM (10 years ago)

Author:

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:

be802cb

Parents:

df4dc86 (diff), 3fdb4b6 (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

Files:

• .gitignore (modified) (1 diff)
• sasmodels/gen.py (modified) (1 diff)
• sasmodels/resolution.py (added)
• compare.sh (added)
• sasmodels/dll.py (modified) (4 diffs)

.gitignore

@@ -5 +5 @@
 *.so
 *.obj
+/doc/_build/
+/doc/api/
+/doc/model/
+.mplconfig

sasmodels/gen.py

@@ -438 +438 @@
     Convert code from double precision to single precision.
     """
-    source = re.sub(r'(^|[^a-zA-Z0-9_])double($|[^a-zA-Z0-9_])',
+    # Convert double keyword to float.  Accept an 'n' parameter for vector
+    # values, where n is 2, 4, 8 or 16. Assume complex numbers are represented
+    # as cdouble which is typedef'd to double2.
+    source = re.sub(r'(^|[^a-zA-Z0-9_]c?)double(([248]|16)?($|[^a-zA-Z0-9_]))',
                     r'\1float\2', source)
+    # Convert floating point constants to single by adding 'f' to the end.
+    # OS/X driver complains if you don't do this.
     source = re.sub(r'[^a-zA-Z_](\d*[.]\d+|\d+[.]\d*)([eE][+-]?\d+)?',
                     r'\g<0>f', source)

sasmodels/dll.py

@@ -4 +4 @@
 import sys
 import os
+import tempfile
 import ctypes as ct
 from ctypes import c_void_p, c_int, c_double
@@ -15 +16 @@
 if sys.platform == 'darwin':
     #COMPILE = "gcc-mp-4.7 -shared -fPIC -std=c99 -fopenmp -O2 -Wall %s -o %s -lm -lgomp"
-    COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %s -o %s -lm"
+    COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
 elif os.name == 'nt':
-    COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %s -o %s -lm"
+    # make sure vcvarsall.bat is called first in order to set compiler, headers, lib paths, etc.
+    ##COMPILER = r'"C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC\Bin\cl.exe"'
+    # 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 /openmp /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
+    #/MANIFESTFILE:build\temp.win32-2.7\Release\src\sans\models\c_extension\libigor\c_models.pyd.manifest
+    #COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"
 else:
-    COMPILE = "cc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %s -o %s -lm"
-DLL_PATH = "/tmp"
+    COMPILE = "cc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"
+
+DLL_PATH = tempfile.gettempdir()
 
 
@@ -53 +61 @@
         fid, filename = tempfile.mkstemp(suffix=".c",prefix="sas_"+info['name'])
         os.fdopen(fid,"w").write(source)
-        status = os.system(COMPILE%(filename, dllpath))
+        command = COMPILE%{"source":filename, "output":dllpath}
+        print "Compile command:",command
+        status = os.system(command)
         if status != 0:
             print "compile failed.  File is in %r"%filename
@@ -91 +101 @@
         Npd2d = len(self.info['partype']['pd-2d'])
 
+        #print "dll",self.dllpath
         self.dll = ct.CDLL(self.dllpath)