Changeset 01b8659 in sasmodels

Timestamp:

May 11, 2016 6:17:31 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

31bc9bf

Parents:

558d3b3

Message:

hack to look in sasmodels-data/../compiled_models for the precompiled dlls

File:

• sasmodels/kerneldll.py (modified) (2 diffs)

sasmodels/kerneldll.py

@@ -115 +115 @@
     else:
         basename += "128"
+
+    # Hack to find precompiled dlls
+    path = joinpath(generate.DATA_PATH, '..', 'compiled_models', basename+'.so')
+    if os.path.exists(path):
+        return path
+
     return joinpath(DLL_PATH, basename+'.so')
 
@@ -151 +157 @@
     else:
         tempfile_prefix = 'sas_' + model_info['name'] + '128_'
- 
+
     dll = dll_path(model_info, dtype)
 
     if not os.path.exists(dll):
         need_recompile = True
-    elif getattr(sys, 'frozen', False):
+    elif is_frozen:
         # TODO: don't suppress time stamp
         # Currently suppressing recompile when running in a frozen environment