Merge pull request #1531 from openvinotoolkit/revert-1524-fix/kgeneral/rm_cpu_layer_check

Revert "fix #38545 remove CPU network layer check for py demos"

Author: vladimir-dudnik

demos/python_demos/asl_recognition_demo/asl_recognition_demo/common.py

@@ -37,6 +37,12 @@ def __init__(self, model_path, device, ie_core, num_requests, output_shape=None)
         self.net = ie_core.read_network(model_path + ".xml", model_path + ".bin")
         assert len(self.net.input_info) == 1, "One input is expected"
 
+        supported_layers = ie_core.query_network(self.net, device)
+        not_supported_layers = [l for l in self.net.layers.keys() if l not in supported_layers]
+        if len(not_supported_layers) > 0:
+            raise RuntimeError("Following layers are not supported by the {} plugin:\n {}"
+                               .format(device, ', '.join(not_supported_layers)))
+
         self.exec_net = ie_core.load_network(network=self.net,
                                              device_name=device,
                                              num_requests=num_requests)

demos/python_demos/instance_segmentation_demo/instance_segmentation_demo.py

@@ -133,6 +133,16 @@ def main():
     log.info('Loading network')
     net = ie.read_network(args.model, os.path.splitext(args.model)[0] + '.bin')
 
+    if 'CPU' in args.device:
+        supported_layers = ie.query_network(net, 'CPU')
+        not_supported_layers = [l for l in net.layers.keys() if l not in supported_layers]
+        if len(not_supported_layers) != 0:
+            log.error('Following layers are not supported by the plugin for specified device {}:\n {}'.
+                      format(args.device, ', '.join(not_supported_layers)))
+            log.error("Please try to specify cpu extensions library path in sample's command line parameters using -l "
+                      "or --cpu_extension command line argument")
+            sys.exit(1)
+
     required_input_keys = {'im_data', 'im_info'}
     assert required_input_keys == set(net.input_info), \
         'Demo supports only topologies with the following input keys: {}'.format(', '.join(required_input_keys))

demos/python_demos/monodepth_demo/monodepth_demo.py

@@ -17,10 +17,10 @@ def main():
         "-m", "--model", help="Required. Path to an .xml file with a trained model", required=True, type=str)
     parser.add_argument(
         "-i", "--input", help="Required. Path to a input image file", required=True, type=str)
