From ab187e21cca56516d108492d2ca83ed7b94c6b4e Mon Sep 17 00:00:00 2001
From: dongshuilong <dongshuilong@baidu.com>
Date: Fri, 10 Dec 2021 08:05:36 +0000
Subject: [PATCH] fix tipc inference batch_size bug

---
 ppcls/configs/ImageNet/EfficientNet/EfficientNetB5.yaml         | 2 +-
 test_tipc/config/CSPNet/CSPDarkNet53_train_infer_python.txt     | 2 +-
 test_tipc/config/DarkNet/DarkNet53_train_infer_python.txt       | 2 +-
 .../config/EfficientNet/EfficientNetB1_train_infer_python.txt   | 2 +-
 .../config/EfficientNet/EfficientNetB2_train_infer_python.txt   | 2 +-
 .../config/EfficientNet/EfficientNetB3_train_infer_python.txt   | 2 +-
 .../config/EfficientNet/EfficientNetB4_train_infer_python.txt   | 2 +-
 .../config/EfficientNet/EfficientNetB5_train_infer_python.txt   | 2 +-
 .../config/EfficientNet/EfficientNetB6_train_infer_python.txt   | 2 +-
 .../config/EfficientNet/EfficientNetB7_train_infer_python.txt   | 2 +-
 test_tipc/config/Inception/InceptionV3_train_infer_python.txt   | 2 +-
 test_tipc/config/Inception/InceptionV4_train_infer_python.txt   | 2 +-
 .../config/Xception/Xception41_deeplab_train_infer_python.txt   | 2 +-
 test_tipc/config/Xception/Xception41_train_infer_python.txt     | 2 +-
 .../config/Xception/Xception65_deeplab_train_infer_python.txt   | 2 +-
 test_tipc/config/Xception/Xception65_train_infer_python.txt     | 2 +-
 test_tipc/config/Xception/Xception71_train_infer_python.txt     | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ppcls/configs/ImageNet/EfficientNet/EfficientNetB5.yaml b/ppcls/configs/ImageNet/EfficientNet/EfficientNetB5.yaml
index 286971d4..d37b93c6 100644
--- a/ppcls/configs/ImageNet/EfficientNet/EfficientNetB5.yaml
+++ b/ppcls/configs/ImageNet/EfficientNet/EfficientNetB5.yaml
@@ -110,7 +110,7 @@ Infer:
         to_rgb: True
         channel_first: False
     - ResizeImage:
-        resize_short: 448
+        resize_short: 488
     - CropImage:
         size: 456
     - NormalizeImage:
