Skip to content

perf(generator): look up kind dependency tasks by kind #1054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marco-c wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −11
Open

perf(generator): look up kind dependency tasks by kind #1054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions src/taskgraph/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,21 @@ def _load_kinds(self, graph_config, target_kinds=None):
except KindNotFound:
continue

@staticmethod
def _get_kind_dependencies_tasks(kind, tasks_by_kind):
"""Return the tasks of the kinds `kind` depends on, in the order in
which they were loaded."""
kind_dependencies = kind.config.get("kind-dependencies", [])
return {
label: task
for kind_name, tasks in tasks_by_kind.items()
if kind_name in kind_dependencies
for label, task in tasks.items()
}

def _load_tasks_serial(self, kinds, kind_graph, parameters):
all_tasks = {}
tasks_by_kind = {}
for kind_name in kind_graph.visit_postorder():
logger.debug(f"Loading tasks for kind {kind_name}")

Expand All @@ -297,11 +310,7 @@ def _load_tasks_serial(self, kinds, kind_graph, parameters):
try:
new_tasks = kind.load_tasks(
parameters,
{
k: t
for k, t in all_tasks.items()
if t.kind in kind.config.get("kind-dependencies", [])
},
self._get_kind_dependencies_tasks(kind, tasks_by_kind),
self._write_artifacts,
)
except SchemaValidationError as exc:
Expand All @@ -310,15 +319,18 @@ def _load_tasks_serial(self, kinds, kind_graph, parameters):
except Exception:
logger.exception(f"Error loading tasks for kind {kind_name}:")
raise
kind_tasks = tasks_by_kind.setdefault(kind_name, {})
for task in new_tasks:
if task.label in all_tasks:
raise Exception("duplicate tasks with label " + task.label)
all_tasks[task.label] = task
kind_tasks[task.label] = task

return all_tasks

def _load_tasks_parallel(self, kinds, kind_graph, parameters, executor):
all_tasks = {}
tasks_by_kind = {}
futures_to_kind = {}
futures = set()
edges = set(kind_graph.edges)
Expand All @@ -328,7 +340,6 @@ def _load_tasks_parallel(self, kinds, kind_graph, parameters, executor):
def submit_ready_kinds():
"""Create the next batch of tasks for kinds without dependencies."""
nonlocal kinds, edges, futures
loaded_tasks = all_tasks.copy()
kinds_with_deps = {edge[0] for edge in edges}
ready_kinds = (
set(kinds) - kinds_with_deps - set(futures_to_kind.values())
Expand All @@ -346,11 +357,7 @@ def submit_ready_kinds():
future = executor.submit(
kind.load_tasks,
dict(parameters),
{
k: t
for k, t in loaded_tasks.items()
if t.kind in kind.config.get("kind-dependencies", [])
},
self._get_kind_dependencies_tasks(kind, tasks_by_kind),
self._write_artifacts,
)
futures.add(future)
Expand All @@ -376,10 +383,12 @@ def submit_ready_kinds():
kind = futures_to_kind.pop(future)
futures.remove(future)

kind_tasks = tasks_by_kind.setdefault(kind, {})
for task in future.result():
if task.label in all_tasks:
raise Exception("duplicate tasks with label " + task.label)
all_tasks[task.label] = task
kind_tasks[task.label] = task

# Update state for next batch of futures.
del kinds[kind]
Expand Down
Loading