Skip to content

Commit 1511f32

Browse files
AlexanderDokuchaevAlexanderDokuchaev
authored
Bump pydot (#3300)
### Changes set pydot<=3.0.4 from <3.0.0
1 parent 05c9053 commit 1511f32

38 files changed

+28722
-28722
lines changed

‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies = [
4444
"pandas>=1.1.5,<2.3",
4545
"psutil",
4646
"py-cpuinfo>=9.0.0",
47-
"pydot>=1.4.1, <3.0.0",
47+
"pydot>=1.4.1, <=3.0.4",
4848
"pymoo>=0.6.0.1",
4949
"rich>=13.5.2",
5050
"safetensors>=0.4.1",

‎tests/common/data/reference_graphs/dot_rw_reference.dot

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
strict digraph {
1+
strict digraph {
22
"Node^^A" [label=":baz"];
33
"Node^^B" [label="qux:"];
44
"Node^^C" [label="Node::C"];
55
D;
6-
E [label=no_label];
6+
E [label="no_label"];
77
F [label="has^label"];
8-
"Node^^A" -> "Node^^B" [label="foo:bar"];
8+
"Node^^A" -> "Node^^B" [label="foo:bar"];
99
}

‎tests/torch2/data/function_hook/graph_visualization/to_pydot_style_disable.dot

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
digraph {
1+
digraph {
22
rankdir=TB;
33
0 [label=x];
44
1 [label="conv.weight"];
@@ -8,11 +8,11 @@ rankdir=TB;
88
5 [label="conv/post_hook__conv-conv2d-0__0[0]/add/0"];
99
6 [label="/relu/0"];
1010
7 [label=output];
11-
0 -> 3 [label="0 → 0"];
12-
1 -> 3 [label="0 → 1"];
13-
2 -> 3 [label="0 → 2"];
14-
3 -> 5 [label="0 → 0"];
15-
4 -> 5 [label="0 → 1"];
16-
5 -> 6 [label="0 → 0"];
17-
6 -> 7 [label="0 → 0"];
11+
0 -> 3 [label="0 → 0"];
12+
1 -> 3 [label="0 → 1"];
13+
2 -> 3 [label="0 → 2"];
14+
3 -> 5 [label="0 → 0"];
15+
4 -> 5 [label="0 → 1"];
16+
5 -> 6 [label="0 → 0"];
17+
6 -> 7 [label="0 → 0"];
1818
}

‎tests/torch2/data/function_hook/graph_visualization/to_pydot_style_full.dot

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
digraph {
1+
digraph {
22
rankdir=TB;
3-
0 [fillcolor="#adadad", fontcolor="#000000", label="{type: input|name: x|dtype: torch.float32|shape: (1, 1, 3, 3)}", shape=record, style="filled,rounded"];
4-
1 [fillcolor="#ffffff", fontcolor="#000000", label="{type: const|name: conv.weight|dtype: torch.float32|shape: (1, 1, 1, 1)}", shape=record, style="filled,rounded"];
5-
2 [fillcolor="#ffffff", fontcolor="#000000", label="{type: const|name: conv.bias|dtype: torch.float32|shape: (1,)}", shape=record, style="filled,rounded"];
6-
3 [fillcolor="#ffd6a5", fontcolor="#000000", label="{type: function_call|op_name: conv/conv2d/0|fn_name: conv2d|args: [\nTensorMeta(dtype=torch.float32, shape=(1, 1, 3, 3)),\nTensorMeta(dtype=torch.float32, shape=(1, 1, 1, 1)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\n(1, 1),\n(0, 0),\n(1, 1),\n1,\n]|kwargs: \{\}}", shape=record, style="filled,rounded"];
7-
4 [fillcolor="#ffffff", fontcolor="#000000", label="{type: const|name: __nncf_hooks.post_hooks.conv/conv2d/0__0.0.w|dtype: torch.float32|shape: (1,)}", shape=record, style="filled,rounded"];
8-
5 [fillcolor="#caffbf", fontcolor="#000000", label="{type: function_call|op_name: conv/post_hook__conv-conv2d-0__0[0]/add/0|fn_name: add|args: [\nTensorMeta(dtype=torch.float32, shape=(1, 1, 3, 3)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\n]|kwargs: \{\}}", shape=record, style="filled,rounded"];
9-
6 [fillcolor="#a0c4ff", fontcolor="#000000", label="{type: function_call|op_name: /relu/0|fn_name: relu|args: [\nTensorMeta(dtype=torch.float32, shape=(1, 1, 3, 3)),\n]|kwargs: \{\}}", shape=record, style="filled,rounded"];
10-
7 [fillcolor="#adadad", fontcolor="#000000", label="{type: output|name: output|dtype: torch.float32|shape: (1, 1, 3, 3)}", shape=record, style="filled,rounded"];
11-
0 -> 3 [label="(1, 1, 3, 3)\n0 → 0"];
12-
1 -> 3 [label="(1, 1, 1, 1)\n0 → 1"];
13-
2 -> 3 [label="(1,)\n0 → 2"];
14-
3 -> 5 [label="(1, 1, 3, 3)\n0 → 0"];
15-
4 -> 5 [label="(1,)\n0 → 1"];
16-
5 -> 6 [label="(1, 1, 3, 3)\n0 → 0"];
17-
6 -> 7 [label="(1, 1, 3, 3)\n0 → 0"];
3+
0 [label="{type: input|name: x|dtype: torch.float32|shape: (1, 1, 3, 3)}", fillcolor="#adadad", fontcolor="#000000", shape=record, style="filled,rounded"];
4+
1 [label="{type: const|name: conv.weight|dtype: torch.float32|shape: (1, 1, 1, 1)}", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
5+
2 [label="{type: const|name: conv.bias|dtype: torch.float32|shape: (1,)}", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
6+
3 [label="{type: function_call|op_name: conv/conv2d/0|fn_name: conv2d|args: [\nTensorMeta(dtype=torch.float32, shape=(1, 1, 3, 3)),\nTensorMeta(dtype=torch.float32, shape=(1, 1, 1, 1)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\n(1, 1),\n(0, 0),\n(1, 1),\n1,\n]|kwargs: \{\}}", fillcolor="#ffd6a5", fontcolor="#000000", shape=record, style="filled,rounded"];
7+
4 [label="{type: const|name: __nncf_hooks.post_hooks.conv/conv2d/0__0.0.w|dtype: torch.float32|shape: (1,)}", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
8+
5 [label="{type: function_call|op_name: conv/post_hook__conv-conv2d-0__0[0]/add/0|fn_name: add|args: [\nTensorMeta(dtype=torch.float32, shape=(1, 1, 3, 3)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\n]|kwargs: \{\}}", fillcolor="#caffbf", fontcolor="#000000", shape=record, style="filled,rounded"];
9+
6 [label="{type: function_call|op_name: /relu/0|fn_name: relu|args: [\nTensorMeta(dtype=torch.float32, shape=(1, 1, 3, 3)),\n]|kwargs: \{\}}", fillcolor="#a0c4ff", fontcolor="#000000", shape=record, style="filled,rounded"];
10+
7 [label="{type: output|name: output|dtype: torch.float32|shape: (1, 1, 3, 3)}", fillcolor="#adadad", fontcolor="#000000", shape=record, style="filled,rounded"];
11+
0 -> 3 [label="(1, 1, 3, 3)\n0 → 0"];
12+
1 -> 3 [label="(1, 1, 1, 1)\n0 → 1"];
13+
2 -> 3 [label="(1,)\n0 → 2"];
14+
3 -> 5 [label="(1, 1, 3, 3)\n0 → 0"];
15+
4 -> 5 [label="(1,)\n0 → 1"];
16+
5 -> 6 [label="(1, 1, 3, 3)\n0 → 0"];
17+
6 -> 7 [label="(1, 1, 3, 3)\n0 → 0"];
1818
}

‎tests/torch2/data/function_hook/graph_visualization/to_pydot_style_short.dot

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
digraph {
1+
digraph {
22
rankdir=TB;
3-
0 [fillcolor="#adadad", fontcolor="#000000", label=x, shape=record, style="filled,rounded"];
4-
1 [fillcolor="#ffffff", fontcolor="#000000", label="conv.weight", shape=record, style="filled,rounded"];
5-
2 [fillcolor="#ffffff", fontcolor="#000000", label="conv.bias", shape=record, style="filled,rounded"];
6-
3 [fillcolor="#ffd6a5", fontcolor="#000000", label="conv/conv2d/0", shape=record, style="filled,rounded"];
7-
4 [fillcolor="#ffffff", fontcolor="#000000", label="__nncf_hooks.post_hooks.conv/conv2d/0__0.0.w", shape=record, style="filled,rounded"];
8-
5 [fillcolor="#caffbf", fontcolor="#000000", label="conv/post_hook__conv-conv2d-0__0[0]/add/0", shape=record, style="filled,rounded"];
9-
6 [fillcolor="#a0c4ff", fontcolor="#000000", label="/relu/0", shape=record, style="filled,rounded"];
10-
7 [fillcolor="#adadad", fontcolor="#000000", label=output, shape=record, style="filled,rounded"];
11-
0 -> 3 [label="(1, 1, 3, 3)\n0 → 0"];
12-
1 -> 3 [label="(1, 1, 1, 1)\n0 → 1"];
13-
2 -> 3 [label="(1,)\n0 → 2"];
14-
3 -> 5 [label="(1, 1, 3, 3)\n0 → 0"];
15-
4 -> 5 [label="(1,)\n0 → 1"];
16-
5 -> 6 [label="(1, 1, 3, 3)\n0 → 0"];
17-
6 -> 7 [label="(1, 1, 3, 3)\n0 → 0"];
3+
0 [label=x, fillcolor="#adadad", fontcolor="#000000", shape=record, style="filled,rounded"];
4+
1 [label="conv.weight", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
5+
2 [label="conv.bias", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
6+
3 [label="conv/conv2d/0", fillcolor="#ffd6a5", fontcolor="#000000", shape=record, style="filled,rounded"];
7+
4 [label="__nncf_hooks.post_hooks.conv/conv2d/0__0.0.w", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
8+
5 [label="conv/post_hook__conv-conv2d-0__0[0]/add/0", fillcolor="#caffbf", fontcolor="#000000", shape=record, style="filled,rounded"];
9+
6 [label="/relu/0", fillcolor="#a0c4ff", fontcolor="#000000", shape=record, style="filled,rounded"];
10+
7 [label=output, fillcolor="#adadad", fontcolor="#000000", shape=record, style="filled,rounded"];
11+
0 -> 3 [label="(1, 1, 3, 3)\n0 → 0"];
12+
1 -> 3 [label="(1, 1, 1, 1)\n0 → 1"];
13+
2 -> 3 [label="(1,)\n0 → 2"];
14+
3 -> 5 [label="(1, 1, 3, 3)\n0 → 0"];
15+
4 -> 5 [label="(1,)\n0 → 1"];
16+
5 -> 6 [label="(1, 1, 3, 3)\n0 → 0"];
17+
6 -> 7 [label="(1, 1, 3, 3)\n0 → 0"];
1818
}

‎tests/torch2/data/function_hook/handle_inner_functions/inner_functions_BatchNormModel.dot

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
digraph {
1+
digraph {
22
rankdir=TB;
3-
0 [fillcolor="#adadad", fontcolor="#000000", label="{type: input|name: x|dtype: torch.float32|shape: (1, 1, 1)}", shape=record, style="filled,rounded"];
4-
1 [fillcolor="#ffffff", fontcolor="#000000", label="{type: const|name: bn.weight|dtype: torch.float32|shape: (1,)}", shape=record, style="filled,rounded"];
5-
2 [fillcolor="#ffffff", fontcolor="#000000", label="{type: const|name: bn.bias|dtype: torch.float32|shape: (1,)}", shape=record, style="filled,rounded"];
6-
3 [fillcolor="#ffffff", fontcolor="#000000", label="{type: const|name: bn.running_mean|dtype: torch.float32|shape: (1,)}", shape=record, style="filled,rounded"];
7-
4 [fillcolor="#ffffff", fontcolor="#000000", label="{type: const|name: bn.running_var|dtype: torch.float32|shape: (1,)}", shape=record, style="filled,rounded"];
8-
5 [fillcolor="#ffadad", fontcolor="#000000", label="{type: function_call|op_name: bn/batch_norm/0|fn_name: batch_norm|args: [\nTensorMeta(dtype=torch.float32, shape=(1, 1, 1)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\nFalse,\n0.1,\n1e-05,\nTrue,\n]|kwargs: \{\}}", shape=record, style="filled,rounded"];
9-
6 [fillcolor="#adadad", fontcolor="#000000", label="{type: output|name: output|dtype: torch.float32|shape: (1, 1, 1)}", shape=record, style="filled,rounded"];
10-
0 -> 5 [label="(1, 1, 1)\n0 → 0"];
11-
1 -> 5 [label="(1,)\n0 → 1"];
12-
2 -> 5 [label="(1,)\n0 → 2"];
13-
3 -> 5 [label="(1,)\n0 → 3"];
14-
4 -> 5 [label="(1,)\n0 → 4"];
15-
5 -> 6 [label="(1, 1, 1)\n0 → 0"];
3+
0 [label="{type: input|name: x|dtype: torch.float32|shape: (1, 1, 1)}", fillcolor="#adadad", fontcolor="#000000", shape=record, style="filled,rounded"];
4+
1 [label="{type: const|name: bn.weight|dtype: torch.float32|shape: (1,)}", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
5+
2 [label="{type: const|name: bn.bias|dtype: torch.float32|shape: (1,)}", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
6+
3 [label="{type: const|name: bn.running_mean|dtype: torch.float32|shape: (1,)}", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
7+
4 [label="{type: const|name: bn.running_var|dtype: torch.float32|shape: (1,)}", fillcolor="#ffffff", fontcolor="#000000", shape=record, style="filled,rounded"];
8+
5 [label="{type: function_call|op_name: bn/batch_norm/0|fn_name: batch_norm|args: [\nTensorMeta(dtype=torch.float32, shape=(1, 1, 1)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\nTensorMeta(dtype=torch.float32, shape=(1,)),\nFalse,\n0.1,\n1e-05,\nTrue,\n]|kwargs: \{\}}", fillcolor="#ffadad", fontcolor="#000000", shape=record, style="filled,rounded"];
9+
6 [label="{type: output|name: output|dtype: torch.float32|shape: (1, 1, 1)}", fillcolor="#adadad", fontcolor="#000000", shape=record, style="filled,rounded"];
10+
0 -> 5 [label="(1, 1, 1)\n0 → 0"];
11+
1 -> 5 [label="(1,)\n0 → 1"];
12+
2 -> 5 [label="(1,)\n0 → 2"];
13+
3 -> 5 [label="(1,)\n0 → 3"];
14+
4 -> 5 [label="(1,)\n0 → 4"];
15+
5 -> 6 [label="(1, 1, 1)\n0 → 0"];
1616
}

0 commit comments

Comments
 (0)