Changes in / [5fb0634:a6d3f46] in sasmodels

Files:

• .gitignore (modified) (2 diffs)
• sasmodels/autoc.py (added)
• sasmodels/kerneldll.py (modified) (1 diff)
• sasmodels/modelinfo.py (modified) (5 diffs)
• sasmodels/models/_cylpy.py (added)
• sasmodels/py2c.py (added)

.gitignore

@@ -8 +8 @@
 *.so
 *.obj
+*.o
 /doc/_build/
 /doc/api/
@@ -19 +20 @@
 /.pydevproject
 /.idea
+.vscode
 /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)
@@ -804 +810 @@
     info.sesans = getattr(kernel_module, 'sesans', None) # type: ignore
     # Default single and opencl to True for C models.  Python models have callable Iq.
-    info.opencl = getattr(kernel_module, 'opencl', not callable(info.Iq))
-    info.single = getattr(kernel_module, 'single', not callable(info.Iq))
     info.random = getattr(kernel_module, 'random', None)
 
@@ -814 +818 @@
     info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore
 
+    info.lineno = {}
+    _find_source_lines(info, kernel_module)
+    if getattr(kernel_module, 'py2c', False):
+        try:
+            autoc.convert(info, kernel_module)
+        except Exception as exc:
+            logger.warn(str(exc) + " while converting %s from C to python"%name)
+
+    # Needs to come after autoc.convert since the Iq symbol may have been
+    # converted from python to C
+    info.opencl = getattr(kernel_module, 'opencl', not callable(info.Iq))
+    info.single = getattr(kernel_module, 'single', not callable(info.Iq))
+
     if callable(info.Iq) and parameters.has_2d:
         raise ValueError("oriented python models not supported")
-
-    info.lineno = {}
-    _find_source_lines(info, kernel_module)
 
     return info