Merge remote-tracking branch 'origin/trans' into trans

ilya-lavrenov · Sep 18, 2023 · 85c3357 · 85c3357
2 parents 2a2105f + fd338ee
commit 85c3357
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/common/snippets/src/pass/hash.cpp b/src/common/snippets/src/pass/hash.cpp
@@ -62,7 +62,7 @@ static uint64_t hash_combine(uint64_t seed, const T &v) {
 namespace rt_info {
 
 // some node attr is not type of ov::RuntimeAttribute, need dedicate visitor.
-const std::vector<std::string> list_of_names{
+static const std::vector<std::string> list_of_names{
     "PrimitivesPriority",
     "alt_width",
 };

diff --git a/src/plugins/intel_cpu/tests/functional/test_utils/cpu_test_utils.cpp b/src/plugins/intel_cpu/tests/functional/test_utils/cpu_test_utils.cpp
@@ -6,6 +6,7 @@
 #include "ie_ngraph_utils.hpp"
 #include "openvino/core/type/element_type.hpp"
 #include "utils/rt_info/memory_formats_attribute.hpp"
+#include "transformations/rt_info/primitives_priority_attribute.hpp"
 #include "utils/general_utils.h"
 #include <cstdint>
 
@@ -321,7 +322,7 @@ CPUTestsBase::makeCPUInfo(const std::vector<cpu_memory_format_t>& inFmts,
                         ov::intel_cpu::OutputMemoryFormats(fmts2str(outFmts, "cpu:"))});
     }
     if (!priority.empty()) {
-        cpuInfo.insert({"PrimitivesPriority", impls2str(priority)});
+        cpuInfo.insert({ov::PrimitivesPriority::get_type_info_static(), impls2str(priority)});
     }
 
     cpuInfo.insert({"enforceBF16evenForGraphTail", true});

diff --git a/src/plugins/template/tests/functional/CMakeLists.txt b/src/plugins/template/tests/functional/CMakeLists.txt
@@ -28,11 +28,11 @@ ov_add_test_target(
 find_package(OpenCV QUIET COMPONENTS core imgproc)
 
 if(OpenCV_FOUND AND OpenCV_VERSION VERSION_GREATER_EQUAL 3.4)
-    message("-- Reference preprocessing: OpenCV tests are enabled")
+    message(STATUS "Reference preprocessing: OpenCV tests are enabled")
     target_compile_definitions(${TARGET_NAME} PRIVATE OPENCV_TEMPLATE_TESTS)
     target_link_libraries(${TARGET_NAME} PRIVATE opencv_imgproc opencv_core)
 else()
-    message("-- Reference preprocessing: OpenCV tests are disabled, because OpenCV ver. 3.4+ is not found")
+    message(WARNING "Reference preprocessing: OpenCV tests are disabled, because OpenCV ver. 3.4+ is not found")
 endif()
 
 if (ENABLE_INTEL_CPU)