diff --git a/ppcls/configs/ImageNet/EfficientNet/EfficientNetB5.yaml b/ppcls/configs/ImageNet/EfficientNet/EfficientNetB5.yaml index 286971d4452325b13fb92d470e4844799c7ba918..d37b93c6084526f33409c6e611e2b81fd7ddda17 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 1c5ec6b0ad709a72298ab0add31579f0c0a25dff..a7508f03d12a1bf7f905af56ea03098128b5f9e3 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 65536f48109180bb509b0859c1eb6581631167b4..b10918ea41fd99f2b09b36cfe94ee38e9d3cfc62 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 8a19f032885b1c5c83de1d8cb0d1c7d650f39a32..1c4314548c4bf647413efdec3e791caa16b21f32 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 1b819189c4c444987473e408b4fcad9b723dd66f..0ac16c3d1020f2b8cf719de0aa19a5151f5c1a0a 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 613fc5886089661bf6e429ea43058bd0fce1181e..0d0ca3dbf4cf8bda606cbad688a9d225e3159bdc 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 96b82eadf3b913a8498e13bf241d51893806fe76..7b8e294cc61f605488353c0a08bc21b19e3cf9d0 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 0d5179d5002a50f760fca2789f5ffeaeefc25ce7..02c935746c060dfd0126d002bafa05e9e5d6a3fd 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 5af97fb1573bb032a750139dbb33babfbef9e67f..392c0482bdcc70846613ab0f0f425b3290ae81df 100644 --- a/test_tipc/config/EfficientNet/EfficientNetB6_train_infer_python.txt +++ b/test_tipc/config/EfficientNet/EfficientNetB6_train_infer_python.txt @@ -6,7 +6,7 @@ gpu_list:0|0,1 -o Global.auto_cast:null -o Global.epochs:lite_train_lite_infer=2|whole_train_whole_infer=120 -o Global.output_dir:./output/ --o DataLoader.Train.sampler.batch_size:8 +-o DataLoader.Train.sampler.batch_size:2 -o Global.pretrained_model:null train_model_name:latest train_infer_img_dir:./dataset/ILSVRC2012/val @@ -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 669fbe23049a8dc14b27236fd8f64c84ce20b032..7265243e6d61a603d56f311159bb98e203256e9e 100644 --- a/test_tipc/config/EfficientNet/EfficientNetB7_train_infer_python.txt +++ b/test_tipc/config/EfficientNet/EfficientNetB7_train_infer_python.txt @@ -6,7 +6,7 @@ gpu_list:0|0,1 -o Global.auto_cast:null -o Global.epochs:lite_train_lite_infer=2|whole_train_whole_infer=120 -o Global.output_dir:./output/ --o DataLoader.Train.sampler.batch_size:8 +-o DataLoader.Train.sampler.batch_size:2 -o Global.pretrained_model:null train_model_name:latest train_infer_img_dir:./dataset/ILSVRC2012/val @@ -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 073d2b04e21241a2c543e43822347210a2f5e69b..6a7960c671cafae7c63268366c0e0309b90f4cd8 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 3eacb49cc02a22ac35b239428290d27ba7e849c5..1e1d7fd5ddee6fffa34f6501d7b10f82ef2b707d 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 c6c599ec61171f9813522095813641e84085b60a..b9c162150b8aff1a962a5ce0299cbbc6fb70e189 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 4ccbd9effbb6d04d3dfb5121aa82da7ff61ec228..7d7fbf10c535e54f7fd494493f9788fd924dd637 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 a4f6255ca16b4e8666ece1ab9d6bea0baaf708db..adf12cb8f2c845660f700bf6b7d3b67db097a77e 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 64be4760afbd2654a72f686fc025786e36b0d231..463e20df87f642982c237f293ab372b3a372db84 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 78001f14672c264b7349695c6150ef839b338268..52ea37d055e14f1ab81b65ff5e3dbc7dac8b7cb9 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 diff --git a/test_tipc/test_train_inference_python.sh b/test_tipc/test_train_inference_python.sh index 0577a03091eb3b3518db4228e12b2f802570518b..23b2f70a18cf8b5dfb7c149e2c5821788d2f34fa 100644 --- a/test_tipc/test_train_inference_python.sh +++ b/test_tipc/test_train_inference_python.sh @@ -23,7 +23,7 @@ epoch_key=$(func_parser_key "${lines[6]}") epoch_num=$(func_parser_params "${lines[6]}") save_model_key=$(func_parser_key "${lines[7]}") train_batch_key=$(func_parser_key "${lines[8]}") -train_batch_value=$(func_parser_params "${lines[8]}") +train_batch_value=$(func_parser_value "${lines[8]}") pretrain_model_key=$(func_parser_key "${lines[9]}") pretrain_model_value=$(func_parser_value "${lines[9]}") train_model_name=$(func_parser_value "${lines[10]}") @@ -274,9 +274,9 @@ else fi # load pretrain from norm training if current trainer is pact or fpgm trainer - if [ ${trainer} = ${pact_key} ] || [ ${trainer} = ${fpgm_key} ]; then - set_pretrain="${load_norm_train_model}" - fi + # if [ ${trainer} = ${pact_key} ] || [ ${trainer} = ${fpgm_key} ]; then + # set_pretrain="${load_norm_train_model}" + # fi set_save_model=$(func_set_params "${save_model_key}" "${save_log}") if [ ${#gpu} -le 2 ];then # train with cpu or single gpu