From 64afdef5c0b49f8f1722a6a9a5090e5cfa6de42b Mon Sep 17 00:00:00 2001 From: Josh Mottley Date: Tue, 8 Feb 2022 11:54:33 +0000 Subject: [PATCH] Add support for mpi gnu This patch adds support for mpi-gfortran. It can be selected by using `THORNADO_MACHINE=gnu` when calling make. --- Build/Makefile_Compilers | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Build/Makefile_Compilers b/Build/Makefile_Compilers index f438488..4f14bf4 100644 --- a/Build/Makefile_Compilers +++ b/Build/Makefile_Compilers @@ -1,16 +1,19 @@ FORTRAN_mac_gnu = mpif90 -fopenmp FORTRAN_titan_gnu = ftn FORTRAN_titan_cray = ftn +FORTRAN_gnu = mpif90 -fopenmp FORTRAN = $(FORTRAN_$(MACHINE)) SUFFIX_f90_mac_gnu = SUFFIX_f90_titan_gnu = SUFFIX_f90_titan_cray = +SUFFIX_f90_gnu = SUFFIX_f90 = $(SUFFIX_f90_$(MACHINE)) FLINKER_mac_gnu = mpif90 -fopenmp FLINKER_titan_gnu = ftn FLINKER_titan_cray = ftn +FLINKER_gnu = mpif90 -fopenmp FLINKER = $(FLINKER_$(MACHINE)) FLAGS_DEBUG = $(DEBUG) @@ -23,16 +26,19 @@ FLAGS_OPTIMIZE = $(OPTIMIZE) OPTIMIZE_mac_gnu = -O2 -framework Accelerate OPTIMIZE_titan_gnu = -O2 OPTIMIZE_titan_cray = +OPTIMIZE_gnu = OPTIMIZE = $(OPTIMIZE_$(MACHINE)) INCLUDE_HDF5_mac_gnu = -I/usr/local/Cellar/hdf5/1.8.16_1/include INCLUDE_HDF5_titan_gnu = # Use Module Load INCLUDE_HDF5_titan_cray = # Use Module Load +INCLUDE_HDF5_gnu = -I$(HDF5_INC) INCLUDE_HDF5 = $(INCLUDE_HDF5_$(MACHINE)) INCLUDE_LAPACK_mac_gnu = # Provided by -framework Accelerate INCLUDE_LAPACK_titan_gnu = # Provided by LibSci INCLUDE_LAPACK_titan_cray = # Provided by LibSci +INCLUDE_LAPACK_gnu = -I $(OPENBLAS_INC) # Provided by openblas INCLUDE_LAPACK = $(INCLUDE_LAPACK_$(MACHINE)) INCLUDE = $(INCLUDE_HDF5) $(INCLUDE_LAPACK) @@ -40,11 +46,13 @@ INCLUDE = $(INCLUDE_HDF5) $(INCLUDE_LAPACK) LIBRARIES_HDF5_mac_gnu = -L/usr/local/Cellar/hdf5/1.8.16_1/lib -lhdf5_fortran -lhdf5 LIBRARIES_HDF5_titan_gnu = # Use Module Load LIBRARIES_HDF5_titan_cray = # Use Module Load +LIBRARIES_HDF5_gnu = -L $(HDF5_LIB) -lhdf5 -lhdf5_fortran LIBRARIES_HDF5 = $(LIBRARIES_HDF5_$(MACHINE)) LIBRARIES_LAPACK_mac_gnu = # Provided by -framework Accelerate LIBRARIES_LAPACK_titan_gnu = # Provided by LibSci LIBRARIES_LAPACK_titan_cray = # Provided by LibSci +LIBRARIES_LAPACK_gnu = -L $(OPENBLAS_LIB) -lopenblas LIBRARIES_LAPACK = $(LIBRARIES_LAPACK_$(MACHINE)) LIBRARIES = $(LIBRARIES_HDF5) $(LIBRARIES_LAPACK) -- 2.25.1