Skip to content

Commit ee2fe87

Browse files
ORT 1.19.0 Release: Cherry-Pick Round 0 (#21609)
### Description <!-- Describe your changes. --> Critical changes required for an external developer (GeekBench) ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> ORT 1.19.0 Release Preparation --------- Co-authored-by: Adrian Lizarraga <[email protected]>
1 parent 530a2d7 commit ee2fe87

20 files changed

+1821
-499
lines changed

onnxruntime/core/framework/node_unit.cc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if !defined(ORT_MINIMAL_BUILD) || defined(ORT_EXTENDED_MINIMAL_BUILD)
55

66
#include "node_unit.h"
7+
#include <utility>
78
#include "core/graph/graph_viewer.h"
89

910
namespace onnxruntime {
@@ -272,6 +273,20 @@ NodeUnit::NodeUnit(const GraphViewer& graph_viewer, const QDQ::NodeGroup& node_g
272273
}
273274
}
274275

276+
NodeUnit::NodeUnit(gsl::span<const Node* const> dq_nodes, const Node& target_node,
277+
gsl::span<const Node* const> q_nodes, Type unit_type,
278+
gsl::span<const NodeUnitIODef> inputs, gsl::span<const NodeUnitIODef> outputs,
279+
size_t input_edge_count, Node::EdgeSet output_edges)
280+
: dq_nodes_(dq_nodes.begin(), dq_nodes.end()),
281+
target_node_(target_node),
282+
q_nodes_(q_nodes.begin(), q_nodes.end()),
283+
type_(unit_type),
284+
inputs_(inputs.begin(), inputs.end()),
285+
outputs_(outputs.begin(), outputs.end()),
286+
input_edge_count_(input_edge_count),
287+
output_edges_(std::move(output_edges)) {
288+
}
289+
275290
const std::string& NodeUnit::Domain() const noexcept { return target_node_.Domain(); }
276291
const std::string& NodeUnit::OpType() const noexcept { return target_node_.OpType(); }
277292
const std::string& NodeUnit::Name() const noexcept { return target_node_.Name(); }

onnxruntime/core/framework/node_unit.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ class NodeUnit {
6868
public:
6969
explicit NodeUnit(const Node& node);
7070
explicit NodeUnit(const GraphViewer& graph_viewer, const QDQ::NodeGroup& node_group);
71+
NodeUnit(gsl::span<const Node* const> dq_nodes, const Node& target_node,
72+
gsl::span<const Node* const> q_nodes, Type unit_type,
73+
gsl::span<const NodeUnitIODef> inputs, gsl::span<const NodeUnitIODef> outputs,
74+
size_t input_edge_count, Node::EdgeSet output_edges);
7175

7276
Type UnitType() const noexcept { return type_; }
7377

onnxruntime/core/providers/qnn/builder/qnn_fusions.cc

Lines changed: 0 additions & 294 deletions
This file was deleted.

onnxruntime/core/providers/qnn/builder/qnn_fusions.h

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)