Skip to content
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

Jump to bottom

[TensorRT EP] Fix wrong input order when generating IndexedSubGraph #22857

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[TensorRT EP] Fix wrong input order when generating IndexedSubGraph #22857

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc5b336
update
chilo-ms Nov 15, 2024
b6919fb
revert
chilo-ms Nov 15, 2024
e9042ef
update
chilo-ms Nov 15, 2024
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
19 changes: 16 additions & 3 deletions onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,7 +1960,7 @@ std::unique_ptr<IndexedSubGraph> TensorrtExecutionProvider::GetSubGraph(SubGraph

// Find inputs and outputs of the subgraph
std::unique_ptr<IndexedSubGraph> sub_graph = onnxruntime::IndexedSubGraph::Create();
std::unordered_map<const NodeArg*, int> fused_inputs, fused_outputs, fused_outputs_to_add, graph_outputs_to_add;
std::unordered_map<const NodeArg*, int> original_inputs, fused_inputs, fused_outputs, fused_outputs_to_add, graph_outputs_to_add;
std::unordered_set<const NodeArg*> erased;
int input_order = 0;
int output_order = 0;
Expand Down Expand Up @@ -2052,12 +2052,25 @@ std::unique_ptr<IndexedSubGraph> TensorrtExecutionProvider::GetSubGraph(SubGraph
fused_outputs.insert(fused_outputs_to_add.begin(), fused_outputs_to_add.end());
fused_outputs.insert(graph_outputs_to_add.begin(), graph_outputs_to_add.end());

// Sort inputs and outputs by the order they were added
std::multimap<int, const NodeArg*> inputs, outputs;

// Get the input order of the original graph
int order = 0;
for (const auto* input : graph.GetInputs()) {
original_inputs[input] = order++;
}

// input order needs to be consistent with original graph's input order
for (auto it = fused_inputs.begin(), end = fused_inputs.end(); it != end; ++it) {
inputs.insert(std::pair<int, const NodeArg*>(it->second, it->first));
const auto& iter = original_inputs.find(it->first);
if (iter != original_inputs.end()) {
inputs.insert(std::pair<int, const NodeArg*>(iter->second, iter->first));
} else {
inputs.insert(std::pair<int, const NodeArg*>(it->second, it->first));
}
}

// Sort outputs by the order they were added
for (auto it = fused_outputs.begin(), end = fused_outputs.end(); it != end; ++it) {
outputs.insert(std::pair<int, const NodeArg*>(it->second, it->first));
}
Expand Down
Loading