Changeset c01ed3e in sasmodels for sasmodels/modelinfo.py

Timestamp:

Dec 22, 2017 4:48:12 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Children:

15be191

Parents:

2694cb8

git-author:

Paul Kienzle <pkienzle@…> (12/22/17 16:46:46)

git-committer:

Paul Kienzle <pkienzle@…> (12/22/17 16:48:12)

Message:

code cleanup for py2c converter

File:

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

sasmodels/modelinfo.py

@@ -810 +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)
 
@@ -827 +825 @@
         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: