From 44823dd59e9338b6e3d3a18051f8c52610db9556 Mon Sep 17 00:00:00 2001
From: Georgy Krivoruchko <georgy.krivoruchko@intel.com>
Date: Fri, 12 Jan 2024 02:43:19 -0800
Subject: [PATCH] Updated org.openvinotoolkit/* (#22121)

---
 .../deformable_conv_2d.cpp                    | 35 ++++++++-----
 .../deformable_conv_2d.hpp                    |  1 -
 .../org.openvinotoolkit/detection_output.cpp  | 21 ++++----
 .../org.openvinotoolkit/detection_output.hpp  |  1 -
 .../op/org.openvinotoolkit/fake_quantize.cpp  |  8 +--
 .../op/org.openvinotoolkit/fake_quantize.hpp  |  1 -
 .../generate_proposals.cpp                    | 27 ++++++----
 .../src/op/org.openvinotoolkit/group_norm.cpp | 16 +++---
 .../src/op/org.openvinotoolkit/group_norm.hpp |  1 -
 .../src/op/org.openvinotoolkit/normalize.cpp  | 25 +++++----
 .../src/op/org.openvinotoolkit/normalize.hpp  |  1 -
 .../src/op/org.openvinotoolkit/prior_box.cpp  | 51 ++++++++++---------
 .../src/op/org.openvinotoolkit/prior_box.hpp  |  1 -
 .../src/op/org.openvinotoolkit/swish.cpp      | 13 ++---
 .../src/op/org.openvinotoolkit/swish.hpp      |  1 -
 15 files changed, 109 insertions(+), 94 deletions(-)

diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/deformable_conv_2d.cpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/deformable_conv_2d.cpp
index 72b3a902fffae9..94ac1b8b12e9a4 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/deformable_conv_2d.cpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/deformable_conv_2d.cpp
@@ -16,14 +16,16 @@
 
 #include "op/org.openvinotoolkit/deformable_conv_2d.hpp"
 
-#include "default_opset.hpp"
-#include "ngraph/node.hpp"
-#include "ngraph/op/deformable_convolution.hpp"
+#include "openvino/op/deformable_convolution.hpp"
 #include "utils/convpool.hpp"
 
+using namespace ov::op;
+
 namespace ngraph {
 namespace onnx_import {
-OutputVector op::set_1::deformable_conv_2d(const Node& node) {
+namespace op {
+namespace set_1 {
+OutputVector deformable_conv_2d(const Node& node) {
     const OutputVector& inputs = node.get_ng_inputs();
     const auto strides = convpool::get_strides(node);
     const auto dilations = convpool::get_dilations(node);
@@ -33,16 +35,21 @@ OutputVector op::set_1::deformable_conv_2d(const Node& node) {
     const auto deformable_groups = node.get_attribute_value<int64_t>("deformable_groups", 1);
     const auto auto_pad_type = convpool::get_auto_pad(node);
 
-    return {std::make_shared<default_opset::DeformableConvolution>(inputs.at(0),
-                                                                   inputs.at(1),
-                                                                   inputs.at(2),
-                                                                   strides,
-                                                                   paddings.first,
-                                                                   paddings.second,
-                                                                   dilations,
-                                                                   auto_pad_type,
-                                                                   group,
-                                                                   deformable_groups)};
+    return {std::make_shared<v8::DeformableConvolution>(inputs.at(0),
+                                                        inputs.at(1),
+                                                        inputs.at(2),
+                                                        strides,
+                                                        paddings.first,
+                                                        paddings.second,
+                                                        dilations,
+                                                        auto_pad_type,
+                                                        group,
+                                                        deformable_groups)};
 }
+}  // namespace set_1
+
+}  // namespace op
+
 }  // namespace onnx_import
+
 }  // namespace ngraph
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/deformable_conv_2d.hpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/deformable_conv_2d.hpp
index 98d4988b3564c8..5de5a21c8d3854 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/deformable_conv_2d.hpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/deformable_conv_2d.hpp
@@ -19,7 +19,6 @@
 #include "openvino/core/deprecated.hpp"
 OPENVINO_SUPPRESS_DEPRECATED_START
 
-#include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
 
 namespace ngraph {
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/detection_output.cpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/detection_output.cpp
index ce40105451edd4..1eef678c6ec2b0 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/detection_output.cpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/detection_output.cpp
@@ -4,11 +4,12 @@
 
 #include "ngraph/op/detection_output.hpp"
 
-#include "default_opset.hpp"
-#include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
 #include "op/org.openvinotoolkit/detection_output.hpp"
 #include "openvino/frontend/exception.hpp"
+#include "openvino/op/detection_output.hpp"
+
+using namespace ov::op;
 
 namespace ngraph {
 namespace onnx_import {
@@ -21,7 +22,7 @@ OutputVector detection_output(const Node& node) {
     auto class_preds = inputs[1];
     auto proposals = inputs[2];
 
-    ov::op::v8::DetectionOutput::Attributes attrs;
+    v8::DetectionOutput::Attributes attrs;
     attrs.background_label_id = static_cast<int>(node.get_attribute_value<int64_t>("background_label_id", 0));
     attrs.top_k = static_cast<int>(node.get_attribute_value<int64_t>("top_k", -1));
     attrs.variance_encoded_in_target = node.get_attribute_value<int64_t>("variance_encoded_in_target", 0);
@@ -51,16 +52,16 @@ OutputVector detection_output(const Node& node) {
     attrs.objectness_score = node.get_attribute_value<float>("objectness_score", 0);
 
     if (inputs.size() == 3) {
-        return {std::make_shared<ov::op::v8::DetectionOutput>(box_logits, class_preds, proposals, attrs)};
+        return {std::make_shared<v8::DetectionOutput>(box_logits, class_preds, proposals, attrs)};
     } else if (inputs.size() == 5) {
         auto aux_class_preds = inputs[3];
         auto aux_box_preds = inputs[4];
-        return {std::make_shared<ov::op::v8::DetectionOutput>(box_logits,
-                                                              class_preds,
-                                                              proposals,
-                                                              aux_class_preds,
-                                                              aux_box_preds,
-                                                              attrs)};
+        return {std::make_shared<v8::DetectionOutput>(box_logits,
+                                                      class_preds,
+                                                      proposals,
+                                                      aux_class_preds,
+                                                      aux_box_preds,
+                                                      attrs)};
     } else {
         FRONT_END_GENERAL_CHECK(false, "Invalid number of inputs");
     }
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/detection_output.hpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/detection_output.hpp
index e20810e2b4e0a0..28edc4e737ada8 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/detection_output.hpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/detection_output.hpp
@@ -7,7 +7,6 @@
 #include "openvino/core/deprecated.hpp"
 OPENVINO_SUPPRESS_DEPRECATED_START
 
-#include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
 
 namespace ngraph {
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/fake_quantize.cpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/fake_quantize.cpp
index 692e7589dd720f..b88f2c0b850107 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/fake_quantize.cpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/fake_quantize.cpp
@@ -6,13 +6,15 @@
 
 #include <memory>
 
-#include "default_opset.hpp"
+#include "openvino/op/fake_quantize.hpp"
+
+using namespace ov::op;
 
 namespace ngraph {
 namespace onnx_import {
 namespace op {
 namespace set_1 {
-OutputVector fake_quantize(const onnx_import::Node& node) {
+OutputVector fake_quantize(const Node& node) {
     const auto inputs = node.get_ng_inputs();
     const auto X = inputs.at(0);
     const auto input_low = inputs.at(1);
@@ -22,7 +24,7 @@ OutputVector fake_quantize(const onnx_import::Node& node) {
 
     const auto levels = node.get_attribute_value<std::size_t>("levels");
 
-    return {std::make_shared<default_opset::FakeQuantize>(X, input_low, input_high, output_low, output_high, levels)};
+    return {std::make_shared<v0::FakeQuantize>(X, input_low, input_high, output_low, output_high, levels)};
 }
 
 }  // namespace set_1
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/fake_quantize.hpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/fake_quantize.hpp
index 497b7b430482cc..6f26d64cb48de5 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/fake_quantize.hpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/fake_quantize.hpp
@@ -7,7 +7,6 @@
 #include "openvino/core/deprecated.hpp"
 OPENVINO_SUPPRESS_DEPRECATED_START
 
-#include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
 
 namespace ngraph {
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/generate_proposals.cpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/generate_proposals.cpp
index ed7782cbef63e8..9cae371d68bdfe 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/generate_proposals.cpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/generate_proposals.cpp
@@ -4,7 +4,14 @@
 
 #include "generate_proposals.hpp"
 
-#include "default_opset.hpp"
+#include "openvino/op/broadcast.hpp"
+#include "openvino/op/concat.hpp"
+#include "openvino/op/constant.hpp"
+#include "openvino/op/gather.hpp"
+#include "openvino/op/generate_proposals.hpp"
+#include "openvino/op/shape_of.hpp"
+
+using namespace ov::op;
 
 namespace ngraph {
 namespace onnx_import {
@@ -36,7 +43,7 @@ OutputVector generate_proposals(const Node& node) {
     const auto& im_info = inputs[2];  // shape [N, 3] or [N, 4]
     const auto& anchors = inputs[3];  // shape [A, 4]
 
-    ov::op::v9::GenerateProposals::Attributes attrs;
+    v9::GenerateProposals::Attributes attrs;
     attrs.min_size = node.get_attribute_value<float>("min_size", 1.f);
     attrs.nms_threshold = node.get_attribute_value<float>("nms_thresh", 0.7f);
     attrs.pre_nms_count = node.get_attribute_value<int64_t>("pre_nms_topN", 6000);
@@ -44,16 +51,16 @@ OutputVector generate_proposals(const Node& node) {
     attrs.normalized = !node.get_attribute_value<int64_t>("legacy_plus_one", true);
 
     // Broadcast anchors from [A, 4] to [H, W, A, 4] where [H, W] is taken from scores shape.
-    const auto zero = default_opset::Constant::create(element::i64, Shape{1}, {0});
-    const auto scores_shape = std::make_shared<default_opset::ShapeOf>(scores);
-    const auto anchors_shape = std::make_shared<default_opset::ShapeOf>(anchors);
-    const auto scores_shape_tail = default_opset::Constant::create(element::i64, Shape{2}, {2, 3});
-    const auto new_anchors_shape_front = std::make_shared<default_opset::Gather>(scores_shape, scores_shape_tail, zero);
+    const auto zero = v0::Constant::create(element::i64, Shape{1}, {0});
+    const auto scores_shape = std::make_shared<v3::ShapeOf>(scores);
+    const auto anchors_shape = std::make_shared<v3::ShapeOf>(anchors);
+    const auto scores_shape_tail = v0::Constant::create(element::i64, Shape{2}, {2, 3});
+    const auto new_anchors_shape_front = std::make_shared<v8::Gather>(scores_shape, scores_shape_tail, zero);
     const auto new_anchors_shape =
-        std::make_shared<default_opset::Concat>(OutputVector{new_anchors_shape_front, anchors_shape}, 0);
-    const auto new_anchors = std::make_shared<default_opset::Broadcast>(anchors, new_anchors_shape);
+        std::make_shared<v0::Concat>(OutputVector{new_anchors_shape_front, anchors_shape}, 0);
+    const auto new_anchors = std::make_shared<v3::Broadcast>(anchors, new_anchors_shape);
 
-    const auto proposals = std::make_shared<ov::op::v9::GenerateProposals>(im_info, new_anchors, deltas, scores, attrs);
+    const auto proposals = std::make_shared<v9::GenerateProposals>(im_info, new_anchors, deltas, scores, attrs);
 
     return proposals->outputs();
 }
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/group_norm.cpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/group_norm.cpp
index 585084e9409ba9..c59dc2b2f36885 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/group_norm.cpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/group_norm.cpp
@@ -4,14 +4,12 @@
 
 #include "op/org.openvinotoolkit/group_norm.hpp"
 
-#include "default_opset.hpp"
-#include "ngraph/node.hpp"
-#include "ngraph/opsets/opset5.hpp"
 #include "onnx_import/core/node.hpp"
 #include "openvino/frontend/exception.hpp"
-#include "openvino/opsets/opset12.hpp"
-#include "utils/common.hpp"
-#include "utils/reshape.hpp"
+#include "openvino/op/group_normalization.hpp"
+#include "openvino/op/squeeze.hpp"
+
+using namespace ov::op;
 
 namespace ngraph {
 namespace onnx_import {
@@ -30,13 +28,13 @@ OutputVector group_norm(const Node& node) {
     float eps = node.get_attribute_value<float>("eps", 1e-6f);
 
     if (!scale.get_partial_shape().rank().compatible(1)) {
-        scale = std::make_shared<default_opset::Squeeze>(scale);
+        scale = std::make_shared<v0::Squeeze>(scale);
     }
     if (!bias.get_partial_shape().rank().compatible(1)) {
-        bias = std::make_shared<default_opset::Squeeze>(bias);
+        bias = std::make_shared<v0::Squeeze>(bias);
     }
 
-    return {std::make_shared<ov::opset12::GroupNormalization>(data, scale, bias, num_groups, eps)};
+    return {std::make_shared<v12::GroupNormalization>(data, scale, bias, num_groups, eps)};
 }
 
 }  // namespace set_1
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/group_norm.hpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/group_norm.hpp
index 46ab07f27fa077..a7bb55652db67a 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/group_norm.hpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/group_norm.hpp
@@ -7,7 +7,6 @@
 #include "openvino/core/deprecated.hpp"
 OPENVINO_SUPPRESS_DEPRECATED_START
 
-#include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
 
 namespace ngraph {
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/normalize.cpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/normalize.cpp
index dd82e4cc68d501..7c54595a27141b 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/normalize.cpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/normalize.cpp
@@ -4,12 +4,16 @@
 
 #include "op/org.openvinotoolkit/normalize.hpp"
 
-#include "default_opset.hpp"
-#include "ngraph/op/normalize_l2.hpp"
 #include "openvino/frontend/exception.hpp"
+#include "openvino/op/constant.hpp"
+#include "openvino/op/multiply.hpp"
+#include "openvino/op/normalize_l2.hpp"
+#include "openvino/op/reshape.hpp"
 #include "openvino/op/util/op_types.hpp"
 #include "utils/common.hpp"
 
+using namespace ov::op;
+
 namespace ngraph {
 namespace onnx_import {
 namespace op {
@@ -23,7 +27,7 @@ OutputVector normalize(const Node& node) {
     int64_t across_spatial = node.get_attribute_value<int64_t>("across_spatial", 0);
     int64_t channel_shared = node.get_attribute_value<int64_t>("channel_shared", 0);
 
-    std::shared_ptr<ngraph::Node> weights;
+    std::shared_ptr<ov::Node> weights;
     if (channel_shared) {
         FRONT_END_GENERAL_CHECK(ov::op::util::is_constant(inputs[1].get_node()),
                                 "Weights input must be a constant if channel_shared is set to 1");
@@ -42,24 +46,23 @@ OutputVector normalize(const Node& node) {
         for (int64_t i = 2; i < data_shape.rank().get_length(); ++i) {
             weights_shape.push_back(1);
         }
-        auto new_shape =
-            std::make_shared<default_opset::Constant>(element::i64, Shape{weights_shape.size()}, weights_shape);
-        weights = std::make_shared<default_opset::Reshape>(inputs[1], new_shape, true);
+        auto new_shape = std::make_shared<v0::Constant>(element::i64, Shape{weights_shape.size()}, weights_shape);
+        weights = std::make_shared<v1::Reshape>(inputs[1], new_shape, true);
     }
 
-    std::shared_ptr<ngraph::Node> axes;
+    std::shared_ptr<ov::Node> axes;
     if (!across_spatial) {
-        axes = std::make_shared<default_opset::Constant>(element::i64, Shape{1}, std::vector<int64_t>{1});
+        axes = std::make_shared<v0::Constant>(element::i64, Shape{1}, std::vector<int64_t>{1});
     } else {
         axes = common::get_monotonic_range_along_node_rank(data, 1);
     }
 
-    return {std::make_shared<default_opset::Multiply>(
-        std::make_shared<default_opset::NormalizeL2>(data, axes, eps, ngraph::op::EpsMode::ADD),
-        weights)};
+    return {std::make_shared<v1::Multiply>(std::make_shared<v0::NormalizeL2>(data, axes, eps, ov::op::EpsMode::ADD),
+                                           weights)};
 }
 
 }  // namespace set_1
+
 }  // namespace op
 
 }  // namespace onnx_import
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/normalize.hpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/normalize.hpp
index a265980052bd02..f47929a97b636d 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/normalize.hpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/normalize.hpp
@@ -7,7 +7,6 @@
 #include "openvino/core/deprecated.hpp"
 OPENVINO_SUPPRESS_DEPRECATED_START
 
-#include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
 
 namespace ngraph {
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/prior_box.cpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/prior_box.cpp
index d5a0fe303b1b5f..63c26e61c9f4fd 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/prior_box.cpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/prior_box.cpp
@@ -4,27 +4,30 @@
 
 #include "ngraph/op/prior_box.hpp"
 
-#include "default_opset.hpp"
 #include "exceptions.hpp"
-#include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
 #include "op/org.openvinotoolkit/prior_box.hpp"
 #include "openvino/frontend/exception.hpp"
+#include "openvino/op/constant.hpp"
+#include "openvino/op/prior_box.hpp"
+#include "openvino/op/prior_box_clustered.hpp"
+#include "openvino/op/shape_of.hpp"
+#include "openvino/op/strided_slice.hpp"
+#include "openvino/op/unsqueeze.hpp"
+
+using namespace ov::op;
 
 namespace ngraph {
 namespace onnx_import {
 namespace op {
 namespace detail {
 namespace {
-std::shared_ptr<default_opset::StridedSlice> make_slice(std::shared_ptr<ngraph::Node> node,
-                                                        int64_t start,
-                                                        int64_t end) {
-    return std::make_shared<default_opset::StridedSlice>(
-        node,
-        default_opset::Constant::create(element::i64, Shape{1}, std::vector<int64_t>{start}),
-        default_opset::Constant::create(element::i64, Shape{1}, std::vector<int64_t>{end}),
-        std::vector<int64_t>{0},   // begin mask
-        std::vector<int64_t>{0});  // end mask
+std::shared_ptr<v1::StridedSlice> make_slice(std::shared_ptr<ov::Node> node, int64_t start, int64_t end) {
+    return std::make_shared<v1::StridedSlice>(node,
+                                              v0::Constant::create(element::i64, Shape{1}, std::vector<int64_t>{start}),
+                                              v0::Constant::create(element::i64, Shape{1}, std::vector<int64_t>{end}),
+                                              std::vector<int64_t>{0},   // begin mask
+                                              std::vector<int64_t>{0});  // end mask
 }
 }  // namespace
 }  // namespace detail
@@ -34,12 +37,12 @@ OutputVector prior_box(const Node& node) {
     auto inputs = node.get_ng_inputs();
     FRONT_END_GENERAL_CHECK(inputs.size() == 2, "Invalid number of inputs");
 
-    auto output_shape = std::make_shared<default_opset::ShapeOf>(inputs[0]);
-    auto image_shape = std::make_shared<default_opset::ShapeOf>(inputs[1]);
+    auto output_shape = std::make_shared<v3::ShapeOf>(inputs[0]);
+    auto image_shape = std::make_shared<v3::ShapeOf>(inputs[1]);
     auto output_shape_slice = detail::make_slice(output_shape, 2, 4);
     auto image_shape_slice = detail::make_slice(image_shape, 2, 4);
 
-    ngraph::op::v8::PriorBox::Attributes attrs;
+    ov::op::v8::PriorBox::Attributes attrs;
     attrs.min_size = node.get_attribute_value<std::vector<float>>("min_size", {});
     attrs.max_size = node.get_attribute_value<std::vector<float>>("max_size", {});
     attrs.aspect_ratio = node.get_attribute_value<std::vector<float>>("aspect_ratio", {});
@@ -54,11 +57,11 @@ OutputVector prior_box(const Node& node) {
     attrs.density = node.get_attribute_value<std::vector<float>>("density", {});
     attrs.min_max_aspect_ratios_order = node.get_attribute_value<int64_t>("min_max_aspect_ratios_order", 1);
 
-    auto axes = default_opset::Constant::create(element::i64, Shape{1}, std::vector<int64_t>{0});
+    auto axes = v0::Constant::create(element::i64, Shape{1}, std::vector<int64_t>{0});
 
-    return {std::make_shared<default_opset::Unsqueeze>(
-        std::make_shared<ngraph::op::v8::PriorBox>(output_shape_slice, image_shape_slice, attrs),
-        axes)};
+    return {
+        std::make_shared<v0::Unsqueeze>(std::make_shared<v8::PriorBox>(output_shape_slice, image_shape_slice, attrs),
+                                        axes)};
 }
 
 OutputVector prior_box_clustered(const Node& node) {
@@ -78,12 +81,12 @@ OutputVector prior_box_clustered(const Node& node) {
                      image_shape_rank,
                      " (should be 4)");
 
-    auto output_shape = std::make_shared<default_opset::ShapeOf>(inputs[0]);
-    auto image_shape = std::make_shared<default_opset::ShapeOf>(inputs[1]);
+    auto output_shape = std::make_shared<v3::ShapeOf>(inputs[0]);
+    auto image_shape = std::make_shared<v3::ShapeOf>(inputs[1]);
     auto output_shape_slice = detail::make_slice(output_shape, 2, 4);
     auto image_shape_slice = detail::make_slice(image_shape, 2, 4);
 
-    default_opset::PriorBoxClustered::Attributes attrs{};
+    v0::PriorBoxClustered::Attributes attrs{};
     attrs.widths = node.get_attribute_value<std::vector<float>>("width");
     attrs.heights = node.get_attribute_value<std::vector<float>>("height");
     attrs.clip = static_cast<bool>(node.get_attribute_value<int64_t>("clip", 0));
@@ -93,10 +96,10 @@ OutputVector prior_box_clustered(const Node& node) {
     attrs.step = node.get_attribute_value<float>("step", 0.0f);
     attrs.offset = node.get_attribute_value<float>("offset", 0.0f);
 
-    auto axes = default_opset::Constant::create(element::i64, Shape{1}, std::vector<int64_t>{0});
+    auto axes = v0::Constant::create(element::i64, Shape{1}, std::vector<int64_t>{0});
 
-    return {std::make_shared<default_opset::Unsqueeze>(
-        std::make_shared<default_opset::PriorBoxClustered>(output_shape_slice, image_shape_slice, attrs),
+    return {std::make_shared<v0::Unsqueeze>(
+        std::make_shared<v0::PriorBoxClustered>(output_shape_slice, image_shape_slice, attrs),
         axes)};
 }
 
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/prior_box.hpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/prior_box.hpp
index 9bf1db0d9bf276..3e24fb25b3d8d5 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/prior_box.hpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/prior_box.hpp
@@ -7,7 +7,6 @@
 #include "openvino/core/deprecated.hpp"
 OPENVINO_SUPPRESS_DEPRECATED_START
 
-#include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
 
 namespace ngraph {
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/swish.cpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/swish.cpp
index 6aefa4c6032e68..da94cd72810b20 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/swish.cpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/swish.cpp
@@ -4,12 +4,13 @@
 
 #include "op/org.openvinotoolkit/swish.hpp"
 
-#include "default_opset.hpp"
-#include "ngraph/op/normalize_l2.hpp"
-#include "op/org.openvinotoolkit/normalize.hpp"
+#include "openvino/op/constant.hpp"
+#include "openvino/op/swish.hpp"
 #include "utils/common.hpp"
 #include "utils/reshape.hpp"
 
+using namespace ov::op;
+
 namespace ngraph {
 namespace onnx_import {
 namespace op {
@@ -17,14 +18,14 @@ namespace set_1 {
 OutputVector swish(const Node& node) {
     OutputVector ng_inputs{node.get_ng_inputs()};
 
-    Output<ngraph::Node> beta;
+    Output<ov::Node> beta;
     if (ng_inputs.size() > 1) {
         beta = ngraph::onnx_import::reshape::interpret_as_scalar(ng_inputs.at(1));
     } else {
-        beta = default_opset::Constant::create(element::f32, Shape{}, {1.0});
+        beta = v0::Constant::create(element::f32, Shape{}, {1.0});
     }
 
-    return {std::make_shared<default_opset::Swish>(ng_inputs.at(0), beta)};
+    return {std::make_shared<v4::Swish>(ng_inputs.at(0), beta)};
 }
 
 }  // namespace set_1
diff --git a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/swish.hpp b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/swish.hpp
index 0b89434bed01f5..4288e8162032dc 100644
--- a/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/swish.hpp
+++ b/src/frontends/onnx/frontend/src/op/org.openvinotoolkit/swish.hpp
@@ -9,7 +9,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START
 
 #include <memory>
 
-#include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
 
 namespace ngraph {