diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2016-02-22 00:11:47 +0100 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@gmail.com> | 2016-02-22 00:11:47 +0100 |
| commit | e5c1ac175722bc58e74aac4e6d9138adf9260ec6 (patch) | |
| tree | c9461c95a8c5371164b2ce14861472e24c651152 | |
| parent | a6efa09837b3a71eb6f6450b7dcf08c7381e75d0 (diff) | |
| parent | d811623e9b4bb9a70b8e48f8f353c851006f8e3f (diff) | |
| download | numpy-e5c1ac175722bc58e74aac4e6d9138adf9260ec6.tar.gz | |
Merge pull request #7232 from rmalouf/mkl
BLD: Switch order of test for lapack_mkl and openblas_lapack
| -rw-r--r-- | numpy/distutils/system_info.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index a541bfae2..bf966e7ca 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -1479,16 +1479,16 @@ class lapack_opt_info(system_info): def calc_info(self): - openblas_info = get_info('openblas_lapack') - if openblas_info: - self.set_info(**openblas_info) - return - lapack_mkl_info = get_info('lapack_mkl') if lapack_mkl_info: self.set_info(**lapack_mkl_info) return + openblas_info = get_info('openblas_lapack') + if openblas_info: + self.set_info(**openblas_info) + return + atlas_info = get_info('atlas_3_10_threads') if not atlas_info: atlas_info = get_info('atlas_3_10') |