Changeset 525aaa2 in sasview

Timestamp:

Aug 22, 2016 12:27:57 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

b61bd57, dde9e0e

Parents:

ee6d4ad

git-author:

Piotr Rozyczko <rozyczko@…> (08/22/16 00:26:15)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/22/16 00:27:57)

Message:

Reverted precompiled models removal - requires more thought

Location:

sasview

Files:

• installer_generator.py (modified) (1 diff)
• setup_exe.py (modified) (1 diff)

sasview/installer_generator.py

@@ -199 +199 @@
     msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t"""
     msg += """Flags: recursesubdirs createallsubdirs\n""" 
+    msg += """Source: "dist\compiled_models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t"""
+    msg += """Flags: recursesubdirs createallsubdirs\n"""
     msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t""" 
     msg += """Flags: recursesubdirs createallsubdirs\n"""

sasview/setup_exe.py

@@ -209 +209 @@
 data_files += guiframe.data_files()
 
+# precompile sas models into the sasview build path; doesn't matter too much
+# where it is so long as it is a place that will get cleaned up afterwards.
+import sasmodels.core
+dll_path = os.path.join(build_path, 'compiled_models')
+compiled_dlls = sasmodels.core.precompile_dlls(dll_path, dtype='double')
+
+# include the compiled models as data; coordinate the target path for the
+# data with installer_generator.py
+data_files.append(('compiled_models', compiled_dlls))
+
 import sasmodels
 data_files += sasmodels.data_files()