Changeset a261a83 in sasmodels for sasmodels/generate.py

Timestamp:

Nov 30, 2017 12:25:06 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

7dde87f

Parents:

0b07b91 (diff), 10ee838 (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.

Message:

Merge branch 'ticket-786' into generic_integration_loop

File:

• sasmodels/generate.py (modified) (10 diffs)

sasmodels/generate.py

@@ -163 +163 @@
 
 import sys
-from os.path import abspath, dirname, join as joinpath, exists, isdir, getmtime
+from os.path import abspath, dirname, join as joinpath, exists, getmtime
 import re
 import string
@@ -174 +174 @@
 from .custom import load_custom_kernel_module
 
+# pylint: disable=unused-import
 try:
     from typing import Tuple, Sequence, Iterator, Dict
@@ -179 +180 @@
 except ImportError:
     pass
+# pylint: enable=unused-import
 
 # jitter projection to use in the kernel code.  See explore/jitter.py
@@ -672 +674 @@
     line instead.
     """
-    for path, code in sources:
+    for _path, code in sources:
         if _IQXY_PATTERN.search(code):
             return True
-    else:
-        return False
+    return False
 
 
@@ -790 +791 @@
     # TODO: allow mixed python/opencl kernels?
 
-    ocl = kernels(kernel_code, call_iq, call_iqxy, clear_iqxy, model_info.name)
-    dll = kernels(kernel_code, call_iq, call_iqxy, clear_iqxy, model_info.name)
+    ocl = _kernels(kernel_code, call_iq, call_iqxy, clear_iqxy, model_info.name)
+    dll = _kernels(kernel_code, call_iq, call_iqxy, clear_iqxy, model_info.name)
     result = {
         'dll': '\n'.join(source+dll[0]+dll[1]+dll[2]),
@@ -800 +801 @@
 
 
-def kernels(kernel, call_iq, call_iqxy, clear_iqxy, name):
+def _kernels(kernel, call_iq, call_iqxy, clear_iqxy, name):
     # type: ([str,str], str, str, str) -> List[str]
     code = kernel[0]
@@ -949 +950 @@
 
 def make_html(model_info):
+    # type: (ModelInfo) -> str
     """
     Convert model docs directly to html.
@@ -958 +960 @@
 
 def view_html(model_name):
+    # type: (str) -> None
+    """
+    Load the model definition and view its help.
+    """
     from . import modelinfo
     kernel_module = load_kernel_module(model_name)
@@ -964 +970 @@
 
 def view_html_from_info(info):
+    # type: (ModelInfo) -> None
+    """
+    View the help for a loaded model definition.
+    """
     from . import rst2html
     url = "file://"+dirname(info.filename)+"/"
@@ -988 +998 @@
     Program which prints the source produced by the model.
     """
-    import sys
     from .modelinfo import make_model_info