Fix typo, enable debugging on lapack name mangling check

hpc4cmb · Oct 17, 2024 · 925abfb · 925abfb
1 parent d8f68fb
commit 925abfb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -101,6 +101,9 @@ jobs:
  TOAST_BUILD_CMAKE_VERBOSE_MAKEFILE=ON
  TOAST_BUILD_DISABLE_OPENMP=1
  TOAST_BUILD_BLAS_LIBRARIES='/usr/local/lib/libscipy_openblas.dylib'
+ TOAST_BUILD_BLA_PREFER_PKGCONFIG=1
+ TOAST_BUILD_BLA_PKGCONFIG_BLAS=scipy-openblas
+ TOAST_BUILD_BLAS_NO_UNDERSCORE=1
  TOAST_BUILD_LAPACK_LIBRARIES='/usr/local/lib/libscipy_openblas.dylib'
  TOAST_BUILD_FFTW_ROOT=/usr/local
  TOAST_BUILD_AATM_ROOT=/usr/local

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -103,6 +103,9 @@ jobs:
  TOAST_BUILD_CMAKE_VERBOSE_MAKEFILE=ON
  TOAST_BUILD_DISABLE_OPENMP=1
  TOAST_BUILD_BLAS_LIBRARIES='/usr/local/lib/libscipy_openblas.dylib'
+ TOAST_BUILD_BLA_PREFER_PKGCONFIG=1
+ TOAST_BUILD_BLA_PKGCONFIG_BLAS=scipy-openblas
+ TOAST_BUILD_BLAS_NO_UNDERSCORE=1
  TOAST_BUILD_LAPACK_LIBRARIES='/usr/local/lib/libscipy_openblas.dylib'
  TOAST_BUILD_FFTW_ROOT=/usr/local
  TOAST_BUILD_AATM_ROOT=/usr/local

diff --git a/cmake/FindLAPACKnames.cmake b/cmake/FindLAPACKnames.cmake
@@ -29,8 +29,8 @@ foreach(MANGLING IN LISTS MANGLING_OPTIONS)
  COMPILE_DEFINITIONS "-DLAPACK_${MANGLING}"
  LINK_LIBRARIES "${LAPACK_LIBRARIES}" "${BLAS_LIBRARIES}" "${OMP_BLAS}"
  OUTPUT_VARIABLE OUTPUT_MANGLING)
- # message("Test output for LAPACK_${MANGLING}:")
- # message(${OUTPUT_MANGLING})
+ message("Test output for LAPACK_${MANGLING}:")
+ message(${OUTPUT_MANGLING})
  if(TRY_MANGLING)
  set(LAPACK_NAMES "${MANGLING}")
  break()

diff --git a/packaging/wheels/install_deps_osx.sh b/packaging/wheels/install_deps_osx.sh
@@ -126,7 +126,7 @@ export CLEANUP=yes
 
 export BLAS_LIBRARIES="/usr/local/lib/libscipy_openblas.dylib"
 export LAPACK_LIBRARIES="/usr/local/lib/libscipy_openblas.dylib"
-export BLA_OPTIONS="-DBLA_PREFER_PKGCONFIG=1 -DBLA_PKGCONFIG_BLAS=scipy-openblas -DBLAS_NO_UNDERSCORE"
+export BLA_OPTIONS="-DBLA_PREFER_PKGCONFIG=1 -DBLA_PKGCONFIG_BLAS=scipy-openblas -DBLAS_NO_UNDERSCORE=1"
 
 for pkg in fftw libflac suitesparse libaatm; do
  source "${depsdir}/${pkg}.sh"