Merge pull request #1585 from pforai/cray_no_fftw_in_tc

Remove FFTW from the Cray Toolchain Definition
easybuilders · Feb 3, 2016 · 02f5b01 · 02f5b01
2 parents 6aff22f + f0df01c
commit 02f5b01
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 77 deletions.
diff --git a/easybuild/toolchains/craycce.py b/easybuild/toolchains/craycce.py
@@ -29,13 +29,12 @@
 @author: Kenneth Hoste (Ghent University)
 """
 from easybuild.toolchains.compiler.craype import CrayPECray
-from easybuild.toolchains.fft.crayfftw import CrayFFTW
 from easybuild.toolchains.linalg.libsci import LibSci
 from easybuild.toolchains.mpi.craympich import CrayMPICH
 from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
-class CrayCCE(CrayPECray, CrayMPICH, LibSci, CrayFFTW):
+class CrayCCE(CrayPECray, CrayMPICH, LibSci):
     """Compiler toolchain for Cray Programming Environment for Cray Compiling Environment (CCE) (PrgEnv-cray)."""
     NAME = 'CrayCCE'
     SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME

diff --git a/easybuild/toolchains/craygnu.py b/easybuild/toolchains/craygnu.py
@@ -29,13 +29,12 @@
 @author: Kenneth Hoste (Ghent University)
 """
 from easybuild.toolchains.compiler.craype import CrayPEGCC
-from easybuild.toolchains.fft.crayfftw import CrayFFTW
 from easybuild.toolchains.linalg.libsci import LibSci
 from easybuild.toolchains.mpi.craympich import CrayMPICH
 from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
-class CrayGNU(CrayPEGCC, CrayMPICH, LibSci, CrayFFTW):
+class CrayGNU(CrayPEGCC, CrayMPICH, LibSci):
     """Compiler toolchain for Cray Programming Environment for GCC compilers (PrgEnv-gnu)."""
     NAME = 'CrayGNU'
     SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME

diff --git a/easybuild/toolchains/crayintel.py b/easybuild/toolchains/crayintel.py
@@ -29,13 +29,12 @@
 @author: Kenneth Hoste (Ghent University)
 """
 from easybuild.toolchains.compiler.craype import CrayPEIntel
-from easybuild.toolchains.fft.crayfftw import CrayFFTW
 from easybuild.toolchains.linalg.libsci import LibSci
 from easybuild.toolchains.mpi.craympich import CrayMPICH
 from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
-class CrayIntel(CrayPEIntel, CrayMPICH, LibSci, CrayFFTW):
+class CrayIntel(CrayPEIntel, CrayMPICH, LibSci):
     """Compiler toolchain for Cray Programming Environment for Intel compilers (PrgEnv-intel)."""
     NAME = 'CrayIntel'
     SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME

diff --git a/easybuild/toolchains/fft/crayfftw.py b/easybuild/toolchains/fft/crayfftw.py