Merge pull request numpy#8308 from rgommers/fix-accelerate-link

BUG: do not link to Accelerate if OpenBLAS, MKL or BLIS are found.
uchida · Nov 24, 2016 · 4d885d3 · 4d885d3
2 parents 2075e1f + 8df25b2
commit 4d885d3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
@@ -1488,7 +1488,8 @@ def calc_info(self):
         if not atlas_info:
             atlas_info = get_info('atlas')
 
-        if sys.platform == 'darwin' and not atlas_info:
+        if sys.platform == 'darwin' and not (atlas_info or openblas_info or
+                                             lapack_mkl_info):
             # Use the system lapack from Accelerate or vecLib under OSX
             args = []
             link_args = []
@@ -1593,7 +1594,8 @@ def calc_info(self):
         if not atlas_info:
             atlas_info = get_info('atlas_blas')
 
-        if sys.platform == 'darwin' and not atlas_info:
+        if sys.platform == 'darwin' and not (atlas_info or openblas_info or
+                                             blas_mkl_info or blis_info):
             # Use the system BLAS from Accelerate or vecLib under OSX
             args = []
             link_args = []