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

Make threading an explicit option rather than relying on the MPI impl… #914

Merged
merged 3 commits into from
May 13, 2016
Merged

Make threading an explicit option rather than relying on the MPI impl… #914

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a995998
Make threading an explicit option rather than relying on the MPI impl…
May 10, 2016
1b1504d
Ensure backwards compatibility
May 13, 2016
c954170
Update scotch.py
May 13, 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
16 changes: 14 additions & 2 deletions easybuild/easyblocks/s/scotch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

import easybuild.tools.toolchain as toolchain
from easybuild.framework.easyblock import EasyBlock
from easybuild.framework.easyconfig import CUSTOM
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.filetools import copytree
from easybuild.tools.run import run_cmd
Expand All @@ -48,6 +49,14 @@
class EB_SCOTCH(EasyBlock):
"""Support for building/installing SCOTCH."""

@staticmethod
def extra_options(extra_vars=None):
"""Define custom easyconfig parameters specific to Scotch."""
extra_vars = {
'threadedmpi': [None, "Use threaded MPI calls.", CUSTOM],
}
return EasyBlock.extra_options(extra_vars)

def configure_step(self):
"""Configure SCOTCH build: locate the template makefile, copy it to a general Makefile.inc and patch it."""

Expand Down Expand Up @@ -108,9 +117,12 @@ def build_step(self):
if self.toolchain.options['i8']:
cflags += " -DINTSIZE64"

if not self.toolchain.mpi_family() in [toolchain.INTELMPI, toolchain.QLOGICMPI]: #@UndefinedVariable
if self.cfg['threadedmpi']:
Copy link
Member

Choose a reason for hiding this comment

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

@ocaisa this implies that for builds on top of OpenMPI (for example), threadedmpi = True must be now specified to obtain the same installation, so this should be something like:

if self.cfg['threadedmpi'] or if self.toolchain.mpi_family() not in [toolchain.INTELMPI, toolchain.QLOGICMPI]

to ensure backward compatibility?

Copy link
Member Author

@ocaisa ocaisa May 10, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Ok, but I'm pretty sure this wasn't working for people, to my eyes it's mostly there for OpenFOAM and threaded scotch does not work with OpenFOAM.
I'll set the default to true for OpenMPI (that's backwards compatibility for everything in the easyconfig repo) but personally I think this is probably not doing what people actually expect.

Copy link
Member Author

Choose a reason for hiding this comment

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

How do I check a variable has been set in the easyconfig? I need to know if they have explicitly set the value to false in the easyconfig so I can ensure I only change the value to true when it's not defined there.

Copy link
Member

Choose a reason for hiding this comment

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

@ocaisa you could use None as default value, and assume people will set it to False in the easyconfig?

and then check self.cfg['threadedmpi'] is None

there's no easy way to distinguish between a default value and the same value but specified by the easyconfig

cflags += " -DSCOTCH_PTHREAD"

# TODO For backwards compatability of v2.8.0 the following is necessary but could be removed on a major version upgrade
if self.cfg['threadedmpi'] is None and not self.toolchain.mpi_family() in [toolchain.INTELMPI, toolchain.QLOGICMPI]:
Copy link
Member

Choose a reason for hiding this comment

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

please change to not in:

and self.toolchain.mpi_family() not in [toolchain.INTELMPI, toolchain.QLOGICMPI]:

cflags += " -DSCOTCH_PTHREAD"

# actually build
apps = ['scotch', 'ptscotch']
if LooseVersion(self.version) >= LooseVersion('6.0'):
Expand Down