Commit 6b0a971 1 parent edf53a6 commit 6b0a971 Copy full SHA for 6b0a971
File tree 2 files changed +14
-1
lines changed
2 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -2730,7 +2730,13 @@ else
2730
2730
CORE_LIBS + = $ (BLAS_LIB )
2731
2731
endif
2732
2732
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
2734
2740
ifndef USE_INTERNALBLAS
2735
2741
errordgemm :
2736
2742
$ (info )
@@ -2740,6 +2746,11 @@ ifndef BLASOPT
2740
2746
$ (info If you decide to not use a fast implementation of BLAS /LAPACK ,)
2741
2747
$ (info please define USE_INTERNALBLAS = y and the internal Netlib will be used .)
2742
2748
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
2743
2754
endif
2744
2755
2745
2756
ifdef USE_NOIO
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ if [[ "$os" == "Darwin" ]]; then
8
8
else
9
9
export USE_64TO32="y"
10
10
export BLASOPT="-L/usr/local/opt/openblas/lib -lopenblas"
11
+ export LAPACK_LIB="-L/usr/local/opt/openblas/lib -lopenblas"
11
12
if [[ "$MPI_IMPL" == "openmpi" ]]; then
12
13
export SCALAPACK="-L/usr/local/lib -lscalapack -lopenblas"
13
14
fi
@@ -23,6 +24,7 @@ if [[ "$os" == "Darwin" ]]; then
23
24
fi
24
25
if [[ "$os" == "Linux" ]]; then
25
26
export BLASOPT="-L$TRAVIS_BUILD_DIR/lib -lopenblas"
27
+ export LAPACK_LIB="-L$TRAVIS_BUILD_DIR/lib -lopenblas"
26
28
export NWCHEM_TARGET=LINUX64
27
29
export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/lib:$LD_LIBRARY_PATH
28
30
if [[ "$NWCHEM_MODULES" != "tce" ]]; then
You can’t perform that action at this time.
0 commit comments