Subtoolchain searching

easybuild/framework/easyconfig/easyconfig.py

@@ -740,6 +740,33 @@ def get(self, key, default=None):
         else:
             return default
 
+    # *both* __eq__ and __ne__ must be implemented for == and != comparisons to work correctly
+    # see also https://docs.python.org/2/reference/datamodel.html#object.__eq__
+    def __eq__(self, ec):
+        """Is this EasyConfig instance equivalent to the provided one?"""
+        return self.asdict() == ec.asdict()
+
+    def __ne__(self, ec):
+        """Is this EasyConfig instance equivalent to the provided one?"""
+        return self.asdict() != ec.asdict()
+
+    def __hash__(self):
+        """Return hash value for a hashable representation of this EasyConfig instance."""
+        def make_hashable(val):
+            """Make a hashable value of the given value."""
+            if isinstance(val, list):
+                val = tuple([make_hashable(x) for x in val])
+            elif isinstance(val, dict):
+                val = tuple([(key, make_hashable(val)) for (key, val) in sorted(val.items())])
+            return val
+
+        lst = []
+        for (key, val) in sorted(self.asdict().items()):
+            lst.append((key, make_hashable(val)))
+
+        # a list is not hashable, but a tuple is
+        return hash(tuple(lst))
+
     def asdict(self):
         """
         Return dict representation of this EasyConfig instance.

easybuild/framework/easyconfig/format/format.py

@@ -53,7 +53,8 @@
 DEPENDENCY_PARAMETERS = ['builddependencies', 'dependencies', 'hiddendependencies']
 
 # values for these keys will not be templated in dump()
-EXCLUDED_KEYS_REPLACE_TEMPLATES = ['description', 'easyblock', 'homepage', 'name', 'toolchain', 'version']
+EXCLUDED_KEYS_REPLACE_TEMPLATES = ['description', 'easyblock', 'homepage', 'name', 'toolchain', 'version'] \
+                                  + DEPENDENCY_PARAMETERS
 
 # ordered groups of keys to obtain a nice looking easyconfig file
 GROUPED_PARAMS = [

easybuild/main.py

@@ -53,7 +53,7 @@
 from easybuild.framework.easyconfig.tools import alt_easyconfig_paths, dep_graph, det_easyconfig_paths
 from easybuild.framework.easyconfig.tools import get_paths_for, parse_easyconfigs, review_pr, skip_available
 from easybuild.framework.easyconfig.tweak import obtain_ec_for, tweak
-from easybuild.tools.config import get_repository, get_repositorypath
+from easybuild.tools.config import get_repository, get_repositorypath, build_option
 from easybuild.tools.filetools import adjust_permissions, cleanup, write_file
 from easybuild.tools.options import process_software_build_specs
 from easybuild.tools.robot import det_robot_path, dry_run, resolve_dependencies, search_easyconfigs
@@ -283,7 +283,7 @@ def main(args=None, logfile=None, do_build=None, testing=False):
 
     # dry_run: print all easyconfigs and dependencies, and whether they are already built
     if options.dry_run or options.dry_run_short:
-        txt = dry_run(easyconfigs, short=not options.dry_run, build_specs=build_specs)
+        txt = dry_run(easyconfigs, short=not options.dry_run)
         print_msg(txt, log=_log, silent=testing, prefix=False)
 
     # cleanup and exit after dry run, searching easyconfigs or submitting regression test
@@ -303,7 +303,8 @@ def main(args=None, logfile=None, do_build=None, testing=False):
     if len(easyconfigs) > 0:
         if options.robot:
             print_msg("resolving dependencies ...", log=_log, silent=testing)
-            ordered_ecs = resolve_dependencies(easyconfigs, build_specs=build_specs)
+            ordered_ecs = resolve_dependencies(easyconfigs, minimal_toolchains=build_option('minimal_toolchains'),
+                                               use_existing_modules=build_option('use_existing_modules'))
         else:
             ordered_ecs = easyconfigs
     else:

easybuild/toolchains/cgmpich.py

@@ -38,3 +38,4 @@
 class Cgmpich(ClangGcc, Mpich):
     """Compiler toolchain with Clang, GFortran and MPICH."""
     NAME = 'cgmpich'
+    SUBTOOLCHAIN = ClangGcc.NAME

easybuild/toolchains/cgmpolf.py

@@ -40,3 +40,5 @@
 class Cgmpolf(Cgmpich, OpenBLAS, ScaLAPACK, Fftw):
     """Compiler toolchain with Clang, GFortran, MPICH, OpenBLAS, ScaLAPACK and FFTW."""
     NAME = 'cgmpolf'
+    SUBTOOLCHAIN = Cgmpich.NAME
+

easybuild/toolchains/cgmvapich2.py

@@ -38,3 +38,4 @@
 class Cgmvapich2(ClangGcc, Mvapich2):
     """Compiler toolchain with Clang, GFortran and MVAPICH2."""
     NAME = 'cgmvapich2'
+    SUBTOOLCHAIN = ClangGcc.NAME

easybuild/toolchains/cgmvolf.py

@@ -40,3 +40,4 @@
 class Cgmvolf(Cgmvapich2, OpenBLAS, ScaLAPACK, Fftw):
     """Compiler toolchain with Clang, GFortran, MVAPICH2, OpenBLAS, ScaLAPACK and FFTW."""
     NAME = 'cgmvolf'
+    SUBTOOLCHAIN = Cgmvapich2.NAME

easybuild/toolchains/cgompi.py

@@ -38,3 +38,4 @@
 class Cgompi(ClangGcc, OpenMPI):
     """Compiler toolchain with Clang, GFortran and OpenMPI."""
     NAME = 'cgompi'
+    SUBTOOLCHAIN = ClangGcc.NAME

easybuild/toolchains/cgoolf.py

@@ -40,3 +40,4 @@
 class Cgoolf(Cgompi, OpenBLAS, ScaLAPACK, Fftw):
     """Compiler toolchain with Clang, GFortran, OpenMPI, OpenBLAS, ScaLAPACK and FFTW."""
     NAME = 'cgoolf'
+    SUBTOOLCHAIN = Cgompi.NAME

easybuild/toolchains/clanggcc.py

@@ -34,6 +34,7 @@
 import os
 from easybuild.toolchains.compiler.clang import Clang
 from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 TC_CONSTANT_CLANGGCC = "ClangGCC"
@@ -44,3 +45,4 @@ class ClangGcc(Clang, Gcc):
     NAME = 'ClangGCC'
     COMPILER_MODULE_NAME = ['Clang', 'GCC']
     COMPILER_FAMILY = TC_CONSTANT_CLANGGCC
+    SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME

easybuild/toolchains/craycce.py

@@ -32,11 +32,13 @@
 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):
     """Compiler toolchain for Cray Programming Environment for Cray Compiling Environment (CCE) (PrgEnv-cray)."""
     NAME = 'CrayCCE'
+    SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
 
     def prepare(self, *args, **kwargs):
         """Prepare to use this toolchain; marked as experimental."""

easybuild/toolchains/craygnu.py

@@ -32,11 +32,13 @@
 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):
     """Compiler toolchain for Cray Programming Environment for GCC compilers (PrgEnv-gnu)."""
     NAME = 'CrayGNU'
+    SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
 
     def prepare(self, *args, **kwargs):
         """Prepare to use this toolchain; marked as experimental."""

easybuild/toolchains/crayintel.py

@@ -32,11 +32,13 @@
 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):
     """Compiler toolchain for Cray Programming Environment for Intel compilers (PrgEnv-intel)."""
     NAME = 'CrayIntel'
+    SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
 
     def prepare(self, *args, **kwargs):
         """Prepare to use this toolchain; marked as experimental."""

easybuild/toolchains/foss.py

@@ -28,13 +28,13 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gompi import Gompi
 from easybuild.toolchains.fft.fftw import Fftw
 from easybuild.toolchains.linalg.openblas import OpenBLAS
 from easybuild.toolchains.linalg.scalapack import ScaLAPACK
-from easybuild.toolchains.mpi.openmpi import OpenMPI
 
-
-class Foss(Gcc, OpenMPI, OpenBLAS, ScaLAPACK, Fftw):
+class Foss(Gompi, OpenBLAS, ScaLAPACK, Fftw):
     """Compiler toolchain with GCC, OpenMPI, OpenBLAS, ScaLAPACK and FFTW."""
     NAME = 'foss'
+    SUBTOOLCHAIN = Gompi.NAME
+

easybuild/toolchains/gcc.py

@@ -29,8 +29,10 @@
 """
 
 from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 class GccToolchain(Gcc):
     """Simple toolchain with just the GCC compilers."""
     NAME = 'GCC'
