Changeset 0c86b79 in sasmodels for sasmodels/modelinfo.py

Timestamp:

Mar 31, 2019 7:59:48 AM (5 years ago)

Author:

GitHub <noreply@…>

Parents:

1dd78a2b (diff), 225bf94 (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.

git-author:

Paul Kienzle <pkienzle@…> (03/31/19 07:59:48)

git-committer:

GitHub <noreply@…> (03/31/19 07:59:48)

Message:

Merge 225bf94c769a67d6fdab4091c85fde04b9f7db52 into 1dd78a2b6501dbd20963af88b80e45c6b89beda5

File:

• sasmodels/modelinfo.py (modified) (4 diffs)

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
@@ -860 +865 @@
     info.profile = getattr(kernel_module, 'profile', None) # type: ignore
     info.sesans = getattr(kernel_module, 'sesans', None) # type: ignore
+    info.random = getattr(kernel_module, 'random', None)
+    info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore
+
+    info.lineno = {}
+    _find_source_lines(info, kernel_module)
+    if getattr(kernel_module, 'py2c', False):
+        try:
+            warnings = autoc.convert(info, kernel_module)
+        except Exception as exc:
+            warnings = [str(exc)]
+        if warnings:
+            warnings.append("while converting %s from C to python"%name)
+            if len(warnings) > 2:
+                warnings = "\n".join(warnings)
+            else:
+                warnings = " ".join(warnings)
+            logger.warn(warnings)
+
     # Default single and opencl to True for C models.  Python models have callable Iq.
+    # 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))
-    info.random = getattr(kernel_module, 'random', None)
-    info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore
-
+    
     # Set control flag for explicitly set parameters, e.g., in the RPA model.
     control = getattr(kernel_module, 'control', None)
@@ -874 +897 @@
         raise ValueError("oriented python models not supported")
 
-    info.lineno = {}
-    _find_source_lines(info, kernel_module)
     return info