From 49ef722c69774b2ee8bf5e1a888325ada48f5e68 Mon Sep 17 00:00:00 2001 From: lzzyzlbb <287246233@qq.com> Date: Tue, 21 Dec 2021 10:28:10 +0800 Subject: [PATCH] fix tipc dataset of msvsr & basicvsr (#534) --- .../configs/basicvsr/train_infer_python.txt | 4 +-- .../configs/msvsr/train_infer_python.txt | 6 ++-- test_tipc/prepare.sh | 36 +++++++++---------- .../results/python_basicvsr_results_fp32.txt | 4 +-- .../results/python_msvsr_results_fp32.txt | 5 +-- 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/test_tipc/configs/basicvsr/train_infer_python.txt b/test_tipc/configs/basicvsr/train_infer_python.txt index 7df65b8..6990b07 100644 --- a/test_tipc/configs/basicvsr/train_infer_python.txt +++ b/test_tipc/configs/basicvsr/train_infer_python.txt @@ -13,7 +13,7 @@ train_infer_img_dir:./data/basicvsr_reds/test null:null ## trainer:norm_train -norm_train:tools/main.py -c configs/basicvsr_reds.yaml --seed 123 -o dataset.train.dataset.num_clips=2 dataset.train.num_workers=0 log_config.interval=1 snapshot_config.interval=5 +norm_train:tools/main.py -c configs/basicvsr_reds.yaml --seed 123 -o dataset.train.num_workers=0 log_config.interval=1 snapshot_config.interval=5 pact_train:null fpgm_train:null distill_train:null @@ -37,7 +37,7 @@ inference_dir:basicvsrmodel_generator train_model:./inference/basicvsr/basicvsrmodel_generator infer_export:null infer_quant:False -inference:tools/inference.py --model_type basicvsr -c configs/basicvsr_reds.yaml --seed 123 -o dataset.test.num_clips=2 dataset.test.number_frames=6 --output_path test_tipc/output/ +inference:tools/inference.py --model_type basicvsr -c configs/basicvsr_reds.yaml --seed 123 -o dataset.test.num_frames=6 --output_path test_tipc/output/ --device:gpu null:null null:null diff --git a/test_tipc/configs/msvsr/train_infer_python.txt b/test_tipc/configs/msvsr/train_infer_python.txt index 0f393ab..2e4ccef 100644 --- a/test_tipc/configs/msvsr/train_infer_python.txt +++ b/test_tipc/configs/msvsr/train_infer_python.txt @@ -13,7 +13,7 @@ train_infer_img_dir:./data/msvsr_reds/test null:null ## trainer:norm_train -norm_train:tools/main.py -c configs/msvsr_reds.yaml --seed 123 -o dataset.train.dataset.num_clips=2 dataset.train.num_workers=0 log_config.interval=1 snapshot_config.interval=5 dataset.train.dataset.number_frames=2 +norm_train:tools/main.py -c configs/msvsr_reds.yaml --seed 123 -o dataset.train.num_workers=0 log_config.interval=1 snapshot_config.interval=5 dataset.train.dataset.num_frames=2 pact_train:null fpgm_train:null distill_train:null @@ -37,8 +37,8 @@ inference_dir:multistagevsrmodel_generator train_model:./inference/msvsr/multistagevsrmodel_generator infer_export:null infer_quant:False -inference:tools/inference.py --model_type msvsr -c configs/msvsr_reds.yaml --seed 123 -o dataset.test.num_clips=2 dataset.test.number_frames=2 --output_path test_tipc/output/ ---device:gpu +inference:tools/inference.py --model_type msvsr -c configs/msvsr_reds.yaml --seed 123 -o dataset.test.num_frames=2 --output_path test_tipc/output/ +--device:cpu null:null null:null null:null diff --git a/test_tipc/prepare.sh b/test_tipc/prepare.sh index 0f2248d..4f0b896 100644 --- a/test_tipc/prepare.sh +++ b/test_tipc/prepare.sh @@ -53,13 +53,13 @@ if [ ${MODE} = "lite_train_lite_infer" ];then wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/fom_lite.tar --no-check-certificate --no-check-certificate cd ./data/ && tar xf fom_lite.tar && cd ../ elif [ ${model_name} == "basicvsr" ]; then - rm -rf ./data/basicvsr* - wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/basicvsr_lite.tar --no-check-certificate - cd ./data/ && tar xf basicvsr_lite.tar && cd ../ + rm -rf ./data/reds* + wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/reds_lite.tar --no-check-certificate + cd ./data/ && tar xf reds_lite.tar && cd ../ elif [ ${model_name} == "msvsr" ]; then - rm -rf ./data/basicvsr* - wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/basicvsr_lite.tar --no-check-certificate - cd ./data/ && tar xf basicvsr_lite.tar && cd ../ + rm -rf ./data/reds* + wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/reds_lite.tar --no-check-certificate + cd ./data/ && tar xf reds_lite.tar && cd ../ fi elif [ ${MODE} = "whole_train_whole_infer" ];then @@ -90,13 +90,13 @@ elif [ ${MODE} = "lite_train_whole_infer" ];then wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/ffhq.tar --no-check-certificate cd ./data/ && tar xf ffhq.tar && cd ../ elif [ ${model_name} == "basicvsr" ]; then - rm -rf ./data/REDS* - wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/basicvsr_lite.tar --no-check-certificate - cd ./data/ && tar xf basicvsr_lite.tar && cd ../ + rm -rf ./data/reds* + wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/reds_lite.tar --no-check-certificate + cd ./data/ && tar xf reds_lite.tar && cd ../ elif [ ${model_name} == "msvsr" ]; then - rm -rf ./data/REDS* - wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/basicvsr_lite.tar --no-check-certificate - cd ./data/ && tar xf basicvsr_lite.tar && cd ../ + rm -rf ./data/reds* + wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/reds_lite.tar --no-check-certificate + cd ./data/ && tar xf reds_lite.tar && cd ../ fi elif [ ${MODE} = "whole_infer" ];then if [ ${model_name} = "pix2pix" ]; then @@ -127,19 +127,19 @@ elif [ ${MODE} = "whole_infer" ];then cd ./inference && tar xf stylegan2_1024.tar && cd ../ cd ./data/ && tar xf ffhq.tar && cd ../ elif [ ${model_name} == "basicvsr" ]; then - rm -rf ./data/basic* + rm -rf ./data/reds* rm -rf ./inference/basic* - wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/basicvsr_lite_test.tar --no-check-certificate + wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/reds_lite.tar --no-check-certificate wget -nc -P ./inference https://paddlegan.bj.bcebos.com/static_model/basicvsr.tar --no-check-certificate cd ./inference && tar xf basicvsr.tar && cd ../ - cd ./data/ && tar xf basicvsr_lite_test.tar && cd ../ + cd ./data/ && tar xf reds_lite.tar && cd ../ elif [ ${model_name} == "msvsr" ]; then - rm -rf ./data/basic* + rm -rf ./data/reds* rm -rf ./inference/msvsr* - wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/basicvsr_lite_test.tar --no-check-certificate + wget -nc -P ./data/ https://paddlegan.bj.bcebos.com/datasets/reds_lite.tar --no-check-certificate wget -nc -P ./inference https://paddlegan.bj.bcebos.com/static_model/msvsr.tar --no-check-certificate cd ./inference && tar xf msvsr.tar && cd ../ - cd ./data/ && tar xf basicvsr_lite_test.tar && cd ../ + cd ./data/ && tar xf reds_lite.tar && cd ../ fi fi diff --git a/test_tipc/results/python_basicvsr_results_fp32.txt b/test_tipc/results/python_basicvsr_results_fp32.txt index d2d8cb1..1f0df64 100644 --- a/test_tipc/results/python_basicvsr_results_fp32.txt +++ b/test_tipc/results/python_basicvsr_results_fp32.txt @@ -1,2 +1,2 @@ -Metric psnr: 28.2953 -Metric ssim: 0.8334 +Metric psnr: 27.0864 +Metric ssim: 0.7835 diff --git a/test_tipc/results/python_msvsr_results_fp32.txt b/test_tipc/results/python_msvsr_results_fp32.txt index c29d1cf..01b8907 100644 --- a/test_tipc/results/python_msvsr_results_fp32.txt +++ b/test_tipc/results/python_msvsr_results_fp32.txt @@ -1,2 +1,3 @@ -c psnr: 27.2885 -Metric ssim: 0.7969 +Metric psnr: 23.6020 +Metric ssim: 0.5636 + -- GitLab