Changeset 75fff69 in sasview


Ignore:
Timestamp:
Oct 18, 2017 5:20:05 AM (2 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
202a4ce9
Parents:
a44b6c7
Message:

Changed order of numerical libraries search to enable MKL for win64, as required.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installers/setup_exe.py

    rb963b20 r75fff69  
    206206data_files += calculator.data_files() 
    207207 
     208<<<<<<< Updated upstream:installers/setup_exe.py 
    208209from sas.sasgui.perspectives import invariant 
    209210data_files += invariant.data_files() 
     211======= 
     212python_root = os.path.dirname(os.path.abspath(sys.executable)) 
     213 
     214# Check for ATLAS 
     215dll_path = os.path.join(python_root, 'lib', 'site-packages', 'numpy', 'core') 
     216dlls = ['numpy-atlas'] 
     217atlas_dlls = dll_check(dll_path, dlls) 
     218>>>>>>> Stashed changes:sasview/setup_exe.py 
    210219 
    211220from sas.sasgui import guiframe 
    212221data_files += guiframe.data_files() 
    213222 
     223<<<<<<< Updated upstream:installers/setup_exe.py 
    214224# Copy the config files 
    215225sasview_path = os.path.join('..', 'src', 'sas', 'sasview') 
     
    221231sas_path = os.path.join('..', 'src', 'sas') 
    222232data_files.append(('.', [os.path.join(sas_path, 'logging.ini')])) 
     233======= 
     234if mkl_dlls: 
     235    data_files.append(('.', atlas_dlls)) 
     236elif atlas_dlls: 
     237    data_files.append(('.', mkl_dlls)) 
     238>>>>>>> Stashed changes:sasview/setup_exe.py 
    223239 
    224240if os.path.isfile("BUILD_NUMBER"): 
     
    266282mkl_dlls = dll_check(mkl_path, ['mkl_core', 'mkl_def', 'libiomp5md']) 
    267283 
    268 if atlas_dlls: 
     284if mkl_dlls: 
    269285    data_files.append(('.', atlas_dlls)) 
    270 elif mkl_dlls: 
     286elif atlas_dlls: 
    271287    data_files.append(('.', mkl_dlls)) 
    272288 
Note: See TracChangeset for help on using the changeset viewer.