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

ilya-lavrenov · Sep 17, 2023 · fd338ee · fd338ee
2 parents 8d2562b + 1968632
commit fd338ee
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/src/common/transformations/src/transformations/init_node_info.cpp b/src/common/transformations/src/transformations/init_node_info.cpp
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "itt.hpp"
+#include "openvino/op/util/sub_graph_base.hpp"
 #include "transformations/rt_info/fused_names_attribute.hpp"
 #include "transformations/rt_info/primitives_priority_attribute.hpp"
 

diff --git a/src/core/src/pass/serialize.cpp b/src/core/src/pass/serialize.cpp
@@ -197,7 +197,7 @@ void ngfunction_2_ir(pugi::xml_node& node,
                      bool deterministic);
 
 namespace rt_info {
-const std::vector<std::string> list_of_names{
+static const std::vector<std::string> list_of_names{
     "PrimitivesPriority",
     "alt_width",
 };

diff --git a/src/inference/src/system_conf.cpp b/src/inference/src/system_conf.cpp
@@ -26,11 +26,6 @@
 #    include <sys/types.h>
 #endif
 
-#ifdef __APPLE__
-#    include <sys/types.h>
-#    include <sys/sysctl.h>
-#endif
-
 #if defined(OPENVINO_ARCH_X86) || defined(OPENVINO_ARCH_X86_64)
 #    define XBYAK_NO_OP_NAMES
 #    define XBYAK_UNDEF_JNL

diff --git a/src/inference/tests/unit/compilation_context_test.cpp b/src/inference/tests/unit/compilation_context_test.cpp
@@ -189,7 +189,8 @@ TEST(NetworkContext, HashWithPrimitivesPriority) {
     op3["PrimitivesPriority"] = "testPriority";
 
     ASSERT_NE(ModelCache::compute_hash(net1, {}), ModelCache::compute_hash(net2, {}));
-    ASSERT_NE(ModelCache::compute_hash(net2, {}), ModelCache::compute_hash(net3, {}));
+
+    ASSERT_EQ(ModelCache::compute_hash(net2, {}), ModelCache::compute_hash(net3, {}));
 }
 
 TEST(NetworkContext, HashWithFusedNames) {

diff --git a/src/tests/test_utils/functional_test_utils/src/summary/op_summary.cpp b/src/tests/test_utils/functional_test_utils/src/summary/op_summary.cpp
@@ -140,7 +140,7 @@ void OpSummary::updateOPsStats(const std::shared_ptr<ov::Model>& model, const Pa
         return;
     }
     bool isFunctionalGraph = false;
-    for (const auto &op : model->get_ordered_ops()) {
+    for (const auto& op : model->get_ordered_ops()) {
         if (!std::dynamic_pointer_cast<ov::op::v0::Parameter>(op) &&
             !std::dynamic_pointer_cast<ov::op::v0::Constant>(op) &&
             !std::dynamic_pointer_cast<ov::op::v0::Result>(op)) {