Skip to content

Commit

Permalink
BUG: Fix for blaslapack config options
Browse files Browse the repository at this point in the history
  • Loading branch information
TidbitSoftware committed Jan 10, 2025
1 parent 898ea8f commit 1948869
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions jenkins/mac-intel-full
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ MATLAB_PATH="/Applications/MATLAB_R2023b.app"
#--------------------#

ISSM_CONFIG='\
--prefix=${ISSM_DIR} \
--prefix="${ISSM_DIR}" \
--disable-static \
--enable-development \
--enable-debugging \
--with-numthreads=4 \
--with-matlab-dir=${MATLAB_PATH} \
--with-python-version=3.9 \
--with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
--with-python-numpy-dir=${HOME}/.venv/issm/lib/python3.9/site-packages/numpy \
--with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.9/site-packages/numpy" \
--with-fortran-lib="-L/usr/local/Cellar/gcc/14.2.0_1/lib/gcc/current -lgfortran" \
--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
--with-mpi-include="${ISSM_DIR}/externalpackages/petsc/install/include" \
--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
--with-blas-lapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
--with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \
--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
Expand Down
4 changes: 2 additions & 2 deletions m4/issm_options.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1680,7 +1680,7 @@ AC_DEFUN([ISSM_OPTIONS],[
if test -z "${BLASLAPACK_LIB}"; then
if ! test -d "${BLAS_ROOT}" || ! test -d "${LAPACK_ROOT}"; then
if ! test -d "${BLASLAPACK_ROOT}"; then
AC_MSG_ERROR([Use either --with-blas-dir and --with-lapack-dir *or* --with-blaslapack-dir]);
AC_MSG_ERROR([Use either --with-blas-dir and --with-lapack-dir *or* --with-blaslapack-dir *or* --with-blaslapack-lib and supply libflags]);
fi
fi
fi
Expand All @@ -1689,7 +1689,7 @@ AC_DEFUN([ISSM_OPTIONS],[
dnl BLAS/LAPACK libraries and header files
if test "x${HAVE_BLASLAPACK}" == "xyes"; then
if test ! -z "${BLASLAPACK_LIB}"; then
if test "x${BLASLAPACK_LIB}" != "xno"; then
BLASLAPACKLIB="${BLASLAPACK_LIB}"
else
case "${host_os}" in
Expand Down

0 comments on commit 1948869

Please sign in to comment.