Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor Make.nrel to use MPT for MPI with the Intel compiler on Eagle #2861

Merged
merged 1 commit into from
Jun 29, 2022
Merged

Refactor Make.nrel to use MPT for MPI with the Intel compiler on Eagle #2861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions Tools/GNUMake/sites/Make.nrel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,32 @@ else ifeq ($(which_computer), rhodes)
endif
endif

# Account for Intel-MPI, MPICH, OpenMPI, and HPE MPT
ifeq ($(USE_MPI),TRUE)
CXX := mpicxx
CC := mpicc
FC := mpif90
F90 := mpif90
ifeq ($(COMP), intel)
CXX := mpiicpc
CC := mpiicc
FC := mpiifort
F90 := mpiifort
else
CXX := mpicxx
CC := mpicc
FC := mpif90
F90 := mpif90
ifneq ($(findstring mpich, $(shell $(F90) -show 2>&1)),)
mpif90_link_flags := $(shell $(F90) -link_info)
LIBRARIES += $(wordlist 2,1024,$(mpif90_link_flags))
else ifneq ($(findstring Open MPI, $(shell $(F90) -showme:version 2>&1)),)
mpif90_link_flags := $(shell $(F90) -showme:link)
LIBRARIES += $(mpif90_link_flags)
else
# MPT case (no option available to query link flags)
LIBRARIES += -lmpi
ifeq ($(which_computer), eagle)
# Always assume MPT on Eagle
export MPICXX_CXX := icpc
export MPICC_CC := icc
export MPIF90_F90 := ifort
else ifeq ($(which_computer), rhodes)
CXX := mpiicpc
CC := mpiicc
FC := mpiifort
F90 := mpiifort
endif
endif
ifneq ($(findstring mpich, $(shell $(F90) -show 2>&1)),)
mpif90_link_flags := $(shell $(F90) -link_info)
LIBRARIES += $(wordlist 2,1024,$(mpif90_link_flags))
else ifneq ($(findstring Open MPI, $(shell $(F90) -showme:version 2>&1)),)
mpif90_link_flags := $(shell $(F90) -showme:link)
LIBRARIES += $(mpif90_link_flags)
else
# MPT case (no option available to query link flags)
LIBRARIES += -lmpi
endif
endif