Expanded set of suffixes for outputs in postprocess_output_name by regular expression (#3453)

Author: Anna Grebneva

tools/accuracy_checker/openvino/tools/accuracy_checker/adapters/adapter.py

@@ -51,7 +51,7 @@ def process(self, raw, identifiers, frame_meta):
     def configure(self):
         pass
 
-    def check_output_name(self, output_name, outputs, suffix=('/sink_port_0', ':0')):
+    def check_output_name(self, output_name, outputs, suffix=('/sink_port_', ':')):
         return postprocess_output_name(
             output_name, outputs, suffix, self.additional_output_mapping, raise_error=False)
 

tools/accuracy_checker/openvino/tools/accuracy_checker/utils.py

@@ -23,6 +23,7 @@
 import struct
 import sys
 import zlib
+import re
 from enum import Enum
 
 from pathlib import Path
@@ -939,7 +940,7 @@ def parse_partial_shape(partial_shape):
 
 
 def postprocess_output_name(
-    output_name, outputs, suffix=('/sink_port_0', ':0', '/sink_port_1'), additional_mapping=None, raise_error=True
+    output_name, outputs, suffix=('/sink_port_', ':'), additional_mapping=None, raise_error=True
 ):
     suffixes = [suffix] if isinstance(suffix, str) else suffix
     outputs = outputs[0] if isinstance(outputs, list) else outputs
@@ -948,10 +949,12 @@ def postprocess_output_name(
     if additional_mapping and output_name in additional_mapping:
         return additional_mapping[output_name]
     for suffix_ in suffixes:
-        if suffix_ in output_name:
-            preprocessed_output_name = output_name.replace(suffix_, '')
+        matches = re.findall(r'{}\d+'.format(suffix_), output_name)
+        if matches:
+            preprocessed_output_name = output_name.replace(matches[0], '')
         else:
-            preprocessed_output_name = '{}{}'.format(output_name, suffix_)
+            suffix_regex = re.compile(output_name + suffix_ + r'\d+')
+            preprocessed_output_name = [layer_name for layer_name in outputs if suffix_regex.match(layer_name)][0]
         if preprocessed_output_name in outputs:
             return preprocessed_output_name
     if raise_error: