Changeset 70b7d778 in sasview

Timestamp:

Sep 15, 2016 8:33:57 AM (8 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:

• sasview/setup_exe.py (modified) (2 diffs)

sasview/setup_exe.py

@@ -242 +242 @@
 if os.path.isfile(f):
     data_files.append(('.', [f]))
+
+# atlas DLL required by matplotlib 11.1
+# ** REVISIT WHEN MOVING TO ANACONDA **
+f = "c:\\python27\\lib\\site-packages\\numpy\\core\\numpy-atlas.dll"
+if os.path.isfile(f):
+    data_files.append(('.', [f]))
     
 if os.path.isfile("BUILD_NUMBER"):
@@ -332 +338 @@
     # numpy 1.8 openmp bindings (still seems to use all the cores without them)
     #'libiomp5md.dll', 'libifcoremd.dll', 'libmmd.dll', 'svml_dispmd.dll','libifportMD.dll',
+    'numpy-atlas.dll',
     # microsoft C runtime (not allowed to ship with the app; need to ship vcredist
     'msvcp90.dll',