Changeset 88b92e1 in sasmodels

Timestamp:

May 20, 2016 9:26:03 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:

33af590

Parents:

aa9e4e3

Message:

monkey patch pyopencl so that include path is quoted

File:

• sasmodels/kernelcl.py (modified) (2 diffs)

sasmodels/kernelcl.py

@@ -61 +61 @@
     warnings.warn(str(exc))
     raise RuntimeError("OpenCL not available")
+
+# CRUFT: pyopencl as of June 2016 needs quotes around include path
+def _quote_path(v):
+    return '"'+v+'"' if ' ' in v and not v.startswith('-') else v
+
+if hasattr(cl, '_DEFAULT_INCLUDE_OPTIONS'):
+    cl._DEFAULT_INCLUDE_OPTIONS = [_quote_path(v) for v in cl._DEFAULT_INCLUDE_OPTIONS]
 
 from pyopencl import mem_flags as mf
@@ -224 +231 @@
             context = self.get_context(dtype)
             logging.info("building %s for OpenCL %s"
-                         % (key, context.devices[0].name))
+                         % (key, context.devices[0].name.strip()))
             program = compile_model(context, source, np.dtype(dtype), fast)
             self.compiled[key] = program