sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-02 11:22:41 +01:00
Code Issues Releases Wiki Activity

configuration: Add support for section groups

Browse Source 
Now allows for specifying a `group` value for each section which will
cross product the sections within that group with the sections in each
other group. Additionally classifiers will automatically be added to
each job spec with the relevant group information.
This commit is contained in:
Marc Bonnici
2018-09-21 16:49:50 +01:00
committed by setrofim
parent 6632223ac5
commit 891ef60f4d
4 changed files with 89 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wa/framework/configuration/core.py
View File

@@ -978,8 +978,8 @@ class JobGenerator(object):
if name == "augmentations":
self.update_augmentations(value)
def add_section(self, section, workloads):
new_node = self.root_node.add_section(section)
def add_section(self, section, workloads, group):
new_node = self.root_node.add_section(section, group)
with log.indentcontext():
for workload in workloads:
new_node.add_workload(workload)
@@ -1041,6 +1041,12 @@ def create_job_spec(workload_entry, sections, target_manager, plugin_cache,
# PHASE 2.1: Merge general job spec configuration
for section in sections:
job_spec.update_config(section, check_mandatory=False)
# Add classifiers for any present groups
if section.id == 'global' or section.group is None:
# Ignore global config and default group
continue
job_spec.classifiers[section.group] = section.id
job_spec.update_config(workload_entry, check_mandatory=False)
# PHASE 2.2: Merge global, section and workload entry "workload_parameters"

3
wa/framework/configuration/parsers.py
View File

@@ -196,9 +196,10 @@ class AgendaParser(object):
raise ConfigError(msg.format(json.dumps(section, indent=None)))
section['runtime_params'] = section.pop('params')
group = section.pop('group', None)
section = _construct_valid_entry(section, seen_sect_ids,
"s", state.jobs_config)
state.jobs_config.add_section(section, workloads)
state.jobs_config.add_section(section, workloads, group)
########################

14
wa/framework/configuration/tree.py
View File

@@ -69,14 +69,20 @@ class SectionNode(JobSpecSource):
def is_leaf(self):
return not bool(self.children)
def __init__(self, config, parent=None):
def __init__(self, config, parent=None, group=None):
super(SectionNode, self).__init__(config, parent=parent)
self.workload_entries = []
self.children = []
self.group = group
def add_section(self, section):
new_node = SectionNode(section, parent=self)
self.children.append(new_node)
def add_section(self, section, group=None):
# Each level is the same group, only need to check first
if not self.children or group == self.children[0].group:
new_node = SectionNode(section, parent=self, group=group)
self.children.append(new_node)
else:
for child in self.children:
new_node = child.add_section(section, group)
return new_node
def add_workload(self, workload_config):