-    parser.add_argument("-l", "--cpu_extension",
+    parser.add_argument("-l", "--cpu_extension", 
         help="Optional. Required for CPU custom layers. Absolute MKLDNN (CPU)-targeted custom layers. "
         "Absolute path to a shared library with the kernels implementations", type=str, default=None)
-    parser.add_argument("-d", "--device",
+    parser.add_argument("-d", "--device", 
         help="Optional. Specify the target device to infer on; CPU, GPU, FPGA, HDDL or MYRIAD is acceptable. "
         "Sample will look for a suitable plugin for device specified. Default value is CPU", default="CPU", type=str)
 
@@ -38,6 +38,18 @@ def main():
     log.info("Loading network")
     net = ie.read_network(args.model, os.path.splitext(args.model)[0] + ".bin")
 
+    if "CPU" in args.device:
+        supported_layers = ie.query_network(net, "CPU")
+        not_supported_layers = [
+            l for l in net.layers.keys() if l not in supported_layers]
+
+        if len(not_supported_layers) != 0:
+            log.error("Following layers are not supported by the plugin for specified device {}:\n {}".
+                      format(args.device, ', '.join(not_supported_layers)))
+            log.error("Please try to specify a CPU extensions library path in sample's command line parameters "
+                      "using -l or --cpu_extension command line argument")
+            sys.exit(1)
+
     assert len(net.input_info) == 1, "Sample supports only single input topologies"
     assert len(net.outputs) == 1, "Sample supports only single output topologies"
 
@@ -57,7 +69,7 @@ def main():
         log.info("Image is resized from {} to {}".format(
             image.shape[:-1], (height, width)))
         image = cv2.resize(image, (width, height), cv2.INTER_CUBIC)
-
+    
     # prepare input
     image = image.astype(np.float32)
     image = image.transpose((2, 0, 1))

demos/python_demos/multi_camera_multi_target_tracking/utils/ie_tools.py

@@ -69,6 +69,16 @@ def load_ie_model(ie, model_xml, device, plugin_dir, cpu_extension='', num_reqs=
     log.info("Loading network")
     net = ie.read_network(model_xml, os.path.splitext(model_xml)[0] + ".bin")
 
+    if "CPU" in device:
+        supported_layers = ie.query_network(net, "CPU")
+        not_supported_layers = [l for l in net.layers.keys() if l not in supported_layers]
+        if not_supported_layers:
+            log.error("Following layers are not supported by the plugin for specified device %s:\n %s",
+                      device, ', '.join(not_supported_layers))
+            log.error("Please try to specify cpu extensions library path in sample's command line parameters using -l "
+                      "or --cpu_extension command line argument")
+            sys.exit(1)
+
     assert len(net.input_info) == 1 or len(net.input_info) == 2, \
         "Supports topologies with only 1 or 2 inputs"
     assert len(net.outputs) == 1 or len(net.outputs) == 4 or len(net.outputs) == 5, \

demos/python_demos/object_detection_demo_ssd_async/object_detection_demo_ssd_async.py

@@ -111,6 +111,16 @@ def main():
     log.info("Loading network")
     net = ie.read_network(args.model, os.path.splitext(args.model)[0] + ".bin")
 
+    if "CPU" in args.device:
+        supported_layers = ie.query_network(net, "CPU")
+        not_supported_layers = [l for l in net.layers.keys() if l not in supported_layers]
+        if len(not_supported_layers) != 0:
+            log.error("Following layers are not supported by the plugin for specified device {}:\n {}".
+                      format(args.device, ', '.join(not_supported_layers)))
+            log.error("Please try to specify cpu extensions library path in sample's command line parameters using -l "
+                      "or --cpu_extension command line argument")
+            sys.exit(1)
+
     img_info_input_blob = None
     feed_dict = {}
     for blob_name in net.input_info:

demos/python_demos/object_detection_demo_yolov3_async/object_detection_demo_yolov3_async.py

@@ -319,9 +319,20 @@ def main():
     log.info("Loading network")
     net = ie.read_network(args.model, os.path.splitext(args.model)[0] + ".bin")
 
+    # ---------------------------------- 3. Load CPU extension for support specific layer ------------------------------
+    if "CPU" in args.device:
+        supported_layers = ie.query_network(net, "CPU")
+        not_supported_layers = [l for l in net.layers.keys() if l not in supported_layers]
+        if len(not_supported_layers) != 0:
+            log.error("Following layers are not supported by the plugin for specified device {}:\n {}".
+                      format(args.device, ', '.join(not_supported_layers)))
+            log.error("Please try to specify cpu extensions library path in sample's command line parameters using -l "
+                      "or --cpu_extension command line argument")
+            sys.exit(1)
+
     assert len(net.input_info) == 1, "Sample supports only YOLO V3 based single input topologies"
 
-    # ---------------------------------------------- 3. Preparing inputs -----------------------------------------------
+    # ---------------------------------------------- 4. Preparing inputs -----------------------------------------------
     log.info("Preparing inputs")
     input_blob = next(iter(net.input_info))
 
@@ -345,7 +356,7 @@ def main():
     cap = cv2.VideoCapture(input_stream)
     wait_key_time = 1
 
-    # ----------------------------------------- 4. Loading model to the plugin -----------------------------------------
+    # ----------------------------------------- 5. Loading model to the plugin -----------------------------------------
     log.info("Loading model to the plugin")
     exec_nets = {}
 
@@ -364,7 +375,7 @@ def main():
     event = threading.Event()
     callback_exceptions = []
 
-    # ----------------------------------------------- 5. Doing inference -----------------------------------------------
+    # ----------------------------------------------- 6. Doing inference -----------------------------------------------
     log.info("Starting inference...")
     print("To close the application, press 'CTRL+C' here or switch to the output window and press ESC key")
     print("To switch between min_latency/user_specified modes, press TAB key in the output window")

demos/python_demos/segmentation_demo/segmentation_demo.py

@@ -81,6 +81,15 @@ def main():
     log.info("Loading network")
     net = ie.read_network(args.model, os.path.splitext(args.model)[0] + ".bin")
 
+    if "CPU" in args.device:
+        supported_layers = ie.query_network(net, "CPU")
+        not_supported_layers = [l for l in net.layers.keys() if l not in supported_layers]
+        if len(not_supported_layers) != 0:
+            log.error("Following layers are not supported by the plugin for specified device {}:\n {}".
+                      format(args.device, ', '.join(not_supported_layers)))
+            log.error("Please try to specify cpu extensions library path in sample's command line parameters using -l "
+                      "or --cpu_extension command line argument")
+            sys.exit(1)
     assert len(net.input_info) == 1, "Sample supports only single input topologies"
     assert len(net.outputs) == 1, "Sample supports only single output topologies"
 

demos/python_demos/text_spotting_demo/text_spotting_demo.py

@@ -192,6 +192,16 @@ def main():
     log.info('Loading decoder part of text recognition network')
     text_dec_net = ie.read_network(args.text_dec_model, os.path.splitext(args.text_dec_model)[0] + '.bin')
 
+    if 'CPU' in args.device:
+        supported_layers = ie.query_network(mask_rcnn_net, 'CPU')
+        not_supported_layers = [l for l in mask_rcnn_net.layers.keys() if l not in supported_layers]
+        if len(not_supported_layers) != 0:
+            log.error('Following layers are not supported by the plugin for specified device {}:\n {}'.
+                      format(args.device, ', '.join(not_supported_layers)))
+            log.error("Please try to specify cpu extensions library path in sample's command line parameters using -l "
+                      "or --cpu_extension command line argument")
+            sys.exit(1)
+
     required_input_keys = {'im_data', 'im_info'}
     assert required_input_keys == set(mask_rcnn_net.input_info), \
         'Demo supports only topologies with the following input keys: {}'.format(', '.join(required_input_keys))

demos/python_demos/whiteboard_inpainting_demo/utils/ie_tools.py

@@ -68,6 +68,16 @@ def load_ie_model(self, ie, model_xml, device, cpu_extension=''):
         log.info("Loading network files:\n\t%s\n\t%s", model_xml, model_bin)
         net = ie.read_network(model=model_xml, weights=model_bin)
 
+        if "CPU" in device:
+            supported_layers = ie.query_network(net, "CPU")
+            not_supported_layers = [l for l in net.layers.keys() if l not in supported_layers]
+            if not_supported_layers:
+                log.error("Following layers are not supported by the plugin for specified device %s:\n %s",
+                          device, ', '.join(not_supported_layers))
+                log.error("Please try to specify cpu extensions library path in sample's command line parameters using -l "
+                          "or --cpu_extension command line argument")
+                sys.exit(1)
+
         assert len(net.input_info) in self.get_allowed_inputs_len(), \
             "Supports topologies with only {} inputs, but got {}" \
             .format(self.get_allowed_inputs_len(), len(net.input_info))