Changeset d5e0592 in sasmodels

Timestamp:

May 23, 2016 7:18:10 PM (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:

4d8e0bb

Parents:

4bfbca2 (diff), 7e16db7 (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' of github.com:sasview/sasmodels

Location:

sasmodels

Files:

• generate.py (modified) (1 diff)
• kerneldll.py (modified) (5 diffs)
• custom/__init__.py (modified) (1 diff)

sasmodels/generate.py

@@ -785 +785 @@
     model_info = dict(
         id=kernel_id,  # string used to load the kernel
-        filename=abspath(kernel_module.__file__),
+        filename=abspath(kernel_module.__file__.rstrip("cd")),
         name=name,
         title=kernel_module.title,

sasmodels/kerneldll.py

@@ -49 +49 @@
 import os
 from os.path import join as joinpath, split as splitpath, splitext
+import subprocess
 import tempfile
 import ctypes as ct
@@ -63 +64 @@
     # Windows compiler; check if TinyCC is available
     try:
-        from tinycc import TCC
+        import tinycc
     except ImportError:
-        TCC = None
+        tinycc = None
     # call vcvarsall.bat before compiling to set path, headers, libs, etc.
     if "VCINSTALLDIR" in os.environ:
@@ -75 +76 @@
         # TODO: maybe don't use randomized name for the c file
         # TODO: maybe ask distutils to find MSVC
-        CC = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s "
-        LN = "/link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
+        CC = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG".split()
         if "SAS_OPENMP" in os.environ:
-            COMPILE = " ".join((CC, "/openmp", LN))
-        else:
-            COMPILE = " ".join((CC, LN))
-    elif TCC:
+            CC.append("/openmp")
+        LN = "/link /DLL /INCREMENTAL:NO /MANIFEST".split()
+        def compile_command(source, output):
+            return CC + ["/Tp%s"%source] + LN + ["/OUT:%s"%output]
+    elif tinycc:
         # TinyCC compiler.
-        COMPILE = TCC + " -shared -rdynamic -Wall %(source)s -o %(output)s"
+        CC = [tinycc.find_tcc_path()] + "-shared -rdynamic -Wall".split()
+        def compile_command(source, output):
+            return CC + ["%s"%source, "-o", "%s"%output]
     else:
         # MinGW compiler.
-        COMPILE = "gcc -shared -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
+        CC = "gcc -shared -std=c99 -O2 -Wall".split()
         if "SAS_OPENMP" in os.environ:
-            COMPILE += " -fopenmp"
+            CC.append("-fopenmp")
+        def compile_command(source, output):
+            return CC + ["%s"%source, "-o", "%s"%output, "-lm"]
 else:
     # Generic unix compile
     # On mac users will need the X code command line tools installed
-    COMPILE = "cc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
-
+    #COMPILE = "gcc-mp-4.7 -shared -fPIC -std=c99 -fopenmp -O2 -Wall %s -o %s -lm -lgomp"
+    CC = "gcc -shared -fPIC -std=c99 -O2 -Wall".split()
     # add openmp support if not running on a mac
-    if sys.platform != 'darwin':
-        #COMPILE = "gcc-mp-4.7 -shared -fPIC -std=c99 -fopenmp -O2 -Wall %s -o %s -lm -lgomp"
-        COMPILE += " -fopenmp"
+    if sys.platform != "darwin":
+        CC.append("-fopenmp")
+    def compile_command(source, output):
+        return CC + ["%s"%source, "-o", "%s"%output, "-lm"]
 
 # Windows-specific solution
@@ -111 +117 @@
 ALLOW_SINGLE_PRECISION_DLLS = True
 
+def compile(source, output):
+    command = compile_command(source=source, output=output)
+    command_str = " ".join('"%s"'%p if ' ' in p else p for p in command)
+    logging.info(command_str)
+    try:
+        subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError as exc:
+        raise RuntimeError("compile failed.\n%s\n%s"%(command_str, exc.output))
+    if not os.path.exists(output):
+        raise RuntimeError("compile failed.  File is in %r"%source)
 
 def dll_path(model_info, dtype="double"):
@@ -180 +196 @@
         need_recompile = dll_time < newest_source
     if need_recompile:
-        fid, filename = tempfile.mkstemp(suffix=".c", prefix=tempfile_prefix)
         source = generate.convert_type(source, dtype)
-        os.fdopen(fid, "w").write(source)
-        command = COMPILE%{"source":filename, "output":dll}
-        logging.info(command)
-        status = os.system(command)
-        if status != 0 or not os.path.exists(dll):
-            raise RuntimeError("compile failed.  File is in %r"%filename)
-        else:
-            ## comment the following to keep the generated c file
-            os.unlink(filename)
-            #print("saving compiled file in %r"%filename)
+        fd, filename = tempfile.mkstemp(suffix=".c", prefix=tempfile_prefix)
+        with os.fdopen(fd, "w") as file:
+            file.write(source)
+        compile(source=filename, output=dll)
+        # comment the following to keep the generated c file
+        # Note: if there is a syntax error then compile raises an error
+        # and the source file will not be deleted.
+        os.unlink(filename)
+        #print("saving compiled file in %r"%filename)
     return dll
 

sasmodels/custom/__init__.py

@@ -25 +25 @@
     def load_module_from_path(fullname, path):
         module = imp.load_source(fullname, path)
-        os.unlink(path+"c")  # remove the automatic pyc file
+        #os.unlink(path+"c")  # remove the automatic pyc file
         return module