Skip to content

Commit 9ae26f3

Browse files
WovchenaWovchena
authored
Merge pull request #3214 from anzhella-pankratova/python_demos/remove_extensions
Python demos: remove -l, -c flags
2 parents 11b94d0 + c634395 commit 9ae26f3

File tree

17 files changed

+38
-113
lines changed

17 files changed

+38
-113
lines changed

‎demos/3d_segmentation_demo/python/3d_segmentation_demo.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,12 @@ def parse_arguments():
9696
args.add_argument('-d', '--target_device', type=str, required=False, default="CPU",
9797
help="Optional. Specify a target device to infer on: CPU, GPU. "
9898
"Use \"-d HETERO:<comma separated devices list>\" format to specify HETERO plugin.")
99-
args.add_argument('-l', '--path_to_extension', type=str, required=False, default=None,
100-
help="Required for CPU custom layers. "
101-
"Absolute path to a shared library with the kernels implementations.")
10299
args.add_argument("-nii", "--output_nifti", help="Show output inference results as raw values", default=False,
103100
action="store_true")
104101
args.add_argument('-nthreads', '--number_threads', type=int, required=False, default=None,
105102
help="Optional. Number of threads to use for inference on CPU (including HETERO cases).")
106103
args.add_argument('-s', '--shape', nargs='*', type=int, required=False, default=None,
107104
help="Optional. Specify shape for a network")
108-
args.add_argument('-c', '--path_to_cldnn_config', type=str, required=False,
109-
help="Required for GPU custom kernels. "
110-
"Absolute path to an .xml file with the kernels description.")
111105
args.add_argument('-ms', '--mri_sequence', type=mri_sequence, metavar='N1,N2,N3,N4', default=(0, 1, 2, 3),
112106
help='Optional. Transfer MRI-sequence from dataset order to the network order.')
113107
args.add_argument("--full_intensities_range", required=False, default=False, action="store_true",
@@ -250,14 +244,9 @@ def main():
250244
core = Core()
251245

252246
if 'CPU' in args.target_device:
253-
if args.path_to_extension:
254-
core.add_extension(args.path_to_extension, "CPU")
255247
if args.number_threads is not None:
256248
core.set_property("CPU", {'CPU_THREADS_NUM': str(args.number_threads)})
257-
elif 'GPU' in args.target_device:
258-
if args.path_to_cldnn_config:
259-
core.set_property("GPU", {'CONFIG_FILE': args.path_to_cldnn_config})
260-
else:
249+
elif 'GPU' not in args.target_device:
261250
raise AttributeError("Device {} do not support of 3D convolution. "
262251
"Please use CPU, GPU or HETERO:*CPU*, HETERO:*GPU*")
263252

‎demos/face_recognition_demo/python/face_recognition_demo.py

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,6 @@ def build_argparser():
102102
infer.add_argument('-d_reid', default='CPU', choices=DEVICE_KINDS,
103103
help='Optional. Target device for Face Reidentification '
104104
'model. Default value is CPU.')
105-
infer.add_argument('-l', '--cpu_lib', metavar="PATH", default='',
106-
help='Optional. For MKLDNN (CPU)-targeted custom layers, '
107-
'if any. Path to a shared library with custom '
108-
'layers implementations.')
109-
infer.add_argument('-c', '--gpu_lib', metavar="PATH", default='',
110-
help='Optional. For clDNN (GPU)-targeted custom layers, '
111-
'if any. Path to the XML file with descriptions '
112-
'of the kernels.')
113105
infer.add_argument('-v', '--verbose', action='store_true',
114106
help='Optional. Be more verbose.')
115107
infer.add_argument('-t_fd', metavar='[0..1]', type=float, default=0.6,
@@ -126,14 +118,11 @@ class FrameProcessor:
126118
QUEUE_SIZE = 16
127119

128120
def __init__(self, args):
129-
self.gpu_ext = args.gpu_lib
130121
self.allow_grow = args.allow_grow and not args.no_show
131122

132123
log.info('OpenVINO Inference Engine')
133124
log.info('\tbuild: {}'.format(get_version()))
134125
core = Core()
135-
if args.cpu_lib and 'CPU' in {args.d_fd, args.d_lm, args.d_reid}:
136-
core.add_extension(args.cpu_lib, 'CPU')
137126

138127
self.face_detector = FaceDetector(core, args.m_fd,
139128
args.fd_input_size,
@@ -144,9 +133,9 @@ def __init__(self, args):
144133
match_threshold=args.t_id,
145134
match_algo=args.match_algo)
146135

147-
self.face_detector.deploy(args.d_fd, self.get_config(args.d_fd))
148-
self.landmarks_detector.deploy(args.d_lm, self.get_config(args.d_lm), self.QUEUE_SIZE)
149-
self.face_identifier.deploy(args.d_reid, self.get_config(args.d_reid), self.QUEUE_SIZE)
136+
self.face_detector.deploy(args.d_fd)
137+
self.landmarks_detector.deploy(args.d_lm, self.QUEUE_SIZE)
138+
self.face_identifier.deploy(args.d_reid, self.QUEUE_SIZE)
150139

151140
log.debug('Building faces database using images from {}'.format(args.fg))
152141
self.faces_database = FacesDatabase(args.fg, self.face_identifier,
@@ -155,12 +144,6 @@ def __init__(self, args):
155144
self.face_identifier.set_faces_database(self.faces_database)
156145
log.info('Database is built, registered {} identities'.format(len(self.faces_database)))
157146

158-
def get_config(self, device):
159-
config = {}
160-
if device == 'GPU' and self.gpu_ext:
161-
config['CONFIG_FILE'] = self.gpu_ext
162-
return config
163-
164147
def process(self, frame):
165148
orig_image = frame.copy()
166149

‎demos/face_recognition_demo/python/ie_module.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ def __init__(self, core, model_path, model_type):
2828
self.active_requests = 0
2929
self.clear()
3030

31-
def deploy(self, device, plugin_config, max_requests=1):
31+
def deploy(self, device, max_requests=1):
3232
self.max_requests = max_requests
33-
compiled_model = self.core.compile_model(self.model, device, config=plugin_config)
33+
compiled_model = self.core.compile_model(self.model, device)
3434
self.output_tensor = compiled_model.outputs[0]
3535
self.infer_queue = AsyncInferQueue(compiled_model, self.max_requests)
3636
self.infer_queue.set_callback(self.completion_callback)

‎demos/gesture_recognition_demo/python/gesture_recognition_demo.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ def build_argparser():
8787
'or MYRIAD. The demo will look for a suitable plugin for device '
8888
'specified (by default, it is CPU).',
8989
default='CPU', type=str)
90-
args.add_argument("-l", "--cpu_extension",
91-
help="Optional. Required for CPU custom layers. Absolute path to "
92-
"a shared library with the kernels implementations.", type=str,
93-
default=None)
9490
args.add_argument('--no_show', action='store_true',
9591
help='Optional. Do not visualize inference results.')
9692

@@ -119,7 +115,7 @@ def main():
119115
if class_map is None:
120116
raise RuntimeError("Can't read {}".format(args.class_map))
121117

122-
core = load_core(args.device, args.cpu_extension)
118+
core = load_core()
123119

124120
person_detector = PersonDetector(args.detection_model, args.device, core,
125121
num_requests=2, output_shape=DETECTOR_OUTPUT_SHAPE)

‎demos/gesture_recognition_demo/python/gesture_recognition_demo/common.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@
1818
from openvino.runtime import Core, get_version, AsyncInferQueue
1919

2020

21-
def load_core(device, cpu_extension=None):
21+
def load_core():
2222
log.info('OpenVINO Inference Engine')
2323
log.info('\tbuild: {}'.format(get_version()))
24-
core = Core()
25-
if device == "CPU" and cpu_extension:
26-
core.add_extension(cpu_extension, "CPU")
27-
28-
return core
24+
return Core()
2925

3026

3127
class IEModel: # pylint: disable=too-few-public-methods

‎demos/image_retrieval_demo/python/image_retrieval_demo.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ def build_argparser():
7070
'or MYRIAD. The demo will look for a suitable plugin for device '
7171
'specified (by default, it is CPU).',
7272
default='CPU', type=str)
73-
args.add_argument("-l", "--cpu_extension",
74-
help="Optional. Required for CPU custom layers. Absolute path to "
75-
"a shared library with the kernels implementations.", type=str,
76-
default=None)
7773
args.add_argument('--no_show', action='store_true',
7874
help='Optional. Do not visualize inference results.')
7975
args.add_argument('-u', '--utilization_monitors', default='', type=str,
@@ -123,8 +119,7 @@ def main():
123119
raise RuntimeError("The input should be a video file or a numeric camera ID")
124120
frames = RoiDetectorOnVideo(cap)
125121

126-
img_retrieval = ImageRetrieval(args.model, args.device, args.gallery, INPUT_SIZE,
127-
args.cpu_extension)
122+
img_retrieval = ImageRetrieval(args.model, args.device, args.gallery, INPUT_SIZE)
128123

129124
compute_embeddings_times = []
130125
search_in_gallery_times = []

‎demos/image_retrieval_demo/python/image_retrieval_demo/image_retrieval.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@
2929
class IEModel(): # pylint: disable=too-few-public-methods
3030
""" Class that allows worknig with Inference Engine model. """
3131

32-
def __init__(self, model_path, device, cpu_extension):
32+
def __init__(self, model_path, device):
3333
log.info('OpenVINO Inference Engine')
3434
log.info('\tbuild: {}'.format(get_version()))
3535
core = Core()
36-
if cpu_extension and device == 'CPU':
37-
core.add_extension(cpu_extension, 'CPU')
3836

3937
log.info('Reading model {}'.format(model_path))
4038
self.model = core.read_model(model_path)
@@ -55,11 +53,11 @@ def predict(self, image):
5553
class ImageRetrieval:
5654
""" Class representing Image Retrieval algorithm. """
5755

58-
def __init__(self, model_path, device, gallery_path, input_size, cpu_extension):
56+
def __init__(self, model_path, device, gallery_path, input_size):
5957
self.impaths, self.gallery_classes, _, self.text_label_to_class_id = from_list(
6058
gallery_path, multiple_images_per_label=False)
6159
self.input_size = input_size
62-
self.model = IEModel(model_path, device, cpu_extension)
60+
self.model = IEModel(model_path, device)
6361
self.embeddings = self.compute_gallery_embeddings()
6462

6563
def compute_embedding(self, image):

‎demos/multi_camera_multi_target_tracking_demo/python/multi_camera_multi_target_tracking_demo.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,6 @@ def main():
234234
parser.add_argument("--no_show", help="Optional. Don't show output", action='store_true')
235235

236236
parser.add_argument('-d', '--device', type=str, default='CPU')
237-
parser.add_argument('-l', '--cpu_extension',
238-
help='MKLDNN (CPU)-targeted custom layers.Absolute \
239-
path to a shared library with the kernels impl.',
240-
type=str, default=None)
241237
parser.add_argument('-u', '--utilization_monitors', default='', type=str,
242238
help='Optional. List of monitors to show initially.')
243239

@@ -265,17 +261,17 @@ def main():
265261
object_detector = MaskRCNN(core, args.m_segmentation,
266262
config.obj_segm.trg_classes,
267263
args.t_segmentation,
268-
args.device, args.cpu_extension,
264+
args.device,
269265
capture.get_num_sources())
270266
else:
271267
object_detector = Detector(core, args.m_detector,
272268
config.obj_det.trg_classes,
273269
args.t_detector,
274-
args.device, args.cpu_extension,
270+
args.device,
275271
capture.get_num_sources())
276272

277273
if args.m_reid:
278-
object_recognizer = VectorCNN(core, args.m_reid, args.device, args.cpu_extension)
274+
object_recognizer = VectorCNN(core, args.m_reid, args.device)
279275
else:
280276
object_recognizer = None
281277

‎demos/multi_camera_multi_target_tracking_demo/python/utils/ie_tools.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
class IEModel:
2323
"""Class for inference of models in the Inference Engine format"""
24-
def __init__(self, core, model_path, device, model_type, num_reqs=1, cpu_extension=''):
25-
self.load_model(core, model_path, device, model_type, num_reqs, cpu_extension)
24+
def __init__(self, core, model_path, device, model_type, num_reqs=1):
25+
self.load_model(core, model_path, device, model_type, num_reqs)
2626
self.outputs = {}
2727

2828
def _preprocess(self, img):
@@ -57,12 +57,9 @@ def get_input_shape(self):
5757
"""Returns an input shape of the wrapped IE model"""
5858
return self.model.inputs[0].shape
5959

60-
def load_model(self, core, model_path, device, model_type, num_reqs=1, cpu_extension=''):
60+
def load_model(self, core, model_path, device, model_type, num_reqs=1):
6161
"""Loads a model in the Inference Engine format"""
62-
# Plugin initialization for specified device and load extensions library if specified
63-
if cpu_extension and 'CPU' in device:
64-
core.add_extension(cpu_extension, 'CPU')
65-
# Read IR
62+
6663
log.info('Reading {} model {}'.format(model_type, model_path))
6764
self.model = core.read_model(model_path)
6865

‎demos/multi_camera_multi_target_tracking_demo/python/utils/network_wrappers.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class Detector(IEModel, DetectorInterface):
3737
"""Wrapper class for detector"""
3838

3939
def __init__(self, core, model_path, trg_classes, conf=.6,
40-
device='CPU', ext_path='', max_num_frames=1):
41-
super().__init__(core, model_path, device, 'Object Detection', max_num_frames, ext_path)
40+
device='CPU', max_num_frames=1):
41+
super().__init__(core, model_path, device, 'Object Detection', max_num_frames)
4242

4343
self.trg_classes = trg_classes
4444
self.confidence = conf
@@ -102,9 +102,9 @@ def __decode_detections(self, out, frame_shape, only_target_class):
102102
class VectorCNN(IEModel):
103103
"""Wrapper class for a network returning a vector"""
104104

105-
def __init__(self, core, model_path, device='CPU', ext_path='', max_reqs=100):
105+
def __init__(self, core, model_path, device='CPU', max_reqs=100):
106106
self.max_reqs = max_reqs
107-
super().__init__(core, model_path, device, 'Object Reidentification', self.max_reqs, ext_path)
107+
super().__init__(core, model_path, device, 'Object Reidentification', self.max_reqs)
108108

109109
def forward(self, batch):
110110
"""Performs forward of the underlying network on a given batch"""
@@ -129,11 +129,11 @@ class MaskRCNN(DetectorInterface):
129129
"""Wrapper class for a network returning masks of objects"""
130130

131131
def __init__(self, core, model_path, trg_classes, conf=.6,
132-
device='CPU', ext_path='', max_reqs=100):
132+
device='CPU', max_reqs=100):
133133
self.trg_classes = trg_classes
134134
self.max_reqs = max_reqs
135135
self.confidence = conf
136-
super().__init__(core, model_path, device, 'Instance Segmentation', self.max_reqs, ext_path)
136+
super().__init__(core, model_path, device, 'Instance Segmentation', self.max_reqs)
137137

138138
self.input_keys = {'image'}
139139
self.output_keys = {'boxes', 'labels', 'masks'}

0 commit comments

Comments
 (0)