Skip to content

[ONNX] Use symbolic shape inference #3678

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
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

[ONNX] Use symbolic shape inference #3678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eb1887
Use shape inference from onnxruntime
andrey-churkin Oct 6, 2025
114e276
update
andrey-churkin Oct 8, 2025
b2062aa
Fix test_nncf_graph_builder.py::test_compare_nncf_graph_synthetic_mod…
andrey-churkin Oct 9, 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
3 changes: 2 additions & 1 deletion src/nncf/onnx/graph/nncf_graph_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from typing import Any, Optional

import onnx
from onnxruntime.tools.symbolic_shape_infer import SymbolicShapeInference

import nncf
from nncf.common.graph import NNCFGraph
Expand Down Expand Up @@ -347,7 +348,7 @@ def create_nncf_graph(onnx_model: onnx.ModelProto) -> NNCFGraph:
:return: NNCFGraph.
"""
onnx_model = GraphConverter._replace_empty_node_name(onnx_model)
onnx_model = onnx.shape_inference.infer_shapes(onnx_model)
onnx_model = SymbolicShapeInference.infer_shapes(onnx_model)
edge_info_mapping = get_edge_info_mapping(onnx_model)
children_node_mapping = get_children_node_mapping(onnx_model)
parents_node_mapping = get_parents_node_mapping(onnx_model)
Expand Down
5 changes: 3 additions & 2 deletions src/nncf/onnx/graph/passes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import onnx
from onnx.reference.ops import load_op
from onnxruntime.tools.symbolic_shape_infer import SymbolicShapeInference

from nncf.onnx.graph.onnx_helper import get_children
from nncf.onnx.graph.onnx_helper import get_children_node_mapping
Expand Down Expand Up @@ -74,8 +75,8 @@ def apply_preprocess_passes(model: onnx.ModelProto) -> onnx.ModelProto:
:param model: The ONNX model to be preprocessed.
:return: A preprocessed ONNX model, ready for quantization.
"""
preprocessed_model = onnx.shape_inference.infer_shapes(model)
# The `eliminate_nop_cast` pass should be applied after onnx.shape_inference.infer_shapes() call.
preprocessed_model = SymbolicShapeInference.infer_shapes(model)
# The `eliminate_nop_cast` pass should be applied after `SymbolicShapeInference.infer_shapes()` call.
# Otherwise, not all no-op Cast nodes will be found.
preprocessed_model = eliminate_nop_cast(preprocessed_model)
return preprocessed_model
Expand Down
5 changes: 3 additions & 2 deletions tests/onnx/data/reference_graphs/original_nncf_graph/synthetic/unified_embedding_model.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ strict digraph {
"0 Cast" -> "1 Embedding" [label="[1, 3]", style=dashed];
"1 Embedding" -> "4 Concat" [label="[1, 3, 5]", style=solid];
"2 MatMul_1" -> "3 Reshape" [label="[3, 1, 5]", style=solid];
"4 Concat" -> "5 MatMul_2" [label="[]", style=solid];
"5 MatMul_2" -> "7 nncf_model_output_0" [label="[1, 6]", style=solid];
"3 Reshape" -> "4 Concat" [label="[1, 3, 5]", style=solid];
"4 Concat" -> "5 MatMul_2" [label="[1, 6, 5]", style=solid];
"5 MatMul_2" -> "7 nncf_model_output_0" [label="[1, 6, 1]", style=solid];
"6 nncf_model_input_0" -> "0 Cast" [label="[1, 3]", style=solid];
"6 nncf_model_input_0" -> "2 MatMul_1" [label="[1, 3]", style=solid];
}
8 changes: 4 additions & 4 deletions tests/onnx/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1709,8 +1709,8 @@ def __init__(self):
reshape_tensor_name = "R"
reshape_tensor = create_initializer_tensor(
name=reshape_tensor_name,
tensor_array=np.array([1, 3, 5]).astype(np.float32),
data_type=onnx.TensorProto.FLOAT,
tensor_array=np.array([1, 3, 5], dtype=np.int64),
data_type=onnx.TensorProto.INT64,
Comment on lines +1712 to +1713
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Incorrect data type for the shape input of the Reshape operation. It should be tensor(int64), according to the documentation.

)
reshape_output_name = "Reshape_Y"
reshape_node = onnx.helper.make_node(
Expand All @@ -1726,13 +1726,13 @@ def __init__(self):
op_type="Concat",
inputs=[embedding_output_name, reshape_output_name],
outputs=[concat_output_name],
axis=0,
axis=1,
)

matmul_2_tensor_name = "W_2"
matmul_2_tensor = create_initializer_tensor(
name=matmul_2_tensor_name,
tensor_array=rng.uniform(0, 1, (1, 5)).astype(np.float32),
tensor_array=rng.uniform(0, 1, (1, 5)).astype(np.float32).T,
data_type=onnx.TensorProto.FLOAT,
)
matmul_2_node = onnx.helper.make_node(
Expand Down
Loading