Changeset d53abd2 in sasview

Timestamp:

Aug 21, 2018 3:59:27 PM (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, unittest-saveload

Children:

5d43213, 7277f81

Parents:

ec52ea1 (diff), 388aefb (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@…> (08/21/18 15:59:27)

git-committer:

GitHub <noreply@…> (08/21/18 15:59:27)

Message:

Merge pull request #165 from SasView?/ticket-1131

Added dependency required for pyopencl on win64 - ticket 1131

closes #1131

Files:

• installers/setup_exe.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) (1 diff)

installers/setup_exe.py

@@ -287 +287 @@
     'matplotlib', 'scipy', 'encodings', 'comtypes', 'h5py',
     'win32com', 'xhtml2pdf', 'bumps', 'sasmodels', 'sas',
+    'pkg_resources'
     ]
 packages.extend([

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

@@ -139 +139 @@
 
         test_text = wx.StaticText(self, -1, "WARNING: Running tests can take a few minutes!")
+        test_text2 = wx.StaticText(self, -1, "NOTE: No test will run if No OpenCL is checked")
+        test_text.SetForegroundColour(wx.RED)
+        self.vbox.Add(test_text2, 0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 10)
         self.vbox.Add(test_text, 0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 10)