Changeset db03406 in sasmodels for sasmodels/modelinfo.py

Timestamp:

Dec 1, 2017 2:36:52 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Children:

13cf47a

Parents:

791281c

Message:

first pass at python to C translator for kernels

File:

• sasmodels/modelinfo.py (modified) (5 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
@@ -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', [])
     # TODO: check the structure of the tests
@@ -812 +818 @@
 
     _find_source_lines(info, kernel_module)
+    try:
+        autoc.convert(info, kernel_module)
+    except Exception as exc:
+        raise
+        logger.warn(str(exc))
 
     return info
@@ -935 +946 @@
     #: See :attr:`ER` for details on the parameters.
     VR = None               # type: Optional[Callable[[np.ndarray], Tuple[np.ndarray, np.ndarray]]]
+    #: Arbitrary C code containing supporting functions, etc., to be inserted
+    #: after everything in source.  This can include Iq and Iqxy functions with
+    #: the full function signature, including all parameters.
+    c_code = None
     #: Returns the form volume for python-based models.  Form volume is needed
     #: for volume normalization in the polydispersity integral.  If no