rebase fix

openvinotoolkit · Feb 22, 2024 · 81a0121 · 81a0121
1 parent 25987d1
commit 81a0121
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/activation.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/activation.cpp
@@ -134,18 +134,18 @@ void ActivationLayerCPUTest::SetUp() {
     function = std::make_shared<ov::Model>(ov::NodeVector{activation}, ov::ParameterVector{params}, "Activation");
 }
 
-std::string ActivationLayerCPUTest::getPrimitiveType(const ngraph::helpers::ActivationTypes& activation_type,
+std::string ActivationLayerCPUTest::getPrimitiveType(const utils::ActivationTypes& activation_type,
                                                      const ov::element::Type_t& element_type,
                                                      const std::vector<std::pair<ov::PartialShape, std::vector<ov::Shape>>>& input_shapes) const {
 #if defined(OV_CPU_WITH_ACL)
 #if defined(OPENVINO_ARCH_ARM64)
     if ((element_type == ov::element::f32) &&
-        ((activation_type == ngraph::helpers::ActivationTypes::Relu) ||
-        (activation_type == ngraph::helpers::ActivationTypes::Exp))) {
+        ((activation_type == utils::ActivationTypes::Relu) ||
+        (activation_type == utils::ActivationTypes::Exp))) {
         return "jit";
     }
 
-    if (activation_type == ngraph::helpers::ActivationTypes::Mish) {
+    if (activation_type == utils::ActivationTypes::Mish) {
         // operation is decomposed and executed by different kernels
         return "";
     }

diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/activation.hpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/activation.hpp
@@ -38,7 +38,7 @@ class ActivationLayerCPUTest : public testing::WithParamInterface<ActivationLaye
     utils::ActivationTypes activationType = utils::ActivationTypes::None;
 
     std::string getPrimitiveType(
-        const ngraph::helpers::ActivationTypes& activation_type,
+        const utils::ActivationTypes& activation_type,
         const ov::element::Type_t& element_type,
         const std::vector<std::pair<ov::PartialShape, std::vector<ov::Shape>>>& input_shapes) const;
 };

diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/eltwise.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/eltwise.cpp
@@ -245,15 +245,15 @@ void EltwiseLayerCPUTest::SetUp() {
     function = makeNgraphFunction(netType, parameters, eltwise, "Eltwise");
 }
 
-std::string EltwiseLayerCPUTest::getPrimitiveType(const ngraph::helpers::EltwiseTypes& eltwise_type,
+std::string EltwiseLayerCPUTest::getPrimitiveType(const utils::EltwiseTypes& eltwise_type,
                                                   const ov::element::Type_t& element_type,
                                                   const std::vector<std::pair<ov::PartialShape, std::vector<ov::Shape>>>& input_shapes) const {
 #if defined(OV_CPU_WITH_ACL)
 #if defined(OPENVINO_ARCH_ARM64)
-    if ((eltwise_type == ngraph::helpers::EltwiseTypes::ADD) ||
-       (eltwise_type == ngraph::helpers::EltwiseTypes::MULTIPLY) ||
-       (eltwise_type == ngraph::helpers::EltwiseTypes::SUBTRACT) ||
-       (eltwise_type == ngraph::helpers::EltwiseTypes::DIVIDE)) {
+    if ((eltwise_type == utils::EltwiseTypes::ADD) ||
+       (eltwise_type == utils::EltwiseTypes::MULTIPLY) ||
+       (eltwise_type == utils::EltwiseTypes::SUBTRACT) ||
+       (eltwise_type == utils::EltwiseTypes::DIVIDE)) {
         return "jit";
     }
 #endif

diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/eltwise.hpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/eltwise.hpp
@@ -36,7 +36,7 @@ class EltwiseLayerCPUTest : public testing::WithParamInterface<EltwiseLayerCPUTe
 private:
     utils::EltwiseTypes eltwiseType;
 
-    std::string getPrimitiveType(const ngraph::helpers::EltwiseTypes& eltwise_type,
+    std::string getPrimitiveType(const utils::EltwiseTypes& eltwise_type,
                                  const ov::element::Type_t& element_type,
                                  const std::vector<std::pair<ov::PartialShape, std::vector<ov::Shape>>>& input_shapes) const;
 };