Changeset 7891a2a in sasmodels for sasmodels/generate.py

Timestamp:

May 9, 2016 9:36:28 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

a326b8e

Parents:

24d5b30 (diff), 7bf4757 (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@…> (05/09/16 09:34:57)

git-committer:

Paul Kienzle <pkienzle@…> (05/09/16 09:36:28)

Message:

Merge branch 'master' into polydisp

File:

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

sasmodels/generate.py

@@ -159 +159 @@
 from __future__ import print_function
 
-#TODO: determine which functions are useful outside of generate
+# TODO: determine which functions are useful outside of generate
 #__all__ = ["model_info", "make_doc", "make_source", "convert_type"]
 
-from os.path import abspath, dirname, join as joinpath, exists, getmtime
+import sys
+from os.path import abspath, dirname, join as joinpath, exists, isdir, getmtime
 import re
 import string
@@ -178 +179 @@
     pass
 
-TEMPLATE_ROOT = dirname(__file__)
+SIBLING_DIR = 'sasmodels-data'
+PACKAGE_PATH = abspath(dirname(__file__))
+SIBLING_PATH = abspath(joinpath(PACKAGE_PATH, '..', 'sasmodels-data'))
+DATA_PATH = SIBLING_PATH if isdir(SIBLING_PATH) else PACKAGE_PATH
+MODEL_PATH = joinpath(DATA_PATH, 'models')
 
 F16 = np.dtype('float16')
@@ -232 +237 @@
 """
 
+
 def format_units(units):
     # type: (str) -> str
@@ -238 +244 @@
     """
     return "string" if isinstance(units, list) else RST_UNITS.get(units, units)
+
 
 def make_partable(pars):
@@ -270 +277 @@
     return "\n".join(lines)
 
+
 def _search(search_path, filename):
     # type: (List[str], str) -> str
@@ -289 +297 @@
     Return a list of the sources file paths for the module.
     """
-    search_path = [dirname(model_info.filename),
-                   abspath(joinpath(dirname(__file__), 'models'))]
+    search_path = [dirname(model_info.filename), MODEL_PATH]
     return [_search(search_path, f) for f in model_info.source]
+
 
 def timestamp(model_info):
@@ -307 +315 @@
     newest = max(getmtime(f) for f in source_files)
     return newest
+
 
 def model_templates():
@@ -314 +323 @@
     # Note: kernel_iq.cl is not on this list because changing it need not
     # trigger a recompile of the dll.
-    return [joinpath(TEMPLATE_ROOT, filename)
+    return [joinpath(DATA_PATH, filename)
             for filename in ('kernel_header.c', 'kernel_iq.c')]
+
 
 def convert_type(source, dtype):
@@ -338 +348 @@
         source = _convert_type(source, "long double", "L")
     else:
-        raise ValueError("Unexpected dtype in source conversion: %s"%dtype)
-    return ("#define FLOAT_SIZE %d\n"%fbytes)+source
+        raise ValueError("Unexpected dtype in source conversion: %s" % dtype)
+    return ("#define FLOAT_SIZE %d\n" % fbytes)+source
 
 
@@ -382 +392 @@
 def load_template(filename):
     # type: (str) -> str
-    path = joinpath(TEMPLATE_ROOT, filename)
+    path = joinpath(DATA_PATH, filename)
     mtime = getmtime(path)
     if filename not in _template_cache or mtime > _template_cache[filename][0]:
@@ -398 +408 @@
 
 """
-
 def _gen_fn(name, pars, body, filename, line):
     # type: (str, List[Parameter], str, str, int) -> str
@@ -417 +426 @@
     }
 
+
 def _call_pars(prefix, pars):
     # type: (str, List[Parameter]) -> List[str]
@@ -423 +433 @@
     """
     return [p.as_call_reference(prefix) for p in pars]
+
 
 _IQXY_PATTERN = re.compile("^((inline|static) )? *(double )? *Iqxy *([(]|$)",
@@ -448 +459 @@
         return False
 
+
 def _add_source(source, code, path):
     """
     Add a file to the list of source code chunks, tagged with path and line.
     """
-    path = path.replace('\\','\\\\')
-    source.append('#line 1 "%s"'%path)
+    path = path.replace('\\', '\\\\')
+    source.append('#line 1 "%s"' % path)
     source.append(code)
+
 
 def make_source(model_info):
@@ -477 +490 @@
 
     partable = model_info.parameters
-
-    # Identify parameters for Iq, Iqxy, Iq_magnetic and form_volume.
-    # Note that scale and volume are not possible types.
 
     # Load templates and user code
@@ -518 +528 @@
     if partable.form_volume_parameters:
         refs = _call_pars("_v.", partable.form_volume_parameters)
-        call_volume = "#define CALL_VOLUME(_v) form_volume(%s)" % (",".join(refs))
+        call_volume = "#define CALL_VOLUME(_v) form_volume(%s)"%(",".join(refs))
     else:
         # Model doesn't have volume.  We could make the kernel run a little
@@ -552 +562 @@
     return '\n'.join(source)
 
+
 def _add_kernels(kernel_code, call_iq, call_iqxy, name):
     # type: (str, str, str, str) -> List[str]
@@ -571 +582 @@
     return source
 
+
 def load_kernel_module(model_name):
     # type: (str) -> module
@@ -588 +600 @@
     return kernel_module
 
+
 section_marker = re.compile(r'\A(?P<first>[%s])(?P=first)*\Z'
-                            %re.escape(string.punctuation))
+                            % re.escape(string.punctuation))
 def _convert_section_titles_to_boldface(lines):
     # type: (Sequence[str]) -> Iterator[str]
@@ -612 +625 @@
         yield prior
 
+
 def convert_section_titles_to_boldface(s):
     # type: (str) -> str
@@ -622 +636 @@
     """
     return "\n".join(_convert_section_titles_to_boldface(s.split('\n')))
+
 
 def make_doc(model_info):
@@ -656 +671 @@
     print("time: %g"%toc)
 
+
 def main():
     # type: () -> None
@@ -673 +689 @@
         print(source)
 
+
 if __name__ == "__main__":
     main()