From 2e419bb366584ca699f5ef0147cb6897f089a5df Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 1 Aug 2014 09:50:32 +0200 Subject: [PATCH] remove duplicate code in handling of FFTW cdft libs --- easybuild/toolchains/fft/intelfftw.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/easybuild/toolchains/fft/intelfftw.py b/easybuild/toolchains/fft/intelfftw.py index 03f2d2d43a..b13388382f 100644 --- a/easybuild/toolchains/fft/intelfftw.py +++ b/easybuild/toolchains/fft/intelfftw.py @@ -64,14 +64,11 @@ def _set_fftw_variables(self): fftw_libs = ["fftw3xc%s%s" % (compsuff, picsuff)] if self.options['usempi']: - # add cluster interface - if LooseVersion(imklver) >= LooseVersion("11.1"): + # add cluster interface for recent imkl versions + if LooseVersion(imklver) >= LooseVersion("11.0.2"): fftw_libs.append("fftw3x_cdft%s%s" % (bitsuff, picsuff)) - else: - if LooseVersion(imklver) >= LooseVersion("11.0.2"): - fftw_libs.append("fftw3x_cdft%s%s" % (bitsuff, picsuff)) - elif LooseVersion(imklver) >= LooseVersion("10.3"): - fftw_libs.append("fftw3x_cdft%s" % picsuff) + elif LooseVersion(imklver) >= LooseVersion("10.3"): + fftw_libs.append("fftw3x_cdft%s" % picsuff) fftw_libs.append("mkl_cdft_core") # add cluster dft fftw_libs.extend(self.variables['LIBBLACS'].flatten()) # add BLACS; use flatten because ListOfList