Changeset 6a698c0 in sasview


Ignore:
Timestamp:
May 6, 2016 3:09:58 AM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
4c29e4d
Parents:
5f6336f
Message:

refactor support for precompiled models in windows

Location:
sasview
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasview/installer_generator.py

    rddf571d r6a698c0  
    199199    msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t""" 
    200200    msg += """Flags: recursesubdirs createallsubdirs\n"""  
    201     msg += """Source: "dist\models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t"""  
     201    msg += """Source: "dist\compiled_models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t""" 
    202202    msg += """Flags: recursesubdirs createallsubdirs\n""" 
    203203    msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t"""  
  • sasview/setup_exe.py

    ra7c4ad2 r6a698c0  
    197197# Select the appropriate manifest to use. 
    198198py26MSdll_x86 = None 
    199 if sys.version_info >= (3, 0) or sys.version_info < (2, 5): 
    200     print "*** This script only works with Python 2.5, 2.6, or 2.7." 
     199if sys.version_info >= (3, 0) or sys.version_info < (2, 6): 
     200    print "*** This script only works with Python 2.6 or 2.7." 
    201201    sys.exit() 
    202202elif sys.version_info >= (2, 6): 
     
    208208    except: 
    209209        pass 
    210 elif sys.version_info >= (2, 5): 
    211     manifest = manifest_for_python25 
    212     py26MSdll = None 
    213210 
    214211 
     
    256253data_files += guiframe.data_files() 
    257254 
    258 #import sas.models as models 
    259 import sasmodels.models as models 
    260 data_files += models.data_files() 
     255# precompile sas models into the sasview build path; doesn't matter too much 
     256# where it is so long as it is a place that will get cleaned up afterwards. 
     257import sasmodels.core 
     258dll_path = os.path.join(build_path, 'compiled_models') 
     259compiled_dlls += sasmodels.core.precompile_dlls(dll_path, dtype='double') 
     260 
     261# include the compiled models as data; coordinate the target path for the 
     262# data with installer_generator.py 
     263datafiles.append('compiled_models', compiled_dlls) 
     264 
     265import sasmodels 
     266data_files += sasmodels.data_files() 
    261267 
    262268for f in matplotlibdata: 
Note: See TracChangeset for help on using the changeset viewer.