+    SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME

easybuild/toolchains/gcccuda.py

@@ -28,12 +28,14 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
 from easybuild.toolchains.compiler.cuda import Cuda
+from easybuild.toolchains.gcc import GccToolchain
+from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
-class GccCUDA(Gcc, Cuda):
+class GccCUDA(GccToolchain, Cuda):
     """Compiler toolchain with GCC and CUDA."""
     NAME = 'gcccuda'
 
     COMPILER_MODULE_NAME = ['GCC', 'CUDA']
+    SUBTOOLCHAIN = GccToolchain.NAME

easybuild/toolchains/gimkl.py

@@ -30,12 +30,12 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gimpi import Gimpi
 from easybuild.toolchains.fft.intelfftw import IntelFFTW
-from easybuild.toolchains.mpi.intelmpi import IntelMPI
 from easybuild.toolchains.linalg.intelmkl import IntelMKL
 
 
-class Gimkl(Gcc, IntelMPI, IntelMKL, IntelFFTW):
+class Gimkl(Gimpi, IntelMKL, IntelFFTW):
     """Compiler toolchain with GCC, Intel MPI, Intel Math Kernel Library (MKL) and Intel FFTW wrappers."""
     NAME = 'gimkl'
+    SUBTOOLCHAIN = Gimpi.NAME

