Merge pull request #4 from boegel/subtoolchain_searching

remove unused build_specs

Author: ocaisa

easybuild/main.py

@@ -261,7 +261,7 @@ def main(testing_data=(None, None, None)):
 
     # 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
@@ -281,8 +281,8 @@ def main(testing_data=(None, None, None)):
     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 = minimally_resolve_dependencies(easyconfigs, build_specs=build_specs)
+            #ordered_ecs = resolve_dependencies(easyconfigs)
+            ordered_ecs = minimally_resolve_dependencies(easyconfigs)
         else:
             ordered_ecs = easyconfigs
     else:

easybuild/tools/robot.py

@@ -65,20 +65,19 @@ def det_robot_path(robot_paths_option, tweaked_ecs_path, pr_path, auto_robot=Fal
     return robot_path
 
 
-def dry_run(easyconfigs, short=False, build_specs=None):
+def dry_run(easyconfigs, short=False):
     """
     Compose dry run overview for supplied easyconfigs ([ ] for unavailable, [x] for available, [F] for forced)
     @param easyconfigs: list of parsed easyconfigs (EasyConfig instances)
     @param short: use short format for overview: use a variable for common prefixes
-    @param build_specs: dictionary specifying build specifications (e.g. version, toolchain, ...)
     """
     lines = []
     if build_option('robot_path') is None:
         lines.append("Dry run: printing build status of easyconfigs")
         all_specs = easyconfigs
     else:
         lines.append("Dry run: printing build status of easyconfigs and dependencies")
-        all_specs = resolve_dependencies(easyconfigs, build_specs=build_specs, retain_all_deps=True)
+        all_specs = minimally_resolve_dependencies(easyconfigs, retain_all_deps=True)
 
     unbuilt_specs = skip_available(all_specs)
     dry_run_fmt = " * [%1s] %s (module: %s)"  # markdown compatible (list of items with checkboxes in front)
@@ -142,24 +141,21 @@ def replace_toolchain_with_hierarchy(item_specs, parent, retain_all_deps, use_an
 
         # Look for a matching easyconfig starting from the bottom
 
-def minimally_resolve_dependencies(unprocessed, build_specs=None, retain_all_deps=False, use_any_existing_modules=False):
+def minimally_resolve_dependencies(unprocessed, retain_all_deps=False, use_any_existing_modules=False):
     """
     Work through the list of easyconfigs to determine an optimal order with minimal dependency resolution
     @param unprocessed: list of easyconfigs
-    @param build_specs: dictionary specifying build specifications (e.g. version, toolchain, ...)
     @param retain_all_deps: boolean indicating whether all dependencies must be retained, regardless of availability
     """
     if build_option('robot_path') is None:
         _log.info("No robot path : not (minimally) resolving dependencies")
-        return resolve_dependencies(unprocessed,build_specs, retain_all_deps)
+        return resolve_dependencies(unprocessed, retain_all_deps=retain_all_deps)
     else:
         # Look over all elements of the list individually
         for ec in unprocessed:
-            item_specs = resolve_dependencies([ec], build_specs=build_specs, retain_all_deps=True)
-            # Tweak the easyconfigs according to the build_specs
-            # HOW DO I DO THIS CORRECTLY...motoring on assuming I successfully did this!
+            item_specs = resolve_dependencies([ec], retain_all_deps=True)
 
-            # Now we have a complete list of the dependencies (updated with build_specs if necessary), let's do a
+            # Now we have a complete list of the dependencies, let's do a
             # search/replace for the toolchain, removing existing elements from the list according to retain_all_deps
             item_specs = replace_toolchain_with_hierarchy(
                 item_specs, parent=ec['name'],
@@ -173,13 +169,12 @@ def minimally_resolve_dependencies(unprocessed, build_specs=None, retain_all_dep
                 if not next((x for x in item_specs[check:] if x['name'] == check['name']), False):
                     _log.error("Conflicting dependency versions for %s easyconfig: %s" % ec['name'] % check['name'])
         # Finally, we pass our minimal list back through resolve_dependencies again to clean up the ordering
-        return resolve_dependencies(minimal_list,build_specs=None, retain_all_deps=False)
+        return resolve_dependencies(minimal_list, retain_all_deps=False)
 
-def resolve_dependencies(unprocessed, build_specs=None, retain_all_deps=False):
+def resolve_dependencies(unprocessed, retain_all_deps=False):
     """
     Work through the list of easyconfigs to determine an optimal order
     @param unprocessed: list of easyconfigs
-    @param build_specs: dictionary specifying build specifications (e.g. version, toolchain, ...)
     @param retain_all_deps: boolean indicating whether all dependencies must be retained, regardless of availability;
                             retain all deps when True, check matching build option when False
     """

easybuild/tools/testing.py

@@ -117,7 +117,7 @@ def regtest(easyconfig_paths, build_specs=None):
     if build_option('sequential'):
         return build_easyconfigs(easyconfigs, output_dir, test_results)
     else:
-        resolved = resolve_dependencies(easyconfigs, build_specs=build_specs)
+        resolved = resolve_dependencies(easyconfigs)
 
         cmd = "eb %(spec)s --regtest --sequential -ld --testoutput=%(output_dir)s"
         command = "unset TMPDIR && cd %s && %s; " % (cur_dir, cmd)