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

[AUTO] Implement auto-plugin limited devices feature #5545

Merged
merged 16 commits into from
May 19, 2021
Merged

[AUTO] Implement auto-plugin limited devices feature #5545

merged 16 commits into from
May 19, 2021

Conversation

mashoujiang
Copy link
Contributor

@mashoujiang mashoujiang commented May 7, 2021 •
edited
Loading

Details:

  • Implement limited device list feature for AUTO plugin

Tickets:

  • 53296

@mashoujiang mashoujiang requested review from a team May 7, 2021 07:30
@openvino-pushbot openvino-pushbot added category: inference OpenVINO Runtime library - Inference category: IE Tests OpenVINO Test: plugins and common labels May 7, 2021
@mashoujiang mashoujiang marked this pull request as draft May 7, 2021 07:49
@coneypo coneypo mentioned this pull request May 7, 2021
Closed
@mashoujiang mashoujiang force-pushed the msj/auto_limited_devices branch 17 times, most recently from 9599c0a to fb70e8c Compare May 14, 2021 03:42
@mashoujiang
Copy link
Contributor Author

I closed #5549 , let's focus on this PR. Sorry to bring confuse.
I notice only one comment from Ilya, if @myshevts @ilya-lavrenov have some review comments which are not submitted, please commit here. I have not changed any code yet.

@mashoujiang mashoujiang force-pushed the msj/auto_limited_devices branch from 804e29e to 4e1bed6 Compare May 19, 2021 13:20
@mashoujiang
Copy link
Contributor Author

Hi @myshevts @ilya-lavrenov , thanks for your review, I just rebased to the latest master branch.
Note that since there are some conflicts during rebase, so the last commit may not reflect the related modification very well.
Compared to ilya's approved version:

  1. I fixed the GetNetworkPrecision logic according to Maxim's comment
  2. refactor the template function LoadNetworkImpl
  3. and rebased to master branch, change related code.

@mashoujiang mashoujiang force-pushed the msj/auto_limited_devices branch 2 times, most recently from 97684e5 to c59e0b0 Compare May 19, 2021 13:34
coneypo and others added 16 commits May 19, 2021 22:24
@coneypo @mashoujiang
Update SelectDevice policy in auto plugin
c710cdd 
Signed-off-by: Zhengtian Xie <[email protected]>
@mashoujiang
Implement limit device list for AUTO plugin
31917c6 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Add tests for AUTO limit device feature
92683b9 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Add gpu tests for auto-plugin
93afbe0 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Fix CI cpuFuncTests issue due to BATCHED_BLOB
12d1142 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Override LoadNetwork(modelPath, config) in AUTO plugin
b12c6e7 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Update SelectDevice() logic for LoadNetwork(model, config)
21e646c 
Signed-off-by: Shoujiang Ma <[email protected]>
@coneypo @mashoujiang
Update GetNetworkPrecision logic for auto-plugin
9f85254 
Signed-off-by: Zhengtian Xie <[email protected]>
@mashoujiang
Address reviewers' comments
76650c6 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Add tests for AUTO:GPU,CPU case
e787f40 
Signed-off-by: Shoujiang Ma <[email protected]>
@coneypo @mashoujiang
Update logic in GetNetworkPrecision for auto-plugin
7d6fbe6 
Signed-off-by: Zhengtian Xie <[email protected]>
@mashoujiang
Address reviewer's comment: clean and simplify code
ffb237a 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Fix wrong usage of convolution weight index
de839d3 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Address reviewer comment: fix get network precision logic
3f4cce3 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Fix rebase issue
409a893 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang
Fix ie_core.cpp header change
bce7227 
Signed-off-by: Shoujiang Ma <[email protected]>
@mashoujiang mashoujiang force-pushed the msj/auto_limited_devices branch from a4d42bb to bce7227 Compare May 19, 2021 14:27
ilya-lavrenov
ilya-lavrenov reviewed May 19, 2021
View reviewed changes
inference-engine/src/auto_plugin/auto_plugin.cpp
// and AUTO select CPU but not GPU (GPU has this capability).
if (cap == METRIC_VALUE(BATCHED_BLOB)) {
continue;
}
Copy link
Contributor

@ilya-lavrenov ilya-lavrenov May 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

looks like we need to respect KEY_AUTO_DEVICE_LIST here as well. E.i. if only CPU is passed, only CPU optimization capabilities should be taken into account

Copy link
Contributor

Choose a reason for hiding this comment

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

let's fix in future PR

