Changeset c2c51a2 in sasmodels

Timestamp:

May 5, 2016 11:13:55 PM (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:

306e354

Parents:

948b8c1

Message:

allow sasmodels to look in sasmodels-data for builtin model c source

Location:

sasmodels

Files:

• __init__.py (modified) (1 diff)
• generate.py (modified) (5 diffs)

sasmodels/__init__.py

@@ -14 +14 @@
 defining new models.
 """
+__version__ = "0.9"
 
-__version__ = "0.9"
+def data_files():
+    """
+    Return the data files to be installed with the package.
+
+    The format is a list of (directory, [files...]) pairs which can be
+    used directly in setup(...,data_files=...) for setup.py.
+    """
+    from os.path import join as joinpath
+    from .generate import SIBLING_DIR, DATA_PATH
+    data_files = {}
+    def add_patterns(path, patterns):
+        data_files[joinpath(SIBLING_DIR, *path)] \
+            = [joinpath(DATA_PATH, *(path+[p])) for p in patterns]
+    add_patterns([], ['*.c', '*.cl', 'convert.json'])
+    add_patterns(['models'], ['*.c'])
+    add_patterns(['models', 'lib'], ['*.c'])
+
+    return data_files
+

sasmodels/generate.py

@@ -210 +210 @@
 import sys
 from os.path import abspath, dirname, join as joinpath, exists, basename, \
-    splitext
+    splitext, isdir
 import re
 import string
@@ -224 +224 @@
 Parameter = namedtuple('Parameter', PARAMETER_FIELDS)
 
-C_KERNEL_TEMPLATE_PATH = joinpath(dirname(__file__), 'kernel_template.c')
+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')
+C_KERNEL_TEMPLATE_FILE = joinpath(DATA_PATH, 'kernel_template.c')
+
 
 F16 = np.dtype('float16')
@@ -336 +342 @@
     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']]
 
@@ -457 +462 @@
     global C_KERNEL_TEMPLATE
     if C_KERNEL_TEMPLATE is None:
-        with open(C_KERNEL_TEMPLATE_PATH) as fid:
+        with open(C_KERNEL_TEMPLATE_FILE) as fid:
             C_KERNEL_TEMPLATE = fid.read()
 
@@ -466 +471 @@
               for p in ('#line 1 "%s"'%f.replace('\\', '\\\\'), open(f).read())
               ]
-    source.append('#line 133 "%s"'%C_KERNEL_TEMPLATE_PATH.replace('\\', '\\\\'))
+    source.append('#line 133 "%s"'%C_KERNEL_TEMPLATE_FILE.replace('\\', '\\\\'))
 
     # Prepare defines