Changeset 0a88623 in sasview

Timestamp:

Dec 15, 2017 8:55:42 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0863065, 8475d16, 11112b2, 19e584b

Parents:

5bb05a4 (diff), 42a6e02 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (12/15/17 08:55:42)

git-committer:

GitHub <noreply@…> (12/15/17 08:55:42)

Message:

Merge pull request #132 from rprospero/bug_995

ticket-995 OpenCL required on Linux even if turned off in GUI

File:

• src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) (2 diffs)

src/sas/sasgui/perspectives/fitting/gpu_options.py

@@ -8 +8 @@
 '''
 
+import logging
 import os
 import sys
-import warnings
 import wx
 import sasmodels
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+
+logger = logging.getLogger(__name__)
 
 
@@ -168 +170 @@
             platforms = cl.get_platforms()
         except ImportError:
-            warnings.warn("pyopencl import failed. Using only CPU computations")
+            logger.warn("Unable to import the pyopencl package.  It may not "
+                        "have been installed.  If you wish to use OpenCL, try "
+                        "running pip install --user pyopencl")
+        except cl.LogicError as err:
+            logger.warn("Unable to fetch the OpenCL platforms.  This likely "
+                        "means that the opencl drivers for your system are "
+                        "not installed.")
+            logger.warn(err)
 
         p_index = 0