Skip to content

Commit 6b0a971

Browse files
committed
force user to set LAPACK_LIB when either BLASOPT or BLAS_LIB are defined to avoid GlobalArrays/ga#142
1 parent edf53a6 commit 6b0a971

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/config/makefile.h

+12-1
Original file line numberDiff line numberDiff line change
@@ -2730,7 +2730,13 @@ else
27302730
CORE_LIBS += $(BLAS_LIB)
27312731
endif
27322732

2733-
ifndef BLASOPT
2733+
ifdef BLASOPT
2734+
BLAS_SUPPLIED=Y
2735+
endif
2736+
ifdef BLAS_LIB
2737+
BLAS_SUPPLIED=Y
2738+
endif
2739+
ifndef BLAS_SUPPLIED
27342740
ifndef USE_INTERNALBLAS
27352741
errordgemm:
27362742
$(info )
@@ -2740,6 +2746,11 @@ ifndef BLASOPT
27402746
$(info If you decide to not use a fast implementation of BLAS/LAPACK,)
27412747
$(info please define USE_INTERNALBLAS=y and the internal Netlib will be used.)
27422748
endif
2749+
else
2750+
ifndef LAPACK_LIB
2751+
errorlap1:
2752+
$(error Please define LAPACK_LIB if you have defined BLASOPT or BLAS_LIB)
2753+
endif
27432754
endif
27442755
27452756
ifdef USE_NOIO

travis/nwchem.bashrc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if [[ "$os" == "Darwin" ]]; then
88
else
99
export USE_64TO32="y"
1010
export BLASOPT="-L/usr/local/opt/openblas/lib -lopenblas"
11+
export LAPACK_LIB="-L/usr/local/opt/openblas/lib -lopenblas"
1112
if [[ "$MPI_IMPL" == "openmpi" ]]; then
1213
export SCALAPACK="-L/usr/local/lib -lscalapack -lopenblas"
1314
fi
@@ -23,6 +24,7 @@ if [[ "$os" == "Darwin" ]]; then
2324
fi
2425
if [[ "$os" == "Linux" ]]; then
2526
export BLASOPT="-L$TRAVIS_BUILD_DIR/lib -lopenblas"
27+
export LAPACK_LIB="-L$TRAVIS_BUILD_DIR/lib -lopenblas"
2628
export NWCHEM_TARGET=LINUX64
2729
export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/lib:$LD_LIBRARY_PATH
2830
if [[ "$NWCHEM_MODULES" != "tce" ]]; then

0 commit comments

Comments
 (0)