Revert Bitwise ops in PyTorch FE (#20813)

* revert bitwise op for PT FE * revert coverity fixes
openvinotoolkit · Nov 2, 2023 · 663bf04 · 663bf04
1 parent 3ebb8eb
commit 663bf04
Show file tree

Hide file tree

Showing 28 changed files with 131 additions and 615 deletions.
diff --git a/...ransformations/include/transformations/op_conversions/convert_bitwise_to_logical_bool.hpp b/...ransformations/include/transformations/op_conversions/convert_bitwise_to_logical_bool.hpp
diff --git a/src/common/transformations/src/transformations/common_optimizations/common_optimizations.cpp b/src/common/transformations/src/transformations/common_optimizations/common_optimizations.cpp
@@ -65,7 +65,6 @@
 #include "transformations/init_node_info.hpp"
 #include "transformations/op_conversions/batch_norm_decomposition.hpp"
 #include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp"
-#include "transformations/op_conversions/convert_bitwise_to_logical_bool.hpp"
 #include "transformations/op_conversions/convert_broadcast_to_tiles.hpp"
 #include "transformations/op_conversions/convert_convertlike.hpp"
 #include "transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp"
@@ -227,11 +226,6 @@ bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptr<ov::Model
     ADD_MATCHER(fq_fusions, MulFakeQuantizeFusion)
     fq_fusions->set_name("ov::pass::FakeQuantizeFusions");
 
-    // Temporary transformation to allow for PyTorch frontend to
-    // partially support bitwise operators with boolean inputs for plugins
-    // that didn't enabled BitwiseOps from opset13
-    REGISTER_PASS(manager, ConvertBitwiseToLogical)
-
     // StridesOptimization should be at the very end
     // because we cannot insert any MaxPools since they may prevent
     // other optimizations

diff --git a/...on/transformations/src/transformations/op_conversions/convert_bitwise_to_logical_bool.cpp b/...on/transformations/src/transformations/op_conversions/convert_bitwise_to_logical_bool.cpp
diff --git a/src/common/transformations/tests/op_conversions/convert_bitwise_to_logical_bool_test.cpp b/src/common/transformations/tests/op_conversions/convert_bitwise_to_logical_bool_test.cpp
diff --git a/src/frontends/pytorch/src/input_model.hpp b/src/frontends/pytorch/src/input_model.hpp
@@ -17,7 +17,7 @@ class Place;
 class TorchDecoder;
 
 struct PlaceDesc {
-    PlaceDesc(const std::shared_ptr<Node>& value) : m_value(value) {}
+    PlaceDesc(std::shared_ptr<Node> value) : m_value(value) {}
     std::shared_ptr<Node> m_value;
 };
 

diff --git a/src/frontends/pytorch/src/op/avg_poolnd.cpp b/src/frontends/pytorch/src/op/avg_poolnd.cpp
@@ -60,8 +60,7 @@ OutputVector translate_avg_poolnd(const NodeContext& context) {
         auto pads_len = context.mark_node(v0::Constant::create(element::i32, Shape{}, {pads.size()}));
         auto pads_diff = context.mark_node(std::make_shared<v1::Subtract>(rank, pads_len));
         auto pads_remaining = context.mark_node(std::make_shared<v3::Broadcast>(zero_i32, pads_diff));
-        auto padding = context.mark_node(
-            std::make_shared<v0::Concat>(OutputVector{std::move(pads_remaining), std::move(pad_values)}, 0));
+        auto padding = context.mark_node(std::make_shared<v0::Concat>(OutputVector{pads_remaining, pad_values}, 0));
         input = context.mark_node(std::make_shared<v1::Pad>(input, padding, padding, zero, ov::op::PadMode::CONSTANT));
         pads = Shape(pads.size(), 0);
     }