Skip to content
Permalink
Browse files

force user to set LAPACK_LIB when either BLASOPT or BLAS_LIB are defi…

…ned to avoid GlobalArrays/ga#142
  • Loading branch information...
edoapra committed Mar 13, 2019
1 parent edf53a6 commit 6b0a971207e776f43dec81974014e86caf8cee61
Showing with 14 additions and 1 deletion.
  1. +12 −1 src/config/makefile.h
  2. +2 −0 travis/nwchem.bashrc
@@ -2730,7 +2730,13 @@ else
CORE_LIBS += $(BLAS_LIB)
endif

ifndef BLASOPT
ifdef BLASOPT
BLAS_SUPPLIED=Y
endif
ifdef BLAS_LIB
BLAS_SUPPLIED=Y
endif
ifndef BLAS_SUPPLIED
ifndef USE_INTERNALBLAS
errordgemm:
$(info )
@@ -2740,6 +2746,11 @@ ifndef BLASOPT
$(info If you decide to not use a fast implementation of BLAS/LAPACK,)
$(info please define USE_INTERNALBLAS=y and the internal Netlib will be used.)
endif
else
ifndef LAPACK_LIB
errorlap1:
$(error Please define LAPACK_LIB if you have defined BLASOPT or BLAS_LIB)
endif
endif
ifdef USE_NOIO
@@ -8,6 +8,7 @@ if [[ "$os" == "Darwin" ]]; then
else
export USE_64TO32="y"
export BLASOPT="-L/usr/local/opt/openblas/lib -lopenblas"
export LAPACK_LIB="-L/usr/local/opt/openblas/lib -lopenblas"
if [[ "$MPI_IMPL" == "openmpi" ]]; then
export SCALAPACK="-L/usr/local/lib -lscalapack -lopenblas"
fi
@@ -23,6 +24,7 @@ if [[ "$os" == "Darwin" ]]; then
fi
if [[ "$os" == "Linux" ]]; then
export BLASOPT="-L$TRAVIS_BUILD_DIR/lib -lopenblas"
export LAPACK_LIB="-L$TRAVIS_BUILD_DIR/lib -lopenblas"
export NWCHEM_TARGET=LINUX64
export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/lib:$LD_LIBRARY_PATH
if [[ "$NWCHEM_MODULES" != "tce" ]]; then

0 comments on commit 6b0a971

Please sign in to comment.
You can’t perform that action at this time.