Changeset 70b7d778 in sasview


Ignore:
Timestamp:
Sep 15, 2016 8:33:57 AM (5 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
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
Children:
ba0dc71
Parents:
ddfe3f17
git-author:
Piotr Rozyczko <piotr.rozyczko@…> (08/10/16 05:54:50)
git-committer:
Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)
Message:

Attempt at fixing annoying numpy issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasview/setup_exe.py

    r5552396 r70b7d778  
    242242if os.path.isfile(f): 
    243243    data_files.append(('.', [f])) 
     244 
     245# atlas DLL required by matplotlib 11.1 
     246# ** REVISIT WHEN MOVING TO ANACONDA ** 
     247f = "c:\\python27\\lib\\site-packages\\numpy\\core\\numpy-atlas.dll" 
     248if os.path.isfile(f): 
     249    data_files.append(('.', [f])) 
    244250     
    245251if os.path.isfile("BUILD_NUMBER"): 
     
    332338    # numpy 1.8 openmp bindings (still seems to use all the cores without them) 
    333339    #'libiomp5md.dll', 'libifcoremd.dll', 'libmmd.dll', 'svml_dispmd.dll','libifportMD.dll', 
     340    'numpy-atlas.dll', 
    334341    # microsoft C runtime (not allowed to ship with the app; need to ship vcredist 
    335342    'msvcp90.dll', 
Note: See TracChangeset for help on using the changeset viewer.