Changeset def512c in sasview for src/sas


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/basepage.py

    r880e845 rdef512c  
    1717 
    1818from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS 
    19 from sasmodels.core import HAVE_OPENCL 
     19 
    2020from sas.sasgui.guiframe.panel_base import PanelBase 
    2121from sas.sasgui.guiframe.utils import format_number, check_float, IdList, \ 
     
    14561456                self.state_change = True 
    14571457                self._draw_model() 
    1458                 #Time delay introduced to prevent double compilation on systems 
    1459                 #without OPENCL. It seems to be threading related issue that 
    1460                 #triggers compilation twice at the same time 
    1461                 if HAVE_OPENCL == False: 
     1458                #Time delay introduced to prevent double compilation on Windows 
     1459                #It seems to be threading related issue that triggers 
     1460                #compilation twice at the same time 
     1461                if ON_MAC == False: 
    14621462                    time.sleep(0.1) 
    14631463                self.Refresh() 
Note: See TracChangeset for help on using the changeset viewer.