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.

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

[CPU]The shape of the memory descriptor is considered in selectPreferPrimitiveDescriptor of Subgraph #23971

Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b0db741
Update select prefer PD score algorithm to fix ZOOM decoder network r…
xipingyan Apr 11, 2024
98eccf4
replace makeConst with ov::test::utils::deprecated::make_constant
xipingyan Apr 11, 2024
2d2ee67
Update subgraph_select_pd.cpp
xipingyan Apr 12, 2024
d3d1018
Replace define with constexpr
xipingyan Apr 15, 2024
f831ffb
Fix Windows build issue.
xipingyan Apr 18, 2024
c022b3d
I found 3 subgraph nodes after rebasing.
xipingyan Jun 27, 2024
6f3f841
Enable "selectPreferPrimitiveDescriptorWithShape",
xipingyan Jul 12, 2024
bf579c9
Remove debug log.
xipingyan Jul 12, 2024
99c7790
Merge branch 'master' into xp/fix_zoom_regression_to_master
xipingyan Jul 12, 2024
a773729
Fix CI fail.
xipingyan Jul 15, 2024
8f6d76b
Update descriptions of test.
xipingyan Aug 13, 2024
eee48a2
Improve code readability, using lambda function replace loop;
xipingyan Aug 13, 2024
7b6fafd
Merge branch 'master' into xp/fix_zoom_regression_to_master
xipingyan Aug 13, 2024
8af13ec
Merge branch 'master' into xp/fix_zoom_regression_to_master
xipingyan Aug 15, 2024
36805ef
Merge branch 'master' into xp/fix_zoom_regression_to_master
xipingyan Aug 16, 2024
880d4fd
Merge branch 'master' into xp/fix_zoom_regression_to_master
xipingyan Aug 16, 2024
61a23f0
Update lambda function name.
xipingyan Aug 22, 2024
52f517d
Merge branch 'master' into xp/fix_zoom_regression_to_master
xipingyan Aug 22, 2024
c218d23
Rename reorderCostScore to bestEstimate
xipingyan Aug 22, 2024
a0f3081
Remove scalar shape check, replace with isReorderRequired
xipingyan Aug 27, 2024
f6bfd4c
Merge branch 'master' into xp/fix_zoom_regression_to_master
xipingyan Sep 9, 2024
b5312b1
fix potential dynamic case exception issue, just call getMinDims
xipingyan Sep 9, 2024
a044a5a
Still adopt old logical if current node has dynamic input.
xipingyan Sep 25, 2024
16ae796
call isDynamic directly.
xipingyan Sep 26, 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
7 changes: 7 additions & 0 deletions src/plugins/intel_cpu/src/node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,13 @@ bool Node::isReorderRequired(ov::intel_cpu::MemoryDescPtr desc1, ov::intel_cpu::
}

void Node::selectPreferPrimitiveDescriptorWithShape(const std::vector<impl_desc_type>& priority, bool ignoreConstInputs) {
// Filter out dynamic shape.
for (size_t i = 0; i < this->getOriginalInputsNumber(); i++) {
if (this->getInputShapeAtPort(i).isDynamic()) {
return selectPreferPrimitiveDescriptor(priority, ignoreConstInputs);
}
}

auto estimateReorderOverhead = [&](const ov::intel_cpu::NodeDesc& supportedPrimitiveDesc, size_t i) {
int estimate = 0;
auto inputNodesNum = supportedPrimitiveDesc.getConfig().inConfs.size();
Expand Down
Loading