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

Add exceptions for FFTW/3.3.6 on POWER with GCC 5/6/7 #1274

Merged
merged 3 commits into from Oct 21, 2017
Merged

Add exceptions for FFTW/3.3.6 on POWER with GCC 5/6/7 #1274

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4686276
Add exceptions to fftw for FFTW/3.3.6 on POWER with GCC 5/6/7
Oct 19, 2017
7169738
Update fftw.py
Oct 19, 2017
837941d
Make sure common_config_opts is separated by a space from the others
Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 18 additions & 1 deletion easybuild/easyblocks/f/fftw.py
View file
Open in desktop
Expand Up @@ -27,10 +27,12 @@

@author: Kenneth Hoste (HPC-UGent)
"""
from distutils.version import LooseVersion
from vsc.utils.missing import nub

from easybuild.easyblocks.generic.configuremake import ConfigureMake
from easybuild.framework.easyconfig import CUSTOM
from easybuild.toolchains.compiler.gcc import TC_CONSTANT_GCC
from easybuild.tools.config import build_option
from easybuild.tools.systemtools import AARCH32, AARCH64, POWER, X86_64
from easybuild.tools.systemtools import get_cpu_architecture, get_cpu_features, get_shared_lib_ext
Expand Down Expand Up @@ -181,8 +183,23 @@ def run_all_steps(self, *args, **kwargs):
if (prec == 'single' and (self.asimd or self.neon)) or (prec == 'double' and self.asimd):
prec_configopts.append('--enable-neon')

# For POWER with GCC 5/6/7 and FFTW/3.3.6 we need to disable some settings for tests to pass
# (we do it last so as not to affect previous logic)
cpu_arch = get_cpu_architecture()
comp_fam = self.toolchain.comp_family()
fftw_ver = LooseVersion(self.version)
if cpu_arch == POWER and comp_fam == TC_CONSTANT_GCC and fftw_ver <= LooseVersion('3.3.6'):
# See https://github.com/FFTW/fftw3/issues/59 which applies to GCC 5/6/7
if prec == 'single':
self.log.info("Disabling altivec for single precision on POWER with GCC for FFTW/%s"
% self.version)
prec_configopts.append('--disable-altivec')
if prec == 'double':
self.log.info("Disabling vsx for double precision on POWER with GCC for FFTW/%s" % self.version)
prec_configopts.append('--disable-vsx')

# append additional configure options (may be empty string, but that's OK)
self.cfg.update('configopts', [' '.join(prec_configopts) + common_config_opts])
self.cfg.update('configopts', [' '.join(prec_configopts) + ' ' + common_config_opts])
Copy link
Member

Choose a reason for hiding this comment

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

Since this is a bug fix, maybe this should be done in a separate PR? Trivial to merge...

Copy link
Member Author

Choose a reason for hiding this comment

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

Done in #1277

Copy link
Member

Choose a reason for hiding this comment

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

merged #1277, thanks


self.log.debug("List of configure options to iterate over: %s", self.cfg['configopts'])

Expand Down