@@ -351,7 +351,8 @@ def _parse_inputs_config(self, inputs_entry, default_layout='NCHW', precisions_l
351
351
value = re .compile (value ) if not isinstance (value , int ) else value
352
352
non_constant_inputs_mapping [name ] = value
353
353
layout = input_ .get ('layout' , layouts_info .get (name , default_layout ))
354
- layouts [name ] = LAYER_LAYOUT_TO_IMAGE_LAYOUT [layout ]
354
+ if layout in LAYER_LAYOUT_TO_IMAGE_LAYOUT :
355
+ layouts [name ] = LAYER_LAYOUT_TO_IMAGE_LAYOUT [layout ]
355
356
self .get_layer_precision (input_ , name , precision_info , precisions )
356
357
357
358
all_config_inputs = (
@@ -364,9 +365,10 @@ def _parse_inputs_config(self, inputs_entry, default_layout='NCHW', precisions_l
364
365
non_constant_inputs = not_config_inputs + config_non_constant_inputs
365
366
if not_config_inputs and (precision_info or isinstance (precision_info , defaultdict )) or layouts_info :
366
367
inputs_entry = self .provide_input_config_for_not_config (
367
- inputs_entry , precision_info , not_config_inputs , precisions , layouts_info
368
+ inputs_entry , precision_info , not_config_inputs , precisions , layouts_info , layouts
368
369
)
369
370
371
+
370
372
return (
371
373
constant_inputs ,
372
374
non_constant_inputs ,
@@ -513,11 +515,14 @@ def get_layer_precision(input_config, input_name, precision_info, precisions):
513
515
precisions [input_name ] = input_precision
514
516
return input_precision
515
517
516
- def provide_input_config_for_not_config (self , inputs_entry , precision_info , not_config_inputs , precisions , layouts ):
518
+ def provide_input_config_for_not_config (
519
+ self , inputs_entry , precision_info , not_config_inputs , precisions , layouts , layouts_mapping ):
517
520
for input_name in not_config_inputs :
518
521
input_config = {'name' : input_name , 'type' : 'INPUT' }
519
522
precision = self .get_layer_precision (input_config , input_name , precision_info , precisions )
520
523
layout = layouts .get (input_name )
524
+ if layout in LAYER_LAYOUT_TO_IMAGE_LAYOUT :
525
+ layouts_mapping [input_name ] = LAYER_LAYOUT_TO_IMAGE_LAYOUT [layout ]
521
526
input_config ['layout' ] = layout
522
527
if precision is not None or layout is not None :
523
528
inputs_entry .append (input_config )
0 commit comments