diff --git a/test_tipc/config/CSPNet/CSPDarkNet53_train_infer_python.txt b/test_tipc/config/CSPNet/CSPDarkNet53_train_infer_python.txt
index 1c5ec6b0..a7508f03 100644
--- a/test_tipc/config/CSPNet/CSPDarkNet53_train_infer_python.txt
+++ b/test_tipc/config/CSPNet/CSPDarkNet53_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/C
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeIage.resize_short=288 -o PreProcess.transform_ops.1.CropImage.size=256
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/DarkNet/DarkNet53_train_infer_python.txt b/test_tipc/config/DarkNet/DarkNet53_train_infer_python.txt
index 65536f48..b10918ea 100644
--- a/test_tipc/config/DarkNet/DarkNet53_train_infer_python.txt
+++ b/test_tipc/config/DarkNet/DarkNet53_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/D
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=292 -o PreProcess.transform_ops.1.CropImage.size=256
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/EfficientNet/EfficientNetB1_train_infer_python.txt b/test_tipc/config/EfficientNet/EfficientNetB1_train_infer_python.txt
index 8a19f032..1c431454 100644
--- a/test_tipc/config/EfficientNet/EfficientNetB1_train_infer_python.txt
+++ b/test_tipc/config/EfficientNet/EfficientNetB1_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/E
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=272 -o PreProcess.transform_ops.1.CropImage.size=240
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/EfficientNet/EfficientNetB2_train_infer_python.txt b/test_tipc/config/EfficientNet/EfficientNetB2_train_infer_python.txt
index 1b819189..0ac16c3d 100644
--- a/test_tipc/config/EfficientNet/EfficientNetB2_train_infer_python.txt
+++ b/test_tipc/config/EfficientNet/EfficientNetB2_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/E
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=292 -o PreProcess.transform_ops.1.CropImage.size=260
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/EfficientNet/EfficientNetB3_train_infer_python.txt b/test_tipc/config/EfficientNet/EfficientNetB3_train_infer_python.txt
index 613fc588..0d0ca3db 100644
--- a/test_tipc/config/EfficientNet/EfficientNetB3_train_infer_python.txt
+++ b/test_tipc/config/EfficientNet/EfficientNetB3_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/E
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=332 -o PreProcess.transform_ops.1.CropImage.size=300
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/EfficientNet/EfficientNetB4_train_infer_python.txt b/test_tipc/config/EfficientNet/EfficientNetB4_train_infer_python.txt
index 96b82ead..7b8e294c 100644
--- a/test_tipc/config/EfficientNet/EfficientNetB4_train_infer_python.txt
+++ b/test_tipc/config/EfficientNet/EfficientNetB4_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/E
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=412 -o PreProcess.transform_ops.1.CropImage.size=320
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/EfficientNet/EfficientNetB5_train_infer_python.txt b/test_tipc/config/EfficientNet/EfficientNetB5_train_infer_python.txt
index 0d5179d5..02c93574 100644
--- a/test_tipc/config/EfficientNet/EfficientNetB5_train_infer_python.txt
+++ b/test_tipc/config/EfficientNet/EfficientNetB5_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/E
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=488 -o PreProcess.transform_ops.1.CropImage.size=456
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/EfficientNet/EfficientNetB6_train_infer_python.txt b/test_tipc/config/EfficientNet/EfficientNetB6_train_infer_python.txt
index 5b5b7833..392c0482 100644
--- a/test_tipc/config/EfficientNet/EfficientNetB6_train_infer_python.txt
+++ b/test_tipc/config/EfficientNet/EfficientNetB6_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/E
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=560 -o PreProcess.transform_ops.1.CropImage.size=528
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/EfficientNet/EfficientNetB7_train_infer_python.txt b/test_tipc/config/EfficientNet/EfficientNetB7_train_infer_python.txt
index 1dbdf6ee..7265243e 100644
--- a/test_tipc/config/EfficientNet/EfficientNetB7_train_infer_python.txt
+++ b/test_tipc/config/EfficientNet/EfficientNetB7_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/E
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml  -o PreProcess.transform_ops.0.ResizeImage.resize_short=632 -o PreProcess.transform_ops.1.CropImage.size=600
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/Inception/InceptionV3_train_infer_python.txt b/test_tipc/config/Inception/InceptionV3_train_infer_python.txt
index 073d2b04..6a7960c6 100644
--- a/test_tipc/config/Inception/InceptionV3_train_infer_python.txt
+++ b/test_tipc/config/Inception/InceptionV3_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/I
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml  -o PreProcess.transform_ops.0.ResizeImage.resize_short=320 -o PreProcess.transform_ops.1.CropImage.size=299
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/Inception/InceptionV4_train_infer_python.txt b/test_tipc/config/Inception/InceptionV4_train_infer_python.txt
index 3eacb49c..1e1d7fd5 100644
--- a/test_tipc/config/Inception/InceptionV4_train_infer_python.txt
+++ b/test_tipc/config/Inception/InceptionV4_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/I
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml  -o PreProcess.transform_ops.0.ResizeImage.resize_short=320 -o PreProcess.transform_ops.1.CropImage.size=299
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/Xception/Xception41_deeplab_train_infer_python.txt b/test_tipc/config/Xception/Xception41_deeplab_train_infer_python.txt
index c6c599ec..b9c16215 100644
--- a/test_tipc/config/Xception/Xception41_deeplab_train_infer_python.txt
+++ b/test_tipc/config/Xception/Xception41_deeplab_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/X
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=320 -o PreProcess.transform_ops.1.CropImage.size=299
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/Xception/Xception41_train_infer_python.txt b/test_tipc/config/Xception/Xception41_train_infer_python.txt
index 4ccbd9ef..7d7fbf10 100644
--- a/test_tipc/config/Xception/Xception41_train_infer_python.txt
+++ b/test_tipc/config/Xception/Xception41_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/X
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=320 -o PreProcess.transform_ops.1.CropImage.size=299
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/Xception/Xception65_deeplab_train_infer_python.txt b/test_tipc/config/Xception/Xception65_deeplab_train_infer_python.txt
index a4f6255c..adf12cb8 100644
--- a/test_tipc/config/Xception/Xception65_deeplab_train_infer_python.txt
+++ b/test_tipc/config/Xception/Xception65_deeplab_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/X
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=320 -o PreProcess.transform_ops.1.CropImage.size=299
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/Xception/Xception65_train_infer_python.txt b/test_tipc/config/Xception/Xception65_train_infer_python.txt
index 64be4760..463e20df 100644
--- a/test_tipc/config/Xception/Xception65_train_infer_python.txt
+++ b/test_tipc/config/Xception/Xception65_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/X
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=320 -o PreProcess.transform_ops.1.CropImage.size=299
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
diff --git a/test_tipc/config/Xception/Xception71_train_infer_python.txt b/test_tipc/config/Xception/Xception71_train_infer_python.txt
index 78001f14..52ea37d0 100644
--- a/test_tipc/config/Xception/Xception71_train_infer_python.txt
+++ b/test_tipc/config/Xception/Xception71_train_infer_python.txt
@@ -37,7 +37,7 @@ pretrained_model_url:https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/X
 infer_model:../inference/
 infer_export:True
 infer_quant:Fasle
-inference:python/predict_cls.py -c configs/inference_cls.yaml
+inference:python/predict_cls.py -c configs/inference_cls.yaml -o PreProcess.transform_ops.0.ResizeImage.resize_short=320 -o PreProcess.transform_ops.1.CropImage.size=299
 -o Global.use_gpu:True|False
 -o Global.enable_mkldnn:True|False
 -o Global.cpu_num_threads:1|6
-- 
GitLab