Skip to content

Commit 0cebcd9

Browse files
Use system/developer copies of libblas and liblapack on macOS
1 parent eee23d8 commit 0cebcd9

File tree

9 files changed

+12
-14
lines changed

9 files changed

+12
-14
lines changed

externalpackages/dakota/install-6.2-mac-static.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a
2222

2323
## Environment
2424
#
25-
export BLAS_LIBS="-L${BLAS_ROOT}/lib -lfblas ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
25+
export BLAS_LIBS="libblas.a ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
2626
export DAK_BUILD=${ISSM_DIR}/externalpackages/dakota/build # DO NOT CHANGE THIS
2727
export DAK_INSTALL=${PREFIX} # DO NOT CHANGE THIS
2828
export DAK_SRC=${ISSM_DIR}/externalpackages/dakota/src # DO NOT CHANGE THIS
29-
export LAPACK_LIBS="-L${LAPACK_ROOT}/lib -lflapack ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
29+
export LAPACK_LIBS="liblapack.a ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
3030
export LDFLAGS="-framework CoreFoundation"
3131

3232
# Cleanup

externalpackages/dakota/install-6.2-mac.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
1919

2020
## Environment
2121
#
22-
export BLAS_LIBS="-L${BLAS_ROOT}/lib -lfblas" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
22+
export BLAS_LIBS="-lblas" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
2323
export DAK_BUILD=${ISSM_DIR}/externalpackages/dakota/build # DO NOT CHANGE THIS
2424
export DAK_INSTALL=${PREFIX} # DO NOT CHANGE THIS
2525
export DAK_SRC=${ISSM_DIR}/externalpackages/dakota/src # DO NOT CHANGE THIS
2626
export FLIBS="-L${LIBGFORTRAN_ROOT} -lgfortran"
27-
export LAPACK_LIBS="-L${LAPACK_ROOT}/lib -lflapack" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
27+
export LAPACK_LIBS="-llapack" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
2828
export LDFLAGS="-framework CoreFoundation"
2929

3030
# Cleanup

externalpackages/gmsh/install-4-mac-static.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ cmake \
7878
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
7979
-DCMAKE_BUILD_TYPE=Release \
8080
-DENABLE_BUILD_LIB=1 \
81-
-DBLAS_LAPACK_LIBRARIES="-L${LAPACK_ROOT}/lib -lflapack -L${BLAS_ROOT}/lib -lfblas ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" \
81+
-DBLAS_LAPACK_LIBRARIES="liblapack.a libblas.a ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" \
8282
-DENABLE_BLAS_LAPACK=1 \
8383
-DENABLE_EIGEN=0 \
8484
-DENABLE_FLTK=0 \

externalpackages/gmsh/install-4-mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ cmake \
7777
-DCMAKE_BUILD_TYPE=Release \
7878
-DENABLE_BUILD_DYNAMIC=1 \
7979
-DENABLE_BUILD_SHARED=1 \
80-
-DBLAS_LAPACK_LIBRARIES="-L${LAPACK_ROOT}/lib -lflapack -L${BLAS_ROOT}/lib -lfblas -L${LIBGFORTRAN_ROOT} -lgfortran" \
80+
-DBLAS_LAPACK_LIBRARIES="-llapack -lblas -L${LIBGFORTRAN_ROOT} -lgfortran" \
8181
-DLIBGFORTRAN_ROOT="${LIBGFORTRAN_ROOT}" \
8282
-DENABLE_BLAS_LAPACK=1 \
8383
-DENABLE_EIGEN=0 \

externalpackages/gmt/configs/6.0/mac/cmake/ConfigUser.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ set (ZLIB_ROOT "$ENV{ZLIB_ROOT}")
166166
#set (GLIB_LIBRARIES c:/path/to/glib-dev/lib/glib-2.0.lib)
167167

168168
# Set LAPACK location. Use this when want to link with LAPACK and it's not found automatically
169-
set (LAPACK_LIBRARY "-L$ENV{LAPACK_ROOT} -lflapack")
170-
set (BLAS_LIBRARY "-L$ENV{BLAS_ROOT} -lfblas")
169+
set (LAPACK_LIBRARY "-llapack")
170+
set (BLAS_LIBRARY "-lblas")
171171

172172
##
173173
## Section 3: GMT features

externalpackages/gmt/install-6-mac-static.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ cd build
8787
#
8888
cmake \
8989
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
90-
-DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
90+
-DBLAS_LIBRARIES="libblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
9191
-DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
9292
-DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \
9393
-DGDAL_EXTRA_LIBS="${GDAL_EXTRA_LIBS}" \
9494
-DGLIB_INCLUDE_DIRS="${GLIB_H_DIR};${GLIBCONFIG_H_DIR}" \
9595
-DGLIB_LIBRARY="${LIBGLIB} ${LIBGLIB_ROOT}/libgthread-2.0.a ${LIBINTL} -liconv ${LIBPCRE} -framework Foundation" \
96-
-DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
96+
-DLAPACK_LIBRARIES="liblapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
9797
-DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \
9898
..
9999

externalpackages/gmt/install-6-mac.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ cd build
5858
#
5959
cmake \
6060
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
61-
-DBLAS_LIBRARIES="-L${BLAS_ROOT}/lib;-lfblas;-L${LIBGFORTRAN_ROOT};-lgfortran" \
61+
-DBLAS_LIBRARIES="-lblas;-L${LIBGFORTRAN_ROOT};-lgfortran" \
6262
-DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
6363
-DCURL_LIBRARY="-L${CURL_ROOT}/lib;-lcurl" \
64-
-DLAPACK_LIBRARIES="-L${LAPACK_ROOT}/lib;-lflapack;-L${LIBGFORTRAN_ROOT};-lgfortran" \
64+
-DLAPACK_LIBRARIES="-llapack;-L${LIBGFORTRAN_ROOT};-lgfortran" \
6565
-DLIBGFORTRAN_ROOT="${LIBGFORTRAN_ROOT}" \
6666
..
6767

externalpackages/petsc/install-3.23-mac-static.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ cd ${PETSC_DIR}
4444
--with-valgrind=0 \
4545
--with-x=0 \
4646
--with-ssl=0 \
47-
--download-fblaslapack=1 \
4847
--download-metis=1 \
4948
--download-mpich=1 \
5049
--download-mumps=1 \

externalpackages/petsc/install-3.23-mac.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ cd ${PETSC_DIR}
3232
--with-x=0 \
3333
--with-ssl=0 \
3434
--with-pic=1 \
35-
--download-fblaslapack=1 \
3635
--download-metis=1 \
3736
--download-mpich=1 \
3837
--download-mumps=1 \

0 commit comments

Comments
 (0)