Changeset 19e584b in sasview

Timestamp:

Jan 2, 2018 4:59:39 AM (6 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:

2b442811

Parents:

0a88623 (diff), 879a0d8 (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 Butler <butlerpd@…> (01/02/18 04:59:39)

git-committer:

GitHub <noreply@…> (01/02/18 04:59:39)

Message:

Merge pull request #114 from SasView?/ticket-873

ticket-873 Lower entry barrier for new developers

closes #873

Files:

• build_tools/conda/ymls/sasview-env-build_linux.yml (added)
• build_tools/conda/ymls/sasview-env-build_osx.yml (added)
• build_tools/conda/ymls/sasview-env-build_win.yml (added)
• 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