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

[ARM][CPU] Fix ACL FC executor post ops check on ARM32 #26065

Merged
merged 5 commits into from
Aug 16, 2024
Merged

[ARM][CPU] Fix ACL FC executor post ops check on ARM32 #26065

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c116bdb
test post op comparison
allnes Aug 13, 2024
1aebcd3
test post op comparison
allnes Aug 13, 2024
1c0552e
Merge remote-tracking branch 'origin/an/imp_mem_fix' into an/imp_mem_fix
allnes Aug 14, 2024
eafca87
Merge branch 'master' into an/imp_mem_fix
allnes Aug 14, 2024
4a1cddb
Merge branch 'master' into an/imp_mem_fix
allnes Aug 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
20 changes: 10 additions & 10 deletions src/plugins/intel_cpu/src/nodes/executors/acl/acl_fullyconnected.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,15 @@ static MemoryPtr prepareWeightMemory(const MemoryArgs &memory,
}

static bool checkPostOps(const PostOps &postOps) {
// Add postops
if (!postOps.empty() && postOps.size() == 1) {
if (const auto activation = std::dynamic_pointer_cast<ActivationPostOp>(postOps[0])) {
if (checkActivationLayerInfo(convertToEltwiseAlgorithm(activation->type()))) {
return true;
}
if (postOps.empty()) {
return true;
}
if (postOps.size() > 1) {
return false;
}
if (const auto activation = std::dynamic_pointer_cast<ActivationPostOp>(postOps[0])) {
if (checkActivationLayerInfo(convertToEltwiseAlgorithm(activation->type()))) {
return true;
}
}
return false;
Expand All @@ -179,7 +182,7 @@ static void initFCAttrs(const FCAttrs &attrs,
fullyConnectedLayerInfo.transpose_weights = false;
aclfcAttrs.weightsNonTransposed = attrs.weightsNonTransposed;

if (checkPostOps(postOps)) {
if (!postOps.empty() && checkPostOps(postOps)) {
auto activation = std::dynamic_pointer_cast<ActivationPostOp>(postOps[0]);
fullyConnectedLayerInfo.activation_info = getActivationLayerInfo(
convertToEltwiseAlgorithm(activation->type()),
Expand All @@ -203,10 +206,7 @@ bool ACLFullyConnectedExecutor::supports(const FCConfig &config) {
VERIFY(one_of(srcType(config), ov::element::f16, ov::element::f32), UNSUPPORTED_SRC_PRECISIONS);
VERIFY(one_of(weiType(config), ov::element::f16, ov::element::f32), UNSUPPORTED_WEI_PRECISIONS);
VERIFY(postOpsNumbers(config) < 2, UNSUPPORTED_NUMBER_OF_POSTOPS);
// This define is set because on ARM32 devices postOps in the function is empty (CVS-149013)
#ifndef OPENVINO_ARCH_ARM
VERIFY(checkPostOps(config.postOps), UNSUPPORTED_TYPE_OF_POSTOPS);
#endif
VERIFY(one_of(srcRank(config), 2U, 3U, 4U), UNSUPPORTED_SRC_RANK);
VERIFY(one_of(weiRank(config), 2U, 3U), UNSUPPORTED_WEI_RANK);
return true;
Expand Down
Loading