Fix image_retrieval_demo (#3329)

* fix demo

* uncomment test for demo

* add check for nchw layout

Author: Aleksei Korobeinikov

demos/image_retrieval_demo/python/image_retrieval_demo/image_retrieval.py

@@ -1,5 +1,5 @@
 """
- Copyright (c) 2019-2021 Intel Corporation
+ Copyright (c) 2019-2022 Intel Corporation
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -45,7 +45,8 @@ def __init__(self, model_path, device):
     def predict(self, image):
         ''' Takes input image and returns L2-normalized embedding vector. '''
 
-        image = np.transpose(image, (0, 3, 1, 2))
+        if self.model.input(self.input_tensor_name).shape[1] == 3:
+            image = np.transpose(image, (0, 3, 1, 2))
         input_data = {self.input_tensor_name: image}
         return self.infer_request.infer(input_data)[self.output_tensor]
 

demos/tests/cases.py

@@ -18,7 +18,7 @@
 
 from args import (
     DataDirectoryArg, DataDirectoryOrigFileNamesArg, DataPatternArg,
-    ModelArg, ModelFileArg, OMZ_DIR, TestDataArg, image_net_arg, # image_retrieval_arg
+    ModelArg, ModelFileArg, OMZ_DIR, TestDataArg, image_net_arg, image_retrieval_arg
 )
 from data_sequences import DATA_SEQUENCES
 
@@ -996,14 +996,13 @@ def single_option_cases(key, *args):
                           '-ar': None})
     )),
 
-    # TODO: Put image_retrieval_arg import back
-    #PythonDemo(name='image_retrieval_demo', device_keys=['-d'], test_cases=combine_cases(
-    #    TestCase(options={'--no_show': None,
-    #                      **MONITORS,
-    #                      '-m': ModelArg('image-retrieval-0001')}),
-    #    single_option_cases('-i', *DATA_SEQUENCES['image-retrieval-video']),
-    #    single_option_cases('-g', image_retrieval_arg('gallery.txt')),
-    #)),
+    PythonDemo(name='image_retrieval_demo', device_keys=['-d'], test_cases=combine_cases(
+       TestCase(options={'--no_show': None,
+                         **MONITORS,
+                         '-m': ModelArg('image-retrieval-0001')}),
+       single_option_cases('-i', *DATA_SEQUENCES['image-retrieval-video']),
+       single_option_cases('-g', image_retrieval_arg('gallery.txt')),
+    )),
 
     # TODO: enable tests when FP16-INT8 will work
     # PythonDemo(name='instance_segmentation_demo', device_keys=['-d'], test_cases=combine_cases(