Fixed two bugs: with incorrect list packing in the new functionality, and with broken TupleUnpack in old functionality.

Author: slyalin

src/bindings/python/src/openvino/frontend/pytorch/inlined_extension.py

@@ -15,6 +15,8 @@ def __init__(self, value):
         self.value = value
     def __eq__(self, x):
         return self.value == x
+    def __repr__(self):
+        return f'ConstWrap({str(self.value)})'
 
 
 def unpack(packed, types, index=0):
@@ -29,6 +31,7 @@ def unpack(packed, types, index=0):
         packer_result = []
         for el in packed:
             unpacked, packer, index = unpack(el, types, index)
+            unpacked_result += unpacked
             packer_result.append(packer)
     elif isinstance(packed, dict):
         packer_result = {}
@@ -175,7 +178,9 @@ def pack_outputs(result):
         @staticmethod
         def convert(node_context):
             inputs = [node_context.get_input(i) for i in range(node_context.get_input_size())]
-            return __class__.op(*inputs, **op_attrs).outputs()
+            node = __class__.op(*inputs, **op_attrs)
+            node.get_rt_info()['__torch_tuple_unpackable__'] = True  # to trigger prim::TupleUnpack bypass in PyTorch FrontEnd transformation
+            return node.outputs()
 
     return Trampoline
 

src/frontends/pytorch/src/transforms/tuple_unpack_replacer.cpp

@@ -29,9 +29,9 @@ PrimTupleUnpackReplacer::PrimTupleUnpackReplacer() {
         auto input_node = tuple_unpack->get_input_node_shared_ptr(0);
         auto tuple_construct = cast_fw_node(input_node, "prim::TupleConstruct");
         if (!tuple_construct) {
-            if(!ov::as_type_ptr<ov::op::util::FrameworkNode>(input_node)) {
-                // remove TupleUnpack just bypassing it with all outputs from any op except FrameworkNode
-                // We are leaving FrameworkNode case for further processing
+            if(input_node->get_rt_info().count("__torch_tuple_unpackable__")) {
+                input_node->get_rt_info().erase("__torch_tuple_unpackable__");
+                // remove TupleUnpack just bypassing it with all outputs from a custom operation which returns tuple
                 replace_node(tuple_unpack, input_node->outputs());
                 return true;
             }