easybuild/toolchains/gimpi.py

@@ -29,10 +29,11 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gcc import GccToolchain
 from easybuild.toolchains.mpi.intelmpi import IntelMPI
 
 
-class Gimpi(Gcc, IntelMPI):
+class Gimpi(GccToolchain, IntelMPI):
     """Compiler toolchain with GCC and Intel MPI."""
     NAME = 'gimpi'
+    SUBTOOLCHAIN = GccToolchain.NAME

easybuild/toolchains/gmacml.py

@@ -28,13 +28,14 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gmvapich2 import Gmvapich2
 from easybuild.toolchains.fft.fftw import Fftw
 from easybuild.toolchains.linalg.acml import Acml
 from easybuild.toolchains.linalg.scalapack import ScaLAPACK
-from easybuild.toolchains.mpi.mvapich2 import Mvapich2
 
 
-class Gmacml(Gcc, Mvapich2, Acml, ScaLAPACK, Fftw):
+
+class Gmacml(Gmvapich2, Acml, ScaLAPACK, Fftw):
     """Compiler toolchain with GCC, MVAPICH2, ACML, ScaLAPACK and FFTW."""
     NAME = 'gmacml'
+    SUBTOOLCHAIN = Gmvapich2.NAME

easybuild/toolchains/gmpich.py

@@ -28,10 +28,11 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gcc import GccToolchain
 from easybuild.toolchains.mpi.mpich import Mpich
 
 
-class Gmpich(Gcc, Mpich):
+class Gmpich(GccToolchain, Mpich):
     """Compiler toolchain with GCC and MPICH."""
     NAME = 'gmpich'
+    SUBTOOLCHAIN = GccToolchain.NAME

easybuild/toolchains/gmpich2.py

@@ -28,10 +28,11 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gcc import GccToolchain
 from easybuild.toolchains.mpi.mpich2 import Mpich2
 
 
-class Gmpich2(Gcc, Mpich2):
+class Gmpich2(GccToolchain, Mpich2):
     """Compiler toolchain with GCC and MPICH2."""
     NAME = 'gmpich2'
+    SUBTOOLCHAIN = GccToolchain.NAME

easybuild/toolchains/gmpolf.py

@@ -32,13 +32,13 @@
 @author: Bart Verleye (University of Auckland)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gmpich import Gmpich
 from easybuild.toolchains.fft.fftw import Fftw
 from easybuild.toolchains.linalg.openblas import OpenBLAS
 from easybuild.toolchains.linalg.scalapack import ScaLAPACK
-from easybuild.toolchains.mpi.mpich import Mpich
 
 
-class Gmpolf(Gcc, Mpich, OpenBLAS, ScaLAPACK, Fftw):
+class Gmpolf(Gmpich, OpenBLAS, ScaLAPACK, Fftw):
     """Compiler toolchain with GCC, MPICH, OpenBLAS, ScaLAPACK and FFTW."""
     NAME = 'gmpolf'
