@@ -14,7 +14,7 @@ OPT = 0
14
14
# # OpenMP? Empty: default with OpenMP; 0: No OpenMP; 1 with OpenMP
15
15
OMP = 1
16
16
# # Lapack/blas/mkl? Empty: default with Lapack; 0: without Lapack; 1 with Lapack
17
- LAPACK = 1
17
+ LAPACK = 0
18
18
# # Some compilers (like PGF90) do not have inverse hyperbolic functions: atanh, asinh, acosh
19
19
# NVHYP = 1 : with intrinsic inverse hyperbolic functions
20
20
# NVHYP = 0 : with external inverse hyperbolic functions (without intrinsic ones)
@@ -116,7 +116,13 @@ ifeq ($(F90),ifort)
116
116
else
117
117
F90FLAGS = -O0 $(OMPFLAG ) -check all -g -traceback
118
118
endif
119
- F90LIB = -mkl -lpthread
119
+
120
+ ifeq ($(LAPACK),1)
121
+ F90LIB = -mkl -lpthread
122
+ # F90LIB = $(MKLROOT)/lib/libmkl_lapack95_ilp64.a $(MKLROOT)/lib/libmkl_core.a $(MKLROOT)/lib/libmkl_blas95_ilp64.a -lpthread
123
+ else
124
+ F90LIB = -lpthread
125
+ endif
120
126
121
127
F90_VER = $(shell $(F90 ) --version | head -1 )
122
128
@@ -170,17 +176,20 @@ endif
170
176
OMPFLAG = -fopenmp
171
177
endif
172
178
# OS management
173
- ifeq ($(OS),Darwin) # OSX
174
- # OSX libs (included lapack+blas)
175
- F90LIB = -framework Accelerate
176
- else # Linux
177
- # linux libs
178
- F90LIB = -llapack -lblas
179
- #
180
- # linux libs with mkl and with openmp
181
- # F90LIB = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_gnu_thread
182
- # linux libs with mkl and without openmp
183
- # F90LIB = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
179
+ ifeq ($(LAPACK),1)
180
+ ifeq ($(OS),Darwin) # OSX
181
+ # OSX libs (included lapack+blas)
182
+ F90LIB = -framework Accelerate
183
+ else # Linux
184
+ # linux libs
185
+ F90LIB = -llapack -lblas
186
+ # linux libs with mkl and with openmp
187
+ # F90LIB = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_gnu_thread
188
+ # linux libs with mkl and without openmp
189
+ # F90LIB = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
190
+ endif
191
+ else
192
+ F90LIB =
184
193
endif
185
194
#
186
195
# opt management
@@ -230,7 +239,7 @@ CPPSHELL_DIAGO = -D__LAPACK="$(LAPACK)"
230
239
F90_FLAGS = $(F90 ) $(F90FLAGS )
231
240
LYNK90 = $(F90_FLAGS )
232
241
233
- LIBS := $(PESLIB ) $(F90LIB ) $(ARPACKLIB )
242
+ LIBS := $(PESLIB ) $(ARPACKLIB ) $(F90LIB )
234
243
LYNKFLAGS = $(LIBS )
235
244
236
245
0 commit comments