Changeset b297ba9 in sasmodels for sasmodels/kernelcl.py

Timestamp:

Mar 20, 2019 5:03:50 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

4e28511

Parents:

0d362b7

Message:

lint

File:

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

sasmodels/kernelcl.py

@@ -53 +53 @@
 from __future__ import print_function
 
+import sys
 import os
 import warnings
@@ -61 +62 @@
     from time import perf_counter as clock
 except ImportError: # CRUFT: python < 3.3
-    import sys
     if sys.platform.count("darwin") > 0:
         from time import time as clock
@@ -99 +99 @@
 # CRUFT: pyopencl < 2017.1 (as of June 2016 needs quotes around include path).
 def quote_path(v):
+    # type: (str) -> str
     """
     Quote the path if it is not already quoted.
@@ -110 +111 @@
 
 def fix_pyopencl_include():
+    # type: (None) -> None
     """
     Monkey patch pyopencl to allow spaces in include file path.
     """
-    import pyopencl as cl
-    if hasattr(cl, '_DEFAULT_INCLUDE_OPTIONS'):
-        cl._DEFAULT_INCLUDE_OPTIONS = [
-            quote_path(v) for v in cl._DEFAULT_INCLUDE_OPTIONS
+    import pyopencl
+    if hasattr(pyopencl, '_DEFAULT_INCLUDE_OPTIONS'):
+        pyopencl._DEFAULT_INCLUDE_OPTIONS = [
+            quote_path(v) for v in pyopencl._DEFAULT_INCLUDE_OPTIONS
             ]
 
@@ -147 +149 @@
 
 def use_opencl():
+    # type: () -> bool
+    """Return True if OpenCL is the default computational engine"""
     sas_opencl = os.environ.get("SAS_OPENCL", "OpenCL").lower()
     return HAVE_OPENCL and sas_opencl != "none" and not sas_opencl.startswith("cuda")
@@ -153 +157 @@
 ENV = None
 def reset_environment():
+    # type: () -> None
     """
     Call to create a new OpenCL context, such as after a change to SAS_OPENCL.
@@ -323 +328 @@
             return [cl.create_some_context(interactive=False)]
         except Exception as exc:
+            # TODO: Should warnings instead by put into logging.warn?
             warnings.warn(str(exc))
-            warnings.warn("pyopencl.create_some_context() failed.  The "
-                "environment variable 'SAS_OPENCL' or 'PYOPENCL_CTX' might "
-                "not be set correctly")
+            warnings.warn(
+                "pyopencl.create_some_context() failed.  The environment "
+                "variable 'SAS_OPENCL' or 'PYOPENCL_CTX' might not be set "
+                "correctly")
 
     return _get_default_context()