Changeset 33af590 in sasmodels

Timestamp:

May 20, 2016 9:43:37 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:

5efe850

Parents:

88b92e1

Message:

monkey patch pyopencl so that include path is quoted appropriately

File:

• sasmodels/kernelcl.py (modified) (1 diff)

sasmodels/kernelcl.py

@@ -62 +62 @@
     raise RuntimeError("OpenCL not available")
 
-# CRUFT: pyopencl as of June 2016 needs quotes around include path
+# CRUFT: pyopencl < 2017.1  (as of June 2016 needs quotes around include path)
 def _quote_path(v):
-    return '"'+v+'"' if ' ' in v and not v.startswith('-') else v
+    """
+    Quote the path if it is not already quoted.
+
+    If v starts with '-', then assume that it is a -I option or similar
+    and do not quote it.  This is fragile:  -Ipath with space needs to
+    be quoted.
+    """
+    return '"'+v+'"' if v and ' ' in v and not v[0] in "\"'-" else v
 
 if hasattr(cl, '_DEFAULT_INCLUDE_OPTIONS'):