Merge pull request #3 from boegel/imkl_fftw_mpi_fix

remove duplicate code in handling of FFTW cdft libs
easybuilders · Aug 1, 2014 · 155e75b · 155e75b
2 parents 051bdf2 + 2e419bb
commit 155e75b
Showing 1 changed file with 4 additions and 7 deletions.
diff --git 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