github/concrete
1
1
Fork 0
mirror of https://github.com/zama-ai/concrete.git synced 2026-02-09 12:15:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix unclosed file in draw_graph

Browse Source 
closes #280
This commit is contained in:
Benoit Chevallier-Mames
2021-09-16 09:39:17 +02:00
committed by Benoit Chevallier
parent a7d0b87408
commit e2804c5300
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
concrete/common/compilation/artifacts.py
View File

@@ -175,9 +175,9 @@ class CompilationArtifacts:
f.write(f"{name} :: {parameter}\n")
drawings = self.drawings_of_operation_graphs.items()
for index, (name, drawing) in enumerate(drawings):
for index, (name, drawing_filename) in enumerate(drawings):
identifier = CompilationArtifacts._identifier(index, name)
drawing.save(output_directory.joinpath(f"{identifier}.png"))
shutil.copy(drawing_filename, output_directory.joinpath(f"{identifier}.png"))
textual_representations = self.textual_representations_of_operation_graphs.items()
for index, (name, representation) in enumerate(textual_representations):

23
concrete/common/debugging/drawing.py
View File

@@ -43,19 +43,18 @@ def draw_graph(
show: bool = False,
vertical: bool = True,
save_to: Optional[Path] = None,
) -> Image.Image:
) -> str:
"""Draws operation graphs and optionally saves/shows the drawing.
Args:
opgraph (OPGraph): the graph to be drawn and optionally saved/shown
show (bool): if set to True, the drawing will be shown using matplotlib
vertical (bool): if set to True, the orientation will be vertical
save_to (Optional[Path]): if specified, the drawn graph will be saved to this path
save_to (Optional[Path]): if specified, the drawn graph will be saved to this path; else
it is saved in a temporary file
Returns:
Pillow Image of the drawn graph.
This is useful because you can use the drawing however you like.
(check https://pillow.readthedocs.io/en/stable/reference/Image.html for further information)
The path of the file where the drawn graph is saved
"""
@@ -90,19 +89,21 @@ def draw_graph(
agraph.layout("dot")
if save_to is None:
with tempfile.NamedTemporaryFile(suffix=".png") as tmp:
agraph.draw(tmp.name)
img = Image.open(tmp.name)
with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as tmp:
save_to_str = str(tmp.name)
else:
agraph.draw(save_to)
img = Image.open(save_to)
save_to_str = str(save_to)
agraph.draw(save_to_str)
if show: # pragma: no cover
# We can't have coverage in this branch as `plt.show()` blocks and waits for user action.
plt.close("all")
plt.figure()
img = Image.open(save_to_str)
plt.imshow(img)
img.close()
plt.axis("off")
plt.show()
return img
return save_to_str