Skip to content

Make Intel compiler + IntelMPI use mpiifort etc. #2005

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

Merged
boegel merged 4 commits into from
Nov 26, 2016
Merged

Make Intel compiler + IntelMPI use mpiifort etc. #2005

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcf0fb3
Make Intel compiler + IntelMPI use mpiifort etc.
akesandgren Nov 17, 2016
b8d62ad
Adjust test_ictce_toolchain to use mpiicc, mpiicpc, mpiifort.
akesandgren Nov 24, 2016
74251d5
Merge branch 'develop' into make-intel+impi-toolchain-use-mpiifort-etc
akesandgren Nov 24, 2016
5a1550d
Add comment about C/CXX wrappers in mpich2
akesandgren Nov 25, 2016
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
8 changes: 8 additions & 0 deletions easybuild/toolchains/mpi/intelmpi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
:author: Kenneth Hoste (Ghent University)
"""

import easybuild.tools.toolchain as toolchain
from easybuild.toolchains.mpi.mpich2 import Mpich2
from easybuild.tools.toolchain.constants import COMPILER_FLAGS, COMPILER_VARIABLES
from easybuild.tools.toolchain.variables import CommandFlagList
Expand All @@ -53,6 +54,13 @@ class IntelMPI(Mpich2):
def _set_mpi_compiler_variables(self):
"""Add I_MPI_XXX variables to set."""

if self.comp_family() == toolchain.INTELCOMP:
self.MPI_COMPILER_MPICC = 'mpiicc'
self.MPI_COMPILER_MPICXX = 'mpiicpc'
self.MPI_COMPILER_MPIF77 = 'mpiifort'
self.MPI_COMPILER_MPIF90 = 'mpiifort'
self.MPI_COMPILER_MPIFC = 'mpiifort'

# this needs to be done first, otherwise e.g., CC is set to MPICC if the usempi toolchain option is enabled
for var, _ in COMPILER_VARIABLES:
self.variables.nappend('I_MPI_%s' % var, str(self.variables[var].get_first()), var_class=CommandFlagList)
Expand Down
9 changes: 5 additions & 4 deletions easybuild/toolchains/mpi/mpich2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ class Mpich2(Mpich):
def _set_mpi_compiler_variables(self):
"""Set the MPICH_{CC, CXX, F77, F90, FC} variables."""

# hardwire MPI wrapper commands (otherwise Mpich parent class sets them based on MPICH version)
self.MPI_COMPILER_MPIF77 = 'mpif77'
self.MPI_COMPILER_MPIF90 = 'mpif90'
self.MPI_COMPILER_MPIFC = 'mpif90'
if self.MPI_COMPILER_MPIF77 is None and self.MPI_COMPILER_MPIF90 is None and self.MPI_COMPILER_MPIFC is None:
# hardwire MPI wrapper commands (otherwise Mpich parent class sets them based on MPICH version)

@ocaisa ocaisa Nov 23, 2016 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we add MPI{CC, CXX} to be consistent...or explain in the comment why you don't have to

@boegel boegel Nov 23, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ocaisa only MPI{F77,F90,FC} are being touched here, but I guess it doesn't hurt to clarify

@wpoely86 wpoely86 Nov 25, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

definitely clarify. The docstring says: Set the MPICH_{CC, CXX, F77, F90, FC} variables

@boegel boegel Nov 25, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I guess clarifying wouldn't hurt.

@akesandgren can you include a comment that only the Fortran compiler commands need to be overridden, i.e. that the C/C++ compilers are correctly set via the parent class?

self.MPI_COMPILER_MPIF77 = 'mpif77'
self.MPI_COMPILER_MPIF90 = 'mpif90'
self.MPI_COMPILER_MPIFC = 'mpif90'

super(Mpich2, self)._set_mpi_compiler_variables()