add layouts for remained public models (#3186)

Author: eaidova

models/public/deeplabv3/model.yml

@@ -30,7 +30,7 @@ model_optimizer_args:
   - --reverse_input_channels
   - --input_shape=[1,513,513,3]
   - --input=1:mul_1
-  # - --layout=1:mul_1(NHWC)
+  - --layout=1:mul_1(NHWC)
   - --output=ArgMax
   - --input_model=$dl_dir/deeplabv3_mnv2_pascal_train_aug/frozen_inference_graph.pb
 framework: tf

models/public/efficientdet-d0-tf/model.yml

@@ -117,7 +117,7 @@ postprocessing:
 model_optimizer_args:
   - --input_shape=[1,512,512,3]
   - --input=image_arrays
-  # - --layout=image_arrays(NHWC)
+  - --layout=image_arrays(NHWC)
   - --reverse_input_channels
   - --input_model=$conv_dir/efficientdet-d0_saved_model/efficientdet-d0_frozen.pb
   - --transformations_config=$mo_ext_dir/front/tf/automl_efficientdet.json

models/public/efficientdet-d1-tf/model.yml

@@ -117,7 +117,7 @@ postprocessing:
 model_optimizer_args:
   - --input_shape=[1,640,640,3]
   - --input=image_arrays
-  # - --layout=image_arrays(NHWC)
+  - --layout=image_arrays(NHWC)
   - --reverse_input_channels
   - --input_model=$conv_dir/efficientdet-d1_saved_model/efficientdet-d1_frozen.pb
   - --transformations_config=$mo_ext_dir/front/tf/automl_efficientdet.json

models/public/efficientnet-b0/model.yml

@@ -32,7 +32,7 @@ postprocessing:
 model_optimizer_args:
   - --input_shape=[1,224,224,3]
   - --input=0:sub
-  # - --layout=0:sub(NHWC)
+  - --layout=0:sub(NHWC)
   - --output=logits
   - --input_meta_graph=$dl_dir/efficientnet-b0/model.ckpt.meta
   - --reverse_input_channels

models/public/efficientnet-v2-b0/model.yml

@@ -49,6 +49,7 @@ conversion_to_onnx_args:
 model_optimizer_args:
   - --input_shape=[1,3,224,224]
   - --input=input
+  - --layout=input(NCHW)
   - --input_model=$conv_dir/efficientnet-v2-b0.onnx
   - --mean_values=input[123.675,116.28,103.53]
   - --scale_values=input[58.395,57.12,57.375]

models/public/efficientnet-v2-s/model.yml

@@ -50,6 +50,7 @@ model_optimizer_args:
   - --input_shape=[1,3,384,384]
   - --input=input
   - --input_model=$conv_dir/efficientnet-v2-s.onnx
+  - --layout=input(NCHW)
   - --mean_values=input[127.5,127.5,127.5]
   - --scale_values=input[127.5,127.5,127.5]
   - --reverse_input_channels

models/public/facenet-20180408-102900/model.yml

@@ -33,7 +33,7 @@ model_optimizer_args:
   - --reverse_input_channels
   - --input_shape=[1,160,160,3],[1]
   - --input=image_batch,phase_train
-  # - --layout=image_batch(NHWC)
+  - --layout=image_batch(NHWC)
   - --mean_values=image_batch[127.5,127.5,127.5]
   - --scale_values=image_batch[128.0]
   - --output=embeddings