Skip to content

Commit dfd1064

Browse files
committed
refs #287. Don't enable OpenMP for netlib LAPACK sequential Fortran codes.
1 parent b2219b3 commit dfd1064

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ prof_lapack : lapack_prebuild
219219
lapack_prebuild :
220220
ifndef NOFORTRAN
221221
-@echo "FORTRAN = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
222-
-@echo "OPTS = $(FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
223-
-@echo "POPTS = $(FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
224-
-@echo "NOOPT = $(FFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
225-
-@echo "PNOOPT = $(FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
222+
-@echo "OPTS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
223+
-@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
224+
-@echo "NOOPT = $(LAPACK_FFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
225+
-@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
226226
-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
227227
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
228228
-@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc

Makefile.system

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,10 @@ override FFLAGS += $(COMMON_OPT) $(FCOMMON_OPT)
840840
override FPFLAGS += $(COMMON_OPT) $(FCOMMON_OPT) $(COMMON_PROF)
841841
#MAKEOVERRIDES =
842842

843+
#For LAPACK Fortran codes.
844+
LAPACK_FFLAGS := $(filter-out -fopenmp -mp -openmp -xopenmp=parallel,$(FFLAGS))
845+
LAPACK_FPFLAGS := $(filter-out -fopenmp -mp -openmp -xopenmp=parallel,$(FPFLAGS))
846+
843847
LAPACK_CFLAGS = $(CFLAGS)
844848
LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H
845849
ifdef INTERFACE64

0 commit comments

Comments
 (0)