@ilya-lavrenov ilya-lavrenov merged commit 90a18d9 into openvinotoolkit:master May 19, 2021
@mashoujiang mashoujiang deleted the msj/auto_limited_devices branch May 20, 2021 00:42
yekruglov pushed a commit to yekruglov/openvino that referenced this pull request Jun 7, 2021
@mashoujiang @coneypo @yekruglov
[AUTO] Implement auto-plugin limited devices feature (openvinotoolkit…
079f9f8 
…#5545)

* Update SelectDevice policy in auto plugin

Signed-off-by: Zhengtian Xie <[email protected]>

* Implement limit device list for AUTO plugin

Signed-off-by: Shoujiang Ma <[email protected]>

* Add tests for AUTO limit device feature

Signed-off-by: Shoujiang Ma <[email protected]>

* Add gpu tests for auto-plugin

Signed-off-by: Shoujiang Ma <[email protected]>

* Fix CI cpuFuncTests issue due to BATCHED_BLOB

Signed-off-by: Shoujiang Ma <[email protected]>

* Override LoadNetwork(modelPath, config) in AUTO plugin

Signed-off-by: Shoujiang Ma <[email protected]>

* Update SelectDevice() logic for LoadNetwork(model, config)

Signed-off-by: Shoujiang Ma <[email protected]>

* Update GetNetworkPrecision logic for auto-plugin

Signed-off-by: Zhengtian Xie <[email protected]>

* Address reviewers' comments

Signed-off-by: Shoujiang Ma <[email protected]>

* Add tests for AUTO:GPU,CPU case

Signed-off-by: Shoujiang Ma <[email protected]>

* Update logic in GetNetworkPrecision for auto-plugin

Signed-off-by: Zhengtian Xie <[email protected]>

* Address reviewer's comment: clean and simplify code

Signed-off-by: Shoujiang Ma <[email protected]>

* Fix wrong usage of convolution weight index

Signed-off-by: Shoujiang Ma <[email protected]>

* Address reviewer comment: fix get network precision logic

Signed-off-by: Shoujiang Ma <[email protected]>

* Fix rebase issue

Signed-off-by: Shoujiang Ma <[email protected]>

* Fix ie_core.cpp header change

Signed-off-by: Shoujiang Ma <[email protected]>

Co-authored-by: zhengtian.xie <[email protected]>
rnugmanx pushed a commit to rnugmanx/openvino that referenced this pull request Aug 26, 2021
@mashoujiang @coneypo
[AUTO] Implement auto-plugin limited devices feature (openvinotoolkit…
2b58e5c 
…#5545)

* Update SelectDevice policy in auto plugin

Signed-off-by: Zhengtian Xie <[email protected]>

* Implement limit device list for AUTO plugin

Signed-off-by: Shoujiang Ma <[email protected]>

* Add tests for AUTO limit device feature

Signed-off-by: Shoujiang Ma <[email protected]>

* Add gpu tests for auto-plugin

Signed-off-by: Shoujiang Ma <[email protected]>

* Fix CI cpuFuncTests issue due to BATCHED_BLOB

Signed-off-by: Shoujiang Ma <[email protected]>

* Override LoadNetwork(modelPath, config) in AUTO plugin

Signed-off-by: Shoujiang Ma <[email protected]>

* Update SelectDevice() logic for LoadNetwork(model, config)

Signed-off-by: Shoujiang Ma <[email protected]>

* Update GetNetworkPrecision logic for auto-plugin

Signed-off-by: Zhengtian Xie <[email protected]>

* Address reviewers' comments

Signed-off-by: Shoujiang Ma <[email protected]>

* Add tests for AUTO:GPU,CPU case

Signed-off-by: Shoujiang Ma <[email protected]>

* Update logic in GetNetworkPrecision for auto-plugin

Signed-off-by: Zhengtian Xie <[email protected]>

* Address reviewer's comment: clean and simplify code

Signed-off-by: Shoujiang Ma <[email protected]>

* Fix wrong usage of convolution weight index

Signed-off-by: Shoujiang Ma <[email protected]>

* Address reviewer comment: fix get network precision logic

Signed-off-by: Shoujiang Ma <[email protected]>

* Fix rebase issue

Signed-off-by: Shoujiang Ma <[email protected]>

* Fix ie_core.cpp header change

Signed-off-by: Shoujiang Ma <[email protected]>

Co-authored-by: zhengtian.xie <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@coneypo coneypo coneypo left review comments

@ilya-lavrenov ilya-lavrenov ilya-lavrenov approved these changes

@myshevts myshevts myshevts approved these changes

@wangleis wangleis Awaiting requested review from wangleis

Assignees

@myshevts myshevts

Labels
category: IE Tests OpenVINO Test: plugins and common category: inference OpenVINO Runtime library - Inference
Projects
None yet
Milestone
2021.4
Development

Successfully merging this pull request may close these issues.
5 participants
@mashoujiang @ilya-lavrenov @coneypo @myshevts @openvino-pushbot