Changes in / [93fbc34:1941ec6] in sasmodels

Files:

• .gitignore (modified) (2 diffs)
• err.txt (added)
• run.txt (added)
• run_c.bat (added)
• sasmodels/autoc.py (added)
• sasmodels/codegen.py (added)
• sasmodels/kerneldll.py (modified) (1 diff)
• sasmodels/modelinfo.py (modified) (4 diffs)
• sasmodels/models/_cylpy.py (added)
• sasmodels/py2c.py (added)
• vcvarsall.bat (added)

.gitignore

@@ -8 +8 @@
 *.so
 *.obj
+*.o
 /doc/_build/
 /doc/api/
@@ -19 +20 @@
 /.pydevproject
 /.idea
+.vscode
+xlate.c
 /sasmodels.egg-info/
 /example/Fit_*/

sasmodels/kerneldll.py

@@ -185 +185 @@
         subprocess.check_output(command, shell=shell, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as exc:
-        raise RuntimeError("compile failed.\n%s\n%s"%(command_str, exc.output))
+        raise RuntimeError("compile failed.\n%s\n%s"
+                           % (command_str, exc.output.decode()))
     if not os.path.exists(output):
         raise RuntimeError("compile failed.  File is in %r"%source)

sasmodels/modelinfo.py

@@ -12 +12 @@
 from os.path import abspath, basename, splitext
 import inspect
+import logging
 
 import numpy as np  # type: ignore
+
+from . import autoc
 
 # Optional typing
@@ -32 +35 @@
     TestCondition = Tuple[ParameterSetUser, TestInput, TestValue]
 # pylint: enable=unused-import
+
+logger = logging.getLogger(__name__)
 
 # If MAX_PD changes, need to change the loop macros in kernel_iq.c
@@ -789 +794 @@
     info.structure_factor = getattr(kernel_module, 'structure_factor', False)
     info.profile_axes = getattr(kernel_module, 'profile_axes', ['x', 'y'])
+    info.c_code = getattr(kernel_module, 'c_code', None)
     info.source = getattr(kernel_module, 'source', [])
     info.c_code = getattr(kernel_module, 'c_code', None)
@@ -819 +825 @@
     info.lineno = {}
     _find_source_lines(info, kernel_module)
+    try:
+        autoc.convert(info, kernel_module)
+    except Exception as exc:
+        raise
+        logger.warn(str(exc))
 
     return info