Skip to content

Commit a7f9160

Browse files
committed
Use the method
1 parent f48c20c commit a7f9160

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

src/onnx_ir/external_data_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,13 @@ def _simple_model(self) -> ir.Model:
173173
node_1 = ir.Node(
174174
"",
175175
"Op_1",
176-
inputs=[node_0.outputs[0]],
176+
inputs=[node_0.o()],
177177
num_outputs=1,
178178
name="node_1",
179179
)
180180
graph = ir.Graph(
181181
inputs=node_0.inputs, # type: ignore
182-
outputs=[node_1.outputs[0]],
182+
outputs=[node_1.o()],
183183
initializers=[
184184
ir.Value(name="tensor1", const_value=tensor1),
185185
ir.Value(name="tensor2", const_value=tensor2),

src/onnx_ir/passes/common/clear_metadata_and_docstring_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_pass_with_clear_metadata_and_docstring(self):
3030
)
3131
mul_node = ir.node(
3232
"Mul",
33-
inputs=[add_node.outputs[0], inputs[1]],
33+
inputs=[add_node.o(), inputs[1]],
3434
num_outputs=1,
3535
metadata_props={"mul_key": "mul_value"},
3636
doc_string="This is a Mul node",
@@ -69,7 +69,7 @@ def test_pass_with_clear_metadata_and_docstring(self):
6969
)
7070
sub_node = ir.node(
7171
"Sub",
72-
inputs=[function.outputs[0], const_node.outputs[0]],
72+
inputs=[function.o(), const_node.o()],
7373
num_outputs=1,
7474
metadata_props={"sub_key": "sub_value"},
7575
doc_string="This is a Sub node",

src/onnx_ir/passes/common/constant_manipulation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def call(self, model: ir.Model) -> ir.passes.PassResult:
4141
assert node.graph is not None
4242
if node.op_type != "Constant" or node.domain not in ("", "onnx.ai"):
4343
continue
44-
if node.outputs[0].is_graph_output():
44+
if node.o().is_graph_output():
4545
logger.debug(
4646
"Constant node '%s' is used as output, so it can't be lifted.", node.name
4747
)
@@ -54,7 +54,7 @@ def call(self, model: ir.Model) -> ir.passes.PassResult:
5454
continue
5555

5656
attr_name, attr_value = next(iter(node.attributes.items()))
57-
initializer_name = node.outputs[0].name
57+
initializer_name = node.o().name
5858
assert initializer_name is not None
5959
assert isinstance(attr_value, ir.Attr)
6060
tensor = self._constant_node_attribute_to_tensor(
@@ -73,7 +73,7 @@ def call(self, model: ir.Model) -> ir.passes.PassResult:
7373
assert node.graph is not None
7474
node.graph.register_initializer(initializer)
7575
# Replace the constant node with the initializer
76-
ir.convenience.replace_all_uses_with(node.outputs[0], initializer)
76+
ir.convenience.replace_all_uses_with(node.o(), initializer)
7777
node.graph.remove(node, safe=True)
7878
count += 1
7979
logger.debug(

src/onnx_ir/passes/common/constant_manipulation_test.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def test_pass_with_lifting_float_and_int_constants_to_initializers(
3636
const_node = ir.node(
3737
"Constant", inputs=[], attributes={"value": constant_tensor}, num_outputs=1
3838
)
39-
add_node = ir.node("Add", inputs=[inputs[0], const_node.outputs[0]])
40-
mul_node = ir.node("Mul", inputs=[add_node.outputs[0], inputs[1]])
39+
add_node = ir.node("Add", inputs=[inputs[0], const_node.o()])
40+
mul_node = ir.node("Mul", inputs=[add_node.o(), inputs[1]])
4141

4242
model = ir.Model(
4343
graph=ir.Graph(
@@ -92,21 +92,21 @@ def test_pass_with_lifting_constants_to_initializers_within_subgraph(
9292
)
9393
# then branch adds the constant to the input
9494
# else branch multiplies the input by the constant
95-
add_node = ir.node("Add", inputs=[input_value, then_const_node.outputs[0]])
95+
add_node = ir.node("Add", inputs=[input_value, then_const_node.o()])
9696
then_graph = ir.Graph(
9797
inputs=[],
98-
outputs=[add_node.outputs[0]],
98+
outputs=[add_node.o()],
9999
nodes=[then_const_node, add_node],
100100
opset_imports={"": 20},
101101
)
102102
else_constant_tensor = ir.tensor(np.random.rand(2, 3).astype(np.float32))
103103
else_const_node = ir.node(
104104
"Constant", inputs=[], attributes={"value": else_constant_tensor}, num_outputs=1
105105
)
106-
mul_node = ir.node("Mul", inputs=[input_value, else_const_node.outputs[0]])
106+
mul_node = ir.node("Mul", inputs=[input_value, else_const_node.o()])
107107
else_graph = ir.Graph(
108108
inputs=[],
109-
outputs=[mul_node.outputs[0]],
109+
outputs=[mul_node.o()],
110110
nodes=[else_const_node, mul_node],
111111
opset_imports={"": 20},
112112
)
@@ -179,14 +179,14 @@ def test_pass_with_lifting_constants_to_initializers_with_floats_ints_strings(
179179
num_outputs=1,
180180
)
181181
identity_node_constant = ir.node(
182-
"Identity", inputs=[const_node.outputs[0]], num_outputs=1
182+
"Identity", inputs=[const_node.o()], num_outputs=1
183183
)
184184
identity_node_input = ir.node("Identity", inputs=[input_value], num_outputs=1)
185185

186186
model = ir.Model(
187187
graph=ir.Graph(
188188
inputs=[input_value],
189-
outputs=[identity_node_input.outputs[0], identity_node_constant.outputs[0]],
189+
outputs=[identity_node_input.o(), identity_node_constant.o()],
190190
nodes=[identity_node_input, const_node, identity_node_constant],
191191
opset_imports={"": 20},
192192
),
@@ -232,7 +232,7 @@ def test_not_lifting_constants_to_initializers_when_it_is_output(self):
232232
model = ir.Model(
233233
graph=ir.Graph(
234234
inputs=[input_value],
235-
outputs=[identity_node_input.outputs[0], const_node.outputs[0]],
235+
outputs=[identity_node_input.o(), const_node.o()],
236236
nodes=[identity_node_input, const_node],
237237
opset_imports={"": 20},
238238
),
@@ -272,7 +272,7 @@ def test_pass_with_lifting_constants_to_initializers_within_subgraph(
272272
add_node = ir.node("Add", inputs=[input_value, then_initializer_value])
273273
then_graph = ir.Graph(
274274
inputs=[],
275-
outputs=[add_node.outputs[0]],
275+
outputs=[add_node.o()],
276276
nodes=[add_node],
277277
opset_imports={"": 20},
278278
initializers=[then_initializer_value],
@@ -287,7 +287,7 @@ def test_pass_with_lifting_constants_to_initializers_within_subgraph(
287287
mul_node = ir.node("Mul", inputs=[input_value, else_initializer_value])
288288
else_graph = ir.Graph(
289289
inputs=[],
290-
outputs=[mul_node.outputs[0]],
290+
outputs=[mul_node.o()],
291291
nodes=[mul_node],
292292
opset_imports={"": 20},
293293
initializers=[else_initializer_value],
@@ -358,7 +358,7 @@ def test_pass_does_not_lift_initialized_inputs_in_subgraph(
358358
# The initializer is also an input. We don't lift it to the main graph
359359
# to preserve the graph signature
360360
inputs=[then_initializer_value],
361-
outputs=[add_node.outputs[0]],
361+
outputs=[add_node.o()],
362362
nodes=[add_node],
363363
opset_imports={"": 20},
364364
initializers=[then_initializer_value],
@@ -373,7 +373,7 @@ def test_pass_does_not_lift_initialized_inputs_in_subgraph(
373373
mul_node = ir.node("Mul", inputs=[input_value, else_initializer_value])
374374
else_graph = ir.Graph(
375375
inputs=[],
376-
outputs=[mul_node.outputs[0]],
376+
outputs=[mul_node.o()],
377377
nodes=[mul_node],
378378
opset_imports={"": 20},
379379
initializers=[else_initializer_value],

0 commit comments

Comments
 (0)