Changeset def512c in sasview

Timestamp:

Oct 21, 2016 5:23:34 AM (8 years ago)

Author:

wojciech

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

907b24b

Parents:

880e845

Message:

Fixing double compilation for all Windows (regardless if OpenCL installed tor not). Related to #778

File:

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

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

@@ -17 +17 @@
 
 from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS
-from sasmodels.core import HAVE_OPENCL
+
 from sas.sasgui.guiframe.panel_base import PanelBase
 from sas.sasgui.guiframe.utils import format_number, check_float, IdList, \
@@ -1456 +1456 @@
                 self.state_change = True
                 self._draw_model()
-                #Time delay introduced to prevent double compilation on systems
-                #without OPENCL. It seems to be threading related issue that
-                #triggers compilation twice at the same time
-                if HAVE_OPENCL == False:
+                #Time delay introduced to prevent double compilation on Windows
+                #It seems to be threading related issue that triggers
+                #compilation twice at the same time
+                if ON_MAC == False:
                     time.sleep(0.1)
                 self.Refresh()