Skip to content

Rename internal plotting functions #776

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

Merged
merged 6 commits into from
Aug 5, 2025
Merged

Rename internal plotting functions #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a532d1
Rename internal plotting functions
jan-janssen Aug 5, 2025
15f7e8c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 5, 2025
5dcddc3
rename draw function
jan-janssen Aug 5, 2025
d9ac73f
Merge remote-tracking branch 'origin/plot' into plot
jan-janssen Aug 5, 2025
0af5c2e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 5, 2025
adb59f2
remove duplicate variables
jan-janssen Aug 5, 2025
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
10 changes: 7 additions & 3 deletions executorlib/standalone/plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import cloudpickle


def generate_nodes_and_edges(
def generate_nodes_and_edges_for_plotting(
task_hash_dict: dict, future_hash_inverse_dict: dict
) -> tuple[list, list]:
"""
Expand Down Expand Up @@ -81,7 +81,9 @@ def add_element(arg, link_to, label=""):
return node_lst, edge_lst


def generate_task_hash(task_dict: dict, future_hash_inverse_dict: dict) -> bytes:
def generate_task_hash_for_plotting(
task_dict: dict, future_hash_inverse_dict: dict
) -> bytes:
"""
Generate a hash for a task dictionary.

Expand Down Expand Up @@ -132,7 +134,9 @@ def convert_arg(arg, future_hash_inverse_dict):
)


def draw(node_lst: list, edge_lst: list, filename: Optional[str] = None):
def plot_dependency_graph_function(
node_lst: list, edge_lst: list, filename: Optional[str] = None
):
"""
Draw the graph visualization of nodes and edges.

Expand Down
12 changes: 6 additions & 6 deletions executorlib/task_scheduler/interactive/dependency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
update_futures_in_input,
)
from executorlib.standalone.plot import (
draw,
generate_nodes_and_edges,
generate_task_hash,
generate_nodes_and_edges_for_plotting,
generate_task_hash_for_plotting,
plot_dependency_graph_function,
)
from executorlib.task_scheduler.base import TaskSchedulerBase

Expand Down Expand Up @@ -144,7 +144,7 @@ def submit( # type: ignore
"future": f,
"resource_dict": resource_dict,
}
task_hash = generate_task_hash(
task_hash = generate_task_hash_for_plotting(
task_dict=task_dict,
future_hash_inverse_dict={
v: k for k, v in self._future_hash_dict.items()
Expand Down Expand Up @@ -205,13 +205,13 @@ def __exit__(
"""
super().__exit__(exc_type=exc_type, exc_val=exc_val, exc_tb=exc_tb) # type: ignore
if self._generate_dependency_graph:
node_lst, edge_lst = generate_nodes_and_edges(
node_lst, edge_lst = generate_nodes_and_edges_for_plotting(
task_hash_dict=self._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in self._future_hash_dict.items()
},
)
return draw(
return plot_dependency_graph_function(
node_lst=node_lst,
edge_lst=edge_lst,
filename=self._plot_dependency_graph_filename,
Expand Down
10 changes: 5 additions & 5 deletions tests/test_fluxjobexecutor_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from time import sleep

from executorlib import FluxJobExecutor, FluxClusterExecutor
from executorlib.standalone.plot import generate_nodes_and_edges
from executorlib.standalone.plot import generate_nodes_and_edges_for_plotting
from executorlib.standalone.serialize import cloudpickle_register


Expand Down Expand Up @@ -55,7 +55,7 @@ def test_executor_dependency_plot(self):
self.assertTrue(future_2.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 2)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 2)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand Down Expand Up @@ -100,7 +100,7 @@ def test_many_to_one_plot(self):
self.assertTrue(future_sum.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 7)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 7)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand All @@ -126,7 +126,7 @@ def test_executor_dependency_plot(self):
self.assertTrue(future_2.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 2)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 2)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand Down Expand Up @@ -169,7 +169,7 @@ def test_many_to_one_plot(self):
self.assertTrue(future_sum.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 7)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 7)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand Down
16 changes: 8 additions & 8 deletions tests/test_singlenodeexecutor_plot_dependency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
SlurmJobExecutor,
SlurmClusterExecutor,
)
from executorlib.standalone.plot import generate_nodes_and_edges
from executorlib.standalone.plot import generate_nodes_and_edges_for_plotting
from executorlib.standalone.serialize import cloudpickle_register


Expand Down Expand Up @@ -61,7 +61,7 @@ def test_executor_dependency_plot(self):
self.assertTrue(future_2.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 2)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 2)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand Down Expand Up @@ -122,7 +122,7 @@ def test_many_to_one_plot(self):
self.assertTrue(future_sum.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 7)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 7)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand All @@ -139,7 +139,7 @@ def test_future_input_dict(self):
)
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 2)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 2)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand Down Expand Up @@ -167,7 +167,7 @@ def test_executor_dependency_plot(self):
self.assertTrue(future_2.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 2)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 2)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand Down Expand Up @@ -212,7 +212,7 @@ def test_many_to_one_plot(self):
self.assertTrue(future_sum.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 7)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 7)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand All @@ -238,7 +238,7 @@ def test_executor_dependency_plot(self):
self.assertTrue(future_2.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 2)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 2)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand Down Expand Up @@ -281,7 +281,7 @@ def test_many_to_one_plot(self):
self.assertTrue(future_sum.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 7)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 7)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand Down
4 changes: 2 additions & 2 deletions tests/test_testclusterexecutor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from executorlib import get_cache_data
from executorlib.api import TestClusterExecutor
from executorlib.standalone.plot import generate_nodes_and_edges
from executorlib.standalone.plot import generate_nodes_and_edges_for_plotting
from executorlib.standalone.serialize import cloudpickle_register

try:
Expand Down Expand Up @@ -83,7 +83,7 @@ def test_executor_dependency_plot(self):
self.assertTrue(future_2.done())
self.assertEqual(len(exe._task_scheduler._future_hash_dict), 2)
self.assertEqual(len(exe._task_scheduler._task_hash_dict), 2)
nodes, edges = generate_nodes_and_edges(
nodes, edges = generate_nodes_and_edges_for_plotting(
task_hash_dict=exe._task_scheduler._task_hash_dict,
future_hash_inverse_dict={
v: k for k, v in exe._task_scheduler._future_hash_dict.items()
Expand Down
Loading