changes default layout logic depending on model type to affect broade…

…r models scope
liubo-intel · Sep 5, 2024 · 20309a0 · 20309a0
1 parent ed05c92
commit 20309a0
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/plugins/intel_cpu/src/nodes/eltwise.cpp b/src/plugins/intel_cpu/src/nodes/eltwise.cpp
@@ -2574,14 +2574,6 @@ void Eltwise::initSupportedPrimitiveDescriptors() {
         return;
     }
 #endif
-    // To make attention_mask process align with SDPA layout
-    if (getAlgorithm() == Algorithm::EltwiseClamp) {
-        auto parentNode = getParentEdgeAt(0)->getParent();
-        if (Config::ModelType::LLM == context->getConfig().modelType && "Ceiling" == parentNode->getTypeStr() &&
-            Algorithm::MathCeiling == parentNode->getAlgorithm()) {
-            isChannelsFirstApplicable = false;
-        }
-    }
 
 #if defined(OV_CPU_WITH_SHL)
     eltwiseAttrs = {algorithm, alpha, beta, gamma};
@@ -2599,11 +2591,19 @@ void Eltwise::initSupportedPrimitiveDescriptors() {
         return;
 #endif
 
-    if (isChannelsFirstApplicable)
-        supportedPrimitiveDescriptors.emplace_back(initDesc(ChannelsFirst));
-    if (isBlockedApplicable)
-        supportedPrimitiveDescriptors.emplace_back(initDesc(Blocked));
-    supportedPrimitiveDescriptors.emplace_back(initDesc(Planar));
+    if (context->getConfig().modelType == Config::ModelType::CNN) {
+        if (isChannelsFirstApplicable)
+            supportedPrimitiveDescriptors.emplace_back(initDesc(ChannelsFirst));
+        if (isBlockedApplicable)
+            supportedPrimitiveDescriptors.emplace_back(initDesc(Blocked));
+        supportedPrimitiveDescriptors.emplace_back(initDesc(Planar));
+    } else {
+        supportedPrimitiveDescriptors.emplace_back(initDesc(Planar));
+        if (isChannelsFirstApplicable)
+            supportedPrimitiveDescriptors.emplace_back(initDesc(ChannelsFirst));
+        if (isBlockedApplicable)
+            supportedPrimitiveDescriptors.emplace_back(initDesc(Blocked));
+    }
 }
 
 void Eltwise::createPrimitive() {