From 8fd3f5b166f59c9d0566d391068845e736d8151f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 9 Nov 2020 10:35:33 -0600 Subject: Fix cblas detection on windows --- numpy/distutils/system_info.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'numpy/distutils/system_info.py') diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index c3bd6347c..c18d2e401 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -2019,6 +2019,14 @@ class blas64__opt_info(blas_ilp64_opt_info): symbol_suffix = '64_' +class cblas_info(system_info): + section = 'cblas' + dir_env_var = 'CBLAS' + # No default as it's used only in blas_info + _lib_names = [] + notfounderror = BlasNotFoundError + + class blas_info(system_info): section = 'blas' dir_env_var = 'BLAS' @@ -2040,6 +2048,13 @@ class blas_info(system_info): # often not installed when mingw is being used. This rough # treatment is not desirable, but windows is tricky. info['language'] = 'f77' # XXX: is it generally true? + # If cblas is given as an option, use those + cblas_info_obj = cblas_info() + cblas_opt = cblas_info_obj.get_option_single('cblas_libs', 'libraries') + cblas_libs = cblas_info_obj.get_libs(cblas_opt, None) + if cblas_libs: + info['libraries'] = cblas_libs + blas_libs + info['define_macros'] = [('HAVE_CBLAS', None)] else: lib = self.get_cblas_libs(info) if lib is not None: -- cgit v1.2.1