[QDQ] Hookup NNAPI GetCapability/Compile with shared QDQ selectors #10347
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
guoyu-wang
changed the title
skottmckay
reviewed
Jan 24, 2022
skottmckay
reviewed
Jan 24, 2022
onnxruntime/core/optimizer/qdq_transformer/selectors_actions/qdq_selectors.h
Show resolved
Hide resolved
skottmckay
reviewed
Jan 24, 2022
skottmckay
reviewed
Jan 24, 2022
edgchen1
reviewed
Jan 24, 2022
| std::vector<std::unique_ptr<NodeUnit>> node_unit_holder; | ||
| std::unordered_map<const Node*, const NodeUnit*> node_unit_map; | ||
|
|
||
| std::tie(node_unit_holder, node_unit_map) = GetAllNodeUnits(graph_viewer); |
There was a problem hiding this comment.
Unfortunately, node_unit_map need to be captured by lambda below, seems lambda cannot bind structurally bound reference unless we copy it
edgchen1
reviewed
Jan 24, 2022
onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_execution_provider.cc
Outdated
Show resolved
Hide resolved
edgchen1
reviewed
Jan 24, 2022
onnxruntime/core/providers/nnapi/nnapi_builtin/builders/op_support_checker.cc
Outdated
Show resolved
Hide resolved
edgchen1
reviewed
Jan 24, 2022
edgchen1
reviewed
Jan 24, 2022
edgchen1
reviewed
Jan 24, 2022
This was referenced Jan 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description: [QDQ] Hookup NNAPI GetCapability/Compile with shared QDQ selectors
Motivation and Context
To avoid excessively large PR, the NNAPI QDQ integration is splitted into the following small tasks
1. Add shared NodeUnit class ([QDQ] Add shared NodeUnit class #10052[merged])
2. Move NNAPI EP to use NodeUnitIODef for non-QDQ ops ([QDQ] Move NNAPI EP to use NodeUnitIODef for non-QDQ ops #10237[merged])
3. Add shared QDQ selectors ([QDQ] Add shared qdq selectors #10178[merged])
4. Hookup NNAPI GetCapability/Compile with shared QDQ selectors (this PR)
5. Enable QDQ for ops with QLinear version (QLinear[Conv/Matmul/Pool/...])
6. Enable QDQ for ops without QLinear Version
Added share functions to get all the NodeUnits(QDQ and single node) in the graph
NNAPI GetCapability/Compile runs on a list of mixed SingleNode/QDQGroup NodeUnit
Disabled the support for all QDQ NodeUnit for now (can be individually enabled for each op, in task 5 and 6)
Modified the build settings for Extended Minimal build
Added a simple UT
Some minor update