Changeset 98d89df in sasview

Timestamp:

Aug 12, 2016 3:55:41 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:

25b9707a

Parents:

0e760e9

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (08/12/16 03:54:23)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (08/12/16 03:55:41)

Message:

Added numerical library checks

File:

• sasview/setup_exe.py (modified) (1 diff)

sasview/setup_exe.py

@@ -243 +243 @@
     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]))
-    
+# numerical libraries
+def dll_check(dll_path, dlls):
+    dll_includes = [os.path.join(dll_path, dll+'.dll') for dll in dlls]
+    return [dll for dll in dll_includes if os.path.exists(dll)]
+
+python_root = os.path.dirname(os.path.abspath(sys.executable))
+# Check for ATLAS
+dll_path = os.path.join(python_root, 'lib', 'site-packages', 'numpy', 'core')
+dlls = ['numpy-atlas']
+atlas_dlls = dll_check(dll_path, dlls)
+
+# Check for MKL
+dll_path = os.path.join(python_root, 'Library', 'bin')
+dlls = ['mkl_core', 'mkl_def', 'libiomp5md']
+mkl_dlls = dll_check(dll_path, dlls)
+
+if atlas_dlls:
+    data_files.append(('.', atlas_dlls))
+elif mkl_dlls:
+    data_files.append(('.', mkl_dlls))
+
 if os.path.isfile("BUILD_NUMBER"):
     data_files.append(('.', ["BUILD_NUMBER"]))