Merge pull request #3632 from eaidova/ea/mo_deprecated

OMZ comverter: remove deprecated mo parameters usage

Author: Wovchena

models/public/mozilla-deepspeech-0.6.1/model.yml

@@ -45,6 +45,5 @@ model_optimizer_args:
   - --input_model=$dl_dir/deepspeech-0.6.1-models/output_graph.pb
   - --freeze_placeholder_with_value=input_lengths->[16]
   - --output=logits,cudnn_lstm/rnn/multi_rnn_cell/cell_0/cudnn_compatible_lstm_cell/GatherNd,cudnn_lstm/rnn/multi_rnn_cell/cell_0/cudnn_compatible_lstm_cell/GatherNd_1
-  - --disable_nhwc_to_nchw
 framework: tf
 license: https://raw.githubusercontent.com/mozilla/DeepSpeech/master/LICENSE

models/public/mozilla-deepspeech-0.8.2/model.yml

@@ -46,6 +46,5 @@ model_optimizer_args:
   - --input_model=$conv_dir/deepspeech-0.8.2-models.pb
   - --freeze_placeholder_with_value=input_lengths->[16]
   - --output=logits,cudnn_lstm/rnn/multi_rnn_cell/cell_0/cudnn_compatible_lstm_cell/GatherNd,cudnn_lstm/rnn/multi_rnn_cell/cell_0/cudnn_compatible_lstm_cell/GatherNd_1
-  - --disable_nhwc_to_nchw
 framework: tf
 license: https://raw.githubusercontent.com/mozilla/DeepSpeech/master/LICENSE

tools/model_tools/src/openvino/model_zoo/omz_converter.py

@@ -125,10 +125,11 @@ def convert(reporter, model, output_dir, args, mo_props, requested_precisions):
             expanded_mo_args.append('--layout={}'.format(layout_string))
         if shape_string:
             expanded_mo_args.append('--input_shape={}'.format(shape_string))
+        if data_type == "FP16":
+            expanded_mo_args.append("--compress_to_fp16")
 
         mo_cmd = [*mo_props.cmd_prefix,
             '--framework={}'.format(model_format),
-            '--data_type={}'.format(data_type),
             '--output_dir={}'.format(output_dir / model.subdirectory / model_precision),
             '--model_name={}'.format(model.name),
             '--input={}'.format(','.join(input.name for input in model.input_info)),