Changeset 01b8659 in sasmodels


Ignore:
Timestamp:
May 11, 2016 4:17:31 PM (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/kerneldll.py

    r5a91c6b r01b8659  
    115115    else: 
    116116        basename += "128" 
     117 
     118    # Hack to find precompiled dlls 
     119    path = joinpath(generate.DATA_PATH, '..', 'compiled_models', basename+'.so') 
     120    if os.path.exists(path): 
     121        return path 
     122 
    117123    return joinpath(DLL_PATH, basename+'.so') 
    118124 
     
    151157    else: 
    152158        tempfile_prefix = 'sas_' + model_info['name'] + '128_' 
    153   
     159 
    154160    dll = dll_path(model_info, dtype) 
    155161 
    156162    if not os.path.exists(dll): 
    157163        need_recompile = True 
    158     elif getattr(sys, 'frozen', False): 
     164    elif is_frozen: 
    159165        # TODO: don't suppress time stamp 
    160166        # Currently suppressing recompile when running in a frozen environment 
Note: See TracChangeset for help on using the changeset viewer.