Changeset f2f67a6 in sasmodels for sasmodels/generate.py

Timestamp:

Apr 15, 2016 5:26:24 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:

ae2b6b5, 38a9b07, eb97b11

Parents:

0ff62d4

Message:

reenable opencl; works on cpu but not gpu

File:

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

sasmodels/generate.py

@@ -173 +173 @@
 
 try:
-    from typing import Tuple, Sequence, Iterator
+    from typing import Tuple, Sequence, Iterator, Dict
     from .modelinfo import ModelInfo
 except ImportError:
@@ -298 +298 @@
     Return a timestamp for the model corresponding to the most recently
     changed file or dependency.
+
+    Note that this does not look at the time stamps for the OpenCL header
+    information since that need not trigger a recompile of the DLL.
     """
     source_files = (model_sources(model_info)
@@ -304 +307 @@
     newest = max(getmtime(f) for f in source_files)
     return newest
+
+def model_templates():
+    # type: () -> List[str]
+    # TODO: fails DRY; templates appear two places.
+    # should instead have model_info contain a list of paths
+    # 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)
+            for filename in ('kernel_header.c', 'kernel_iq.c')]
 
 def convert_type(source, dtype):
@@ -377 +389 @@
     return _template_cache[filename][1]
 
-def model_templates():
-    # type: () -> List[str]
-    # TODO: fails DRY; templates are listed in two places.
-    # should instead have model_info contain a list of paths
-    return [joinpath(TEMPLATE_ROOT, filename)
-            for filename in ('kernel_header.c', 'kernel_iq.c')]
-
 
 _FN_TEMPLATE = """\
@@ -390 +395 @@
     %(body)s
 }
-
 
 """
@@ -467 +471 @@
     # Load templates and user code
     kernel_header = load_template('kernel_header.c')
-    kernel_code = load_template('kernel_iq.c')
+    dll_code = load_template('kernel_iq.c')
+    ocl_code = load_template('kernel_iq.cl')
     user_code = [open(f).read() for f in model_sources(model_info)]
 
@@ -506 +511 @@
     if _have_Iqxy(user_code):
         # Call 2D model
-        refs = ["q[2*i]", "q[2*i+1]"] + _call_pars("_v.", partable.iqxy_parameters)
+        refs = ["q[2*_i]", "q[2*_i+1]"] + _call_pars("_v.", partable.iqxy_parameters)
         call_iqxy = "#define CALL_IQ(_q,_i,_v) Iqxy(%s)" % (",".join(refs))
     else:
@@ -521 +526 @@
     # TODO: allow mixed python/opencl kernels?
 
-    # define the Iq kernel
-    source.append("#define KERNEL_NAME %s_Iq"%model_info.name)
-    source.append(call_iq)
-    source.append(kernel_code)
-    source.append("#undef CALL_IQ")
-    source.append("#undef KERNEL_NAME")
-
-    # define the Iqxy kernel from the same source with different #defines
-    source.append("#define KERNEL_NAME %s_Iqxy"%model_info.name)
-    source.append(call_iqxy)
-    source.append(kernel_code)
-    source.append("#undef CALL_IQ")
-    source.append("#undef KERNEL_NAME")
-
+    source.append("#if defined(USE_OPENCL)")
+    source.extend(_add_kernels(ocl_code, call_iq, call_iqxy, model_info.name))
+    source.append("#else /* !USE_OPENCL */")
+    source.extend(_add_kernels(dll_code, call_iq, call_iqxy, model_info.name))
+    source.append("#endif /* !USE_OPENCL */")
     return '\n'.join(source)
+
+def _add_kernels(kernel_code, call_iq, call_iqxy, name):
+    # type: (str, str, str, str) -> List[str]
+    source = [
+        # define the Iq kernel
+        "#define KERNEL_NAME %s_Iq"%name,
+        call_iq,
+        kernel_code,
+        "#undef CALL_IQ",
+        "#undef KERNEL_NAME",
+
+        # define the Iqxy kernel from the same source with different #defines
+        "#define KERNEL_NAME %s_Iqxy"%name,
+        call_iqxy,
+        kernel_code,
+        "#undef CALL_IQ",
+        "#undef KERNEL_NAME",
+    ]
+    return source
 
 def load_kernel_module(model_name):
     # type: (str) -> module
+    """
+    Return the kernel module named in *model_name*.
+
+    If the name ends in *.py* then load it as a custom model using
+    :func:`sasmodels.custom.load_custom_kernel_module`, otherwise
+    load it from :mod:`sasmodels.models`.
+    """
     if model_name.endswith('.py'):
         kernel_module = load_custom_kernel_module(model_name)