+    SUBTOOLCHAIN = Gmpich.NAME

easybuild/toolchains/gmvapich2.py

@@ -28,10 +28,11 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gcc import GccToolchain
 from easybuild.toolchains.mpi.mvapich2 import Mvapich2
 
 
-class Gmvapich2(Gcc, Mvapich2):
+class Gmvapich2(GccToolchain, Mvapich2):
     """Compiler toolchain with GCC and MVAPICH2."""
     NAME = 'gmvapich2'
+    SUBTOOLCHAIN = GccToolchain.NAME

easybuild/toolchains/gmvolf.py

@@ -31,13 +31,13 @@
 @author: Dmitri Gribenko (National Technical University of Ukraine "KPI")
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gmvapich2 import Gmvapich2
 from easybuild.toolchains.fft.fftw import Fftw
 from easybuild.toolchains.linalg.openblas import OpenBLAS
 from easybuild.toolchains.linalg.scalapack import ScaLAPACK
-from easybuild.toolchains.mpi.mvapich2 import Mvapich2
 
 
-class Gmvolf(Gcc, Mvapich2, OpenBLAS, ScaLAPACK, Fftw):
+class Gmvolf(Gmvapich2, OpenBLAS, ScaLAPACK, Fftw):
     """Compiler toolchain with GCC, MVAPICH2, OpenBLAS, ScaLAPACK and FFTW."""
     NAME = 'gmvolf'
+    SUBTOOLCHAIN = Gmvapich2.NAME

easybuild/toolchains/gnu.py

@@ -29,8 +29,10 @@
 """
 
 from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 class GNU(Gcc):
     """Compiler-only toolchain, including only GCC and binutils."""
     NAME = 'GNU'
+    SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME

easybuild/toolchains/goalf.py

@@ -29,13 +29,13 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gompi import Gompi
 from easybuild.toolchains.fft.fftw import Fftw
 from easybuild.toolchains.linalg.atlas import Atlas
 from easybuild.toolchains.linalg.scalapack import ScaLAPACK
-from easybuild.toolchains.mpi.openmpi import OpenMPI
 
 
-class Goalf(Gcc, OpenMPI, Atlas, ScaLAPACK, Fftw):
+class Goalf(Gompi, Atlas, ScaLAPACK, Fftw):
     """Compiler toolchain with GCC, OpenMPI, ATLAS, ScaLAPACK and FFTW."""
     NAME = 'goalf'
+    SUBTOOLCHAIN = Gompi.NAME

easybuild/toolchains/gompi.py

@@ -28,10 +28,11 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gcc import GccToolchain
 from easybuild.toolchains.mpi.openmpi import OpenMPI
 
 
-class Gompi(Gcc, OpenMPI):
+class Gompi(GccToolchain, OpenMPI):
     """Compiler toolchain with GCC and OpenMPI."""
     NAME = 'gompi'
+    SUBTOOLCHAIN = GccToolchain.NAME

easybuild/toolchains/gompic.py

@@ -36,3 +36,4 @@
 class Gompic(GccCUDA, OpenMPI):
     """Compiler toolchain with GCC+CUDA and OpenMPI."""
     NAME = 'gompic'
+    SUBTOOLCHAIN = GccCUDA.NAME

easybuild/toolchains/goolf.py

@@ -28,13 +28,13 @@
 @author: Kenneth Hoste (Ghent University)
 """
 
-from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.gompi import Gompi
 from easybuild.toolchains.fft.fftw import Fftw
 from easybuild.toolchains.linalg.openblas import OpenBLAS
 from easybuild.toolchains.linalg.scalapack import ScaLAPACK
-from easybuild.toolchains.mpi.openmpi import OpenMPI
 
 
-class Goolf(Gcc, OpenMPI, OpenBLAS, ScaLAPACK, Fftw):
+class Goolf(Gompi, OpenBLAS, ScaLAPACK, Fftw):
     """Compiler toolchain with GCC, OpenMPI, OpenBLAS, ScaLAPACK and FFTW."""
     NAME = 'goolf'
+    SUBTOOLCHAIN = Gompi.NAME