Merge pull request #3541 from Micket/cuda_template

Add toolchain deps to template resolution

Author: lexming

easybuild/framework/easyconfig/templates.py

@@ -80,6 +80,7 @@
 TEMPLATE_SOFTWARE_VERSIONS = [
     # software name, prefix for *ver and *shortver
     ('CUDA', 'cuda'),
+    ('CUDAcore', 'cuda'),
     ('Java', 'java'),
     ('Perl', 'perl'),
     ('Python', 'py'),
@@ -238,9 +239,13 @@ def template_constant_dict(config, ignore=None, skip_lower=None, toolchain=None)
             # only consider build dependencies when we're actually in iterative mode!
             if 'builddependencies' in config.iterate_options:
                 if config.iterating:
-                    deps += config.get('builddependencies', [])
+                    deps.extend(config.get('builddependencies', []))
             else:
-                deps += config.get('builddependencies', [])
+                deps.extend(config.get('builddependencies', []))
+
+            # Include all toolchain deps (e.g. CUDAcore template in fosscuda)
+            if config.toolchain.tcdeps is not None:
+                deps.extend(config.toolchain.tcdeps)
 
         for dep in deps:
             if isinstance(dep, dict):

test/framework/robot.py

@@ -436,7 +436,7 @@ def test_resolve_dependencies_minimal(self):
             "   ('SQLite', '3.8.10.2'),",
             "]",
             # toolchain as list line, for easy modification later;
-            "toolchain = {'name': 'foss', 'version': '%(version_minor)s018a'}",
+            "toolchain = {'name': 'foss', 'version': '2018a'}",
         ]
         write_file(barec, '\n'.join(barec_lines))
         bar = process_easyconfig(barec)[0]