Changeset c3e4e213 in sasview

Timestamp:

Aug 10, 2016 5:54:50 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57, d2fd8fc

Parents:

5213d22

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',