Changeset ca78fe6 in sasview


Ignore:
Timestamp:
Jul 30, 2018 5:01:29 AM (3 months ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_Pr_fixes, ESS_GUI_image_viewer, ESS_GUI_iss879, ESS_GUI_project_save
Children:
2ae3edb
Parents:
3067196
Message:

spec file modified to check if numerical lib is required for osx

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • build_tools/conda_qt5_min_osx.yml

    r3067196 rca78fe6  
    33  - conda-forge 
    44dependencies: 
    5  - numpy 
    65 - matplotlib 
    76 - scipy 
  • installers/sasview_qt5_osx.spec

    r44753d6 rca78fe6  
    7272datas.append((os.path.join(PYTHON_LOC,'lib','python3.6', 'site-packages','zmq','libzmq.cpython-36m-darwin.so'),'.')) 
    7373# These depend on whether we have MKL or Atlas numpy 
    74 if os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'mkl_core.' + LIBSUFFIX)): 
    75     datas.append(add_binary(LIBPREFIX + 'mkl_avx2.' + LIBSUFFIX)) 
    76     datas.append(add_binary(LIBPREFIX + 'mkl_core.' + LIBSUFFIX)) 
    77 elif os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX)): 
    78     datas.append(add_binary(LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX)) 
    79 else: 
    80     raise Exception("No numerical library for numpy found.") 
     74#if os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'mkl_core.' + LIBSUFFIX)): 
     75#    datas.append(add_binary(LIBPREFIX + 'mkl_avx2.' + LIBSUFFIX)) 
     76#    datas.append(add_binary(LIBPREFIX + 'mkl_core.' + LIBSUFFIX)) 
     77#elif os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX)): 
     78#    datas.append(add_binary(LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX)) 
     79#else: 
     80#    raise Exception("No numerical library for numpy found.") 
    8181 
    8282#import sas.sascalc.dataloader.readers 
Note: See TracChangeset for help on using the changeset viewer.