saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-30 20:18:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix shape conv fuse opt (#20282)

Browse source 
FIx:
- Multiples Convs into an Add+Relu will fuse the op although intermediates are needed

![image](https://github.com/microsoft/onnxruntime/assets/44298237/0c85a30c-5f41-4e62-ae2e-f41eada6c2c3)
- Also fixes an issue with Shape Initializers Merge as input, that
occurs when the input initializer is the same across multiple nodes but
not all nodes are Shape nodes.
This commit is contained in:
Maximilian Müller 2024-04-24 01:19:57 +02:00 committed by GitHub
parent 8f53957bcf
commit b4e50758c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
onnxruntime/core/optimizer/conv_activation_fusion.cc
View file

@ -23,7 +23,20 @@ const Node* GetLoneConsumerNode(const GraphViewer& graph_viewer, const Node& nod
if (!optimizer_utils::CheckOutputEdges(graph_viewer.GetGraph(), node, 1)) {
return nullptr;
}
return &*node.OutputNodesBegin();
const Node* next_node = &*node.OutputNodesBegin();
// ensure that the target node also has only one input that is not an initializer
const size_t input_edges_total = next_node->GetInputEdgesCount();
int non_const_edges = 0;
for (size_t edge_idx = 0; edge_idx < input_edges_total; ++edge_idx) {
if (!graph_utils::NodeArgIsConstant(graph_viewer.GetGraph(), *next_node->InputDefs()[edge_idx])) {
++non_const_edges;
}
}
if (non_const_edges > 1) {
return nullptr;
} else {
return next_node;
}
}
bool HasElementDataType(const NodeArg& node_arg, int32_t data_type) {

6
onnxruntime/core/optimizer/shape_input_merge.cc
View file

@ -58,13 +58,13 @@ Status ShapeInputMerge::ApplyImpl(Graph& graph, bool& modified, int graph_level,
for (size_t i = 1; i < kv.second.size(); ++i) {
Node* p_node = kv.second[i];
const NodeArg* input_arg = p_node->InputDefs()[0];
if (p_node->InputDefs()[0]->Name() == first_input_arg->Name()) continue;
if (!graph.IsInputsIncludingInitializers(input_arg)) {
if (input_arg->Name() == first_input_arg->Name()) continue;
if (!graph.IsInputsIncludingInitializers(input_arg) && p_node->GetInputEdgesCount()) {
const Node::EdgeEnd& input_edge = *p_node->InputEdgesBegin();
graph.RemoveEdge(input_edge.GetNode().Index(), p_node->Index(), input_edge.GetSrcArgIndex(), 0);
}
graph_utils::ReplaceNodeInput(*p_node, 0, *first_input_arg);
if (!is_first_input_arg_graph_input) {
if (!is_first_input_arg_graph_input && kv.second[0]->GetInputEdgesCount()) {
const Node::EdgeEnd& first_input_edge = *kv.second[0]->InputEdgesBegin();
graph.AddEdge(first_input_edge.GetNode().Index(), p_node->Index(), first_input_edge.GetSrcArgIndex(), 0);
}