Merge pull request #24222 from seberg/fix-cblas-wheels

charris · web-flow · commit 570b20984e33 · 2023-07-20T16:15:57.000-06:00
BUG: Fix cblas detection for the wheel builds
diff --git a/numpy/meson.build b/numpy/meson.build
@@ -48,6 +48,11 @@ else
 endif
 
 
+# This is currently injected directly into CFLAGS/CXXFLAGS for wheel builds
+# (see cibuildwheel settings in pyproject.toml)
+blas_symbol_suffix = get_option('blas-symbol-suffix')
+
+
 # TODO: 64-bit BLAS and LAPACK
 #
 # Note that this works as long as BLAS and LAPACK are detected properly via
@@ -69,6 +74,14 @@ endif
 have_blas = blas.found()
 cblas = []
 if have_blas
+  # As noted above, at this point the BLAS_SYMBOL_SUFFIX may be injected into
+  # the CFLAGS directly, so this requires care to use that when it happens:
+  if blas_symbol_suffix != ''
+    probe_args = ['-DBLAS_SYMBOL_SUFFIX=' + blas_symbol_suffix]
+  else
+    probe_args = []
+  endif
+
   # Netlib BLAS has a separate `libcblas.so` which we use directly in the g77
   # ABI wrappers, so detect it and error out if we cannot find it. OpenBLAS can
   # be built without CBLAS too (see gh-23909, done by Arch Linux until
@@ -78,15 +91,22 @@ if have_blas
   # see https://github.com/mesonbuild/meson/pull/10921.
   have_cblas = false
   if cc.links('''
+      #ifndef BLAS_SYMBOL_SUFFIX
+      #  define BLAS_SYMBOL_SUFFIX
+      #endif
+      #define EXPAND(suffix) cblas_ddot ## suffix
+      #define DDOT(suffix) EXPAND(suffix)
+
       #include <cblas.h>
       int main(int argc, const char *argv[])
       {
           double a[4] = {1,2,3,4};
           double b[4] = {5,6,7,8};
-          return cblas_ddot(4, a, 1, b, 1) > 10;
+          return DDOT(BLAS_SYMBOL_SUFFIX)(4, a, 1, b, 1) > 10;
       }
       ''',
       dependencies: blas,
+      args: probe_args,
       name: 'CBLAS',
     )
     have_cblas = true
@@ -133,9 +153,6 @@ if have_blas
   if use_ilp64
     c_args_blas += ['-DHAVE_BLAS_ILP64']
   endif
-  # This is currently injected directly into CFLAGS/CXXFLAGS for wheel builds
-  # (see cibuildwheel settings in pyproject.toml)
-  blas_symbol_suffix = get_option('blas-symbol-suffix')
   if blas_symbol_suffix != ''
     c_args_blas += ['-DBLAS_SYMBOL_SUFFIX=' + blas_symbol_suffix]
   endif
