removed MPI name form lib

easybuilders · Jul 31, 2014 · 3df723b · 3df723b
1 parent 30c1ef6
commit 3df723b
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/easybuild/toolchains/fft/intelfftw.py b/easybuild/toolchains/fft/intelfftw.py
@@ -56,15 +56,8 @@ def _set_fftw_variables(self):
         if self.options.get('i8', None):
             # ilp64/i8
             fftw_bitness = "_ilp64_intel"
-        # can't use toolchain.mpi_family, because of dummy toolchain
-        mpi_name_in_lib = ''
-        if get_software_root('MPICH2'):
-            mpi_name_in_lib = '_MPICH2'
-        if get_software_root('MVAPICH2'):
-            mpi_name_in_lib = '_MVAPICH2'
-        if get_software_root('OpenMPI'):
-            mpi_name_in_lib = '_OpenMPI'
-
+        if self.options['usempi']:
+
         fftw_libs = ["fftw3xc_intel%s" % fftwsuff]
         if self.options['usempi']:
             # add cluster interface
@@ -74,7 +67,7 @@ def _set_fftw_variables(self):
                 elif LooseVersion(imklver) >= LooseVersion("10.3"):
                     fftw_libs.append("fftw3x_cdft%s" % fftwsuff)
             else:
-                fftw_libs.append("fftw3x_cdft%s%s%s" % (fftw_bitness, fftwsuff, mpi_name_in_lib))
+                fftw_libs.append("fftw3x_cdft%s%s" % (fftw_bitness, fftwsuff))
             fftw_libs.append("mkl_cdft_core")  # add cluster dft
             fftw_libs.extend(self.variables['LIBBLACS'].flatten()) ## add BLACS; use flatten because ListOfList