Changeset 6dba2f0 in sasmodels

Timestamp:

Jan 27, 2018 9:00:07 PM (7 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:

e59f60a

Parents:

2ab1bac

Message:

py.test needs kernelcl import to succeed even if pyopencl is not available

Files:

• conftest.py (modified) (1 diff)
• sasmodels/core.py (modified) (1 diff)
• sasmodels/kernelcl.py (modified) (2 diffs)

conftest.py

@@ -20 +20 @@
 import pytest
 from _pytest.unittest import TestCaseFunction
-
-try:
-    # Ask OpenCL for the default context so that we know that one exists
-    import pyopencl as cl
-    cl.create_some_context(interactive=False)
-    TEST_PYOPENCL = True
-except ImportError:
-    TEST_PYOPENCL = False
-
-def pytest_ignore_collect(path, config):
-    ignore = TEST_PYOPENCL and path.basename == "kernelcl.py"
-    return ignore
 
 USE_DOCSTRING_AS_DESCRIPTION = True

sasmodels/core.py

@@ -21 +21 @@
 from . import mixture
 from . import kernelpy
+from . import kernelcl
 from . import kerneldll
 from . import custom
 
-if os.environ.get("SAS_OPENCL", "").lower() == "none":
-    HAVE_OPENCL = False
-else:
-    try:
-        from . import kernelcl
-        HAVE_OPENCL = True
-    except Exception:
-        HAVE_OPENCL = False
+# Other modules look for HAVE_OPENCL in core, not in kernelcl.
+HAVE_OPENCL = kernelcl.HAVE_OPENCL
 
 CUSTOM_MODEL_PATH = os.environ.get('SAS_MODELPATH', "")

sasmodels/kernelcl.py

@@ -58 +58 @@
 import numpy as np  # type: ignore
 
+import pyopencl as cl  # type: ignore
+from pyopencl import mem_flags as mf
+from pyopencl.characterize import get_fast_inaccurate_build_options
+
 try:
-    #raise NotImplementedError("OpenCL not yet implemented for new kernel template")
-    import pyopencl as cl  # type: ignore
-    # Ask OpenCL for the default context so that we know that one exists
-    cl.create_some_context(interactive=False)
+    if os.environ.get("SAS_OPENCL", "").lower() == "none":
+        HAVE_OPENCL = False
+    else:
+        # Ask OpenCL for the default context so that we know that one exists
+        cl.create_some_context(interactive=False)
+        HAVE_OPENCL = True
 except Exception as exc:
     warnings.warn("OpenCL startup failed with ***"
                   + str(exc) + "***; using C compiler instead")
-    raise RuntimeError("OpenCL not available")
-
-from pyopencl import mem_flags as mf
-from pyopencl.characterize import get_fast_inaccurate_build_options
+    HAVE_OPENCL = False
 
 from . import generate
@@ -102 +105 @@
         cl._DEFAULT_INCLUDE_OPTIONS = [quote_path(v) for v in cl._DEFAULT_INCLUDE_OPTIONS]
 
-fix_pyopencl_include()
-
+if HAVE_OPENCL:
+    fix_pyopencl_include()
 
 # The max loops number is limited by the amount of local memory available