Changeset c08fd96 in sasview


Ignore:
Timestamp:
Sep 15, 2016 8:33:57 AM (5 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
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
Children:
2524008
Parents:
2d57835
git-author:
Piotr Rozyczko <rozyczko@…> (08/22/16 02:26:15)
git-committer:
Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)
Message:

Reverted precompiled models removal - requires more thought

Location:
sasview
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasview/installer_generator.py

    r15fd91b rc08fd96  
    199199    msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t""" 
    200200    msg += """Flags: recursesubdirs createallsubdirs\n"""  
     201    msg += """Source: "dist\compiled_models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t""" 
     202    msg += """Flags: recursesubdirs createallsubdirs\n""" 
    201203    msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t"""  
    202204    msg += """Flags: recursesubdirs createallsubdirs\n""" 
  • sasview/setup_exe.py

    r15fd91b rc08fd96  
    209209data_files += guiframe.data_files() 
    210210 
     211# precompile sas models into the sasview build path; doesn't matter too much 
     212# where it is so long as it is a place that will get cleaned up afterwards. 
     213import sasmodels.core 
     214dll_path = os.path.join(build_path, 'compiled_models') 
     215compiled_dlls = sasmodels.core.precompile_dlls(dll_path, dtype='double') 
     216 
     217# include the compiled models as data; coordinate the target path for the 
     218# data with installer_generator.py 
     219data_files.append(('compiled_models', compiled_dlls)) 
     220 
    211221import sasmodels 
    212222data_files += sasmodels.data_files() 
Note: See TracChangeset for help on using the changeset viewer.