From 381b9c1c5610e9d34a774821107aefbb4207e227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 08:30:30 +0000 Subject: [PATCH 01/10] =?UTF-8?q?update=20Ascend-PyTorch=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/official/cv/ReID/ReID-stro?= =?UTF-8?q?ng-baseline/ReID=5Fpostprocess.py.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cv/ReID/ReID-strong-baseline/ReID_postprocess.py" | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/ReID_postprocess.py" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/ReID_postprocess.py" index 0af4cb7..81ab265 100644 --- "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/ReID_postprocess.py" +++ "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/ReID_postprocess.py" @@ -33,10 +33,9 @@ def get_pred_label(label_dir, pre_dir): camid -= 1 # index starts from 0 filename = img_path.split("/")[-1] - if filename[-8:] == ".jpg.jpg": + bin_file = filename[:-4] + "_1.bin" + if filename[-8:] == ".jpg.jpg" and not os.path.exists(os.path.join(pre_dir, bin_file)): bin_file = filename[:-8] + "_1.bin" - else: - bin_file = filename[:-4] + "_1.bin" output = np.fromfile(os.path.join(pre_dir, bin_file), dtype="float32") output = torch.from_numpy(output) output = output.unsqueeze(0) -- Gitee From e9b20ba5bb2909a1417aa0affb83d9038ac277be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 08:52:29 +0000 Subject: [PATCH 02/10] =?UTF-8?q?add=20Ascend-PyTorch=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/official/cv/ReID/ReID-stro?= =?UTF-8?q?ng-baseline/aipp=5FReID=5Fpth.config.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aipp_ReID_pth.config" | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 "Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_pth.config" diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_pth.config" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_pth.config" new file mode 100644 index 0000000..f0086e8 --- /dev/null +++ "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_pth.config" @@ -0,0 +1,34 @@ +aipp_op{ + aipp_mode:static + input_format : YUV420SP_U8 + csc_switch: true + # 目前设置为true + rbuv_swap_switch: true + + # 不裁剪时缩放后的原图宽高即模型输入宽高 + src_image_size_w : 128 + src_image_size_h : 256 + crop: false + + # 均值：255x[0.485, 0.456, 0.406]，方差：1/(255x[0.229, 0.224, 0.225]) + min_chn_0 : 123.675 + min_chn_1 : 116.28 + min_chn_2 : 103.53 + var_reci_chn_0: 0.0171247538316637 + var_reci_chn_1: 0.0175070028011204 + var_reci_chn_2: 0.0174291938997821 + + # 模型输入为RGB序时的配置 + matrix_r0c0: 256 + matrix_r0c1: 0 + matrix_r0c2: 359 + matrix_r1c0: 256 + matrix_r1c1: -88 + matrix_r1c2: -183 + matrix_r2c0: 256 + matrix_r2c1: 454 + matrix_r2c2: 0 + input_bias_0: 0 + input_bias_1: 128 + input_bias_2: 128 +} \ No newline at end of file -- Gitee From 63aeed97dd92e93b883437659ba008083d739960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 09:09:14 +0000 Subject: [PATCH 03/10] =?UTF-8?q?add=20Ascend-PyTorch=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/official/cv/ReID/ReID-stro?= =?UTF-8?q?ng-baseline/aipp=5Ftest.sh.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../official/cv/ReID/ReID-strong-baseline/aipp_test.sh" | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 "Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_test.sh" diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_test.sh" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_test.sh" new file mode 100644 index 0000000..72ad82d --- /dev/null +++ "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_test.sh" @@ -0,0 +1,9 @@ +atc --framework=5 --model=./ReID.onnx --input_format=NCHW --input_shape="image:1,3,256,128" --output=ReID_aipp_bs1 --log=debug --soc_version=Ascend310 --insert_op_conf=aipp_ReID_pth.config + +ln -s /root/datasets/market1501 market1501 +python3.7 gen_dataset_info.py jpg ./market1501/query ./market1501_query.info +python3.7 gen_dataset_info.py jpg ./market1501/bounding_box_test ./market1501_box.info + +./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_query.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True + +./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_box.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True \ No newline at end of file -- Gitee From 4a8e9ee230b091283ea3b239e7795897397fa643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 09:09:36 +0000 Subject: [PATCH 04/10] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20Ascend-PyTo?= =?UTF-8?q?rch=E7=A6=BB=E7=BA=BF=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/ONNX?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/official?= =?UTF-8?q?/cv/ReID/ReID-strong-baseline/aipp=5Ftest.sh=20=E4=B8=BA=20Asce?= =?UTF-8?q?nd-PyTorch=E7=A6=BB=E7=BA=BF=E6=8E=A8=E7=90=86=E6=8C=87?= =?UTF-8?q?=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B=E6=8E=A8=E7=90=86=E6=8C=87?= =?UTF-8?q?=E5=AF=BC/official/cv/ReID/ReID-strong-baseline/aipp=5FReID=5Ft?= =?UTF-8?q?est.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename "Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_test.sh" => "Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" (100%) diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_test.sh" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" similarity index 100% rename from "Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_test.sh" rename to "Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" -- Gitee From fb2a402bb6a0d55aa1a9aac9a4cbdf69271f834c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 09:11:27 +0000 Subject: [PATCH 05/10] =?UTF-8?q?update=20Ascend-PyTorch=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/official/cv/ReID/ReID-stro?= =?UTF-8?q?ng-baseline/aipp=5FReID=5Ftest.sh.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" index 72ad82d..af22fcd 100644 --- "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" +++ "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" @@ -1,3 +1,5 @@ +#! /bin/bash + atc --framework=5 --model=./ReID.onnx --input_format=NCHW --input_shape="image:1,3,256,128" --output=ReID_aipp_bs1 --log=debug --soc_version=Ascend310 --insert_op_conf=aipp_ReID_pth.config ln -s /root/datasets/market1501 market1501 @@ -6,4 +8,5 @@ python3.7 gen_dataset_info.py jpg ./market1501/bounding_box_test ./market1501_bo ./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_query.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True -./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_box.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True \ No newline at end of file +./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_box.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True +python3.7 ReID_postprocess.py --query_dir=./market1501/query --gallery_dir=./market1501/bounding_box_test --pred_dir=./result/dumpOutput_device0 > result_aipp_bs1.json -- Gitee From 523d6afe17a0a4a897ecadf4d75adf9ff8c44a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 09:14:30 +0000 Subject: [PATCH 06/10] =?UTF-8?q?update=20Ascend-PyTorch=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/official/cv/ReID/ReID-stro?= =?UTF-8?q?ng-baseline/aipp=5FReID=5Ftest.sh.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" index af22fcd..1fcb5ca 100644 --- "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" +++ "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" @@ -9,4 +9,4 @@ python3.7 gen_dataset_info.py jpg ./market1501/bounding_box_test ./market1501_bo ./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_query.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True ./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_box.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True -python3.7 ReID_postprocess.py --query_dir=./market1501/query --gallery_dir=./market1501/bounding_box_test --pred_dir=./result/dumpOutput_device0 > result_aipp_bs1.json +python3.7 ReID_postprocess.py --query_dir=./market1501/query --gallery_dir=./market1501/bounding_box_test --pred_dir=./result/dumpOutput_device0 > ./result_aipp_bs1.json -- Gitee From 5bd71a950c14cae2961b4cb62b80a30fd9f90a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 09:15:06 +0000 Subject: [PATCH 07/10] =?UTF-8?q?update=20Ascend-PyTorch=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/official/cv/ReID/ReID-stro?= =?UTF-8?q?ng-baseline/aipp=5FReID=5Ftest.sh.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" index 1fcb5ca..0fbe518 100644 --- "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" +++ "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" @@ -1,6 +1,6 @@ #! /bin/bash -atc --framework=5 --model=./ReID.onnx --input_format=NCHW --input_shape="image:1,3,256,128" --output=ReID_aipp_bs1 --log=debug --soc_version=Ascend310 --insert_op_conf=aipp_ReID_pth.config +atc --framework=5 --model=./ReID.onnx --input_format=NCHW --input_shape="image:1,3,256,128" --output=ReID_aipp_bs1 --log=debug --soc_version=Ascend310 --insert_op_conf=./aipp_ReID_pth.config ln -s /root/datasets/market1501 market1501 python3.7 gen_dataset_info.py jpg ./market1501/query ./market1501_query.info -- Gitee From fa0f76930c179f743cc2db32f4d59257b13196f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 09:15:44 +0000 Subject: [PATCH 08/10] =?UTF-8?q?update=20Ascend-PyTorch=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/official/cv/ReID/ReID-stro?= =?UTF-8?q?ng-baseline/aipp=5FReID=5Ftest.sh.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" index 0fbe518..a6ebcba 100644 --- "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" +++ "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" @@ -2,7 +2,7 @@ atc --framework=5 --model=./ReID.onnx --input_format=NCHW --input_shape="image:1,3,256,128" --output=ReID_aipp_bs1 --log=debug --soc_version=Ascend310 --insert_op_conf=./aipp_ReID_pth.config -ln -s /root/datasets/market1501 market1501 +ln -s /root/datasets/market1501 ./market1501 python3.7 gen_dataset_info.py jpg ./market1501/query ./market1501_query.info python3.7 gen_dataset_info.py jpg ./market1501/bounding_box_test ./market1501_box.info -- Gitee From 0335df9ae319732891a350b718f9be4cd3a9cb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 09:28:52 +0000 Subject: [PATCH 09/10] =?UTF-8?q?add=20Ascend-PyTorch=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=8C=87=E5=AF=BC/official/cv/ReID/ReID-stro?= =?UTF-8?q?ng-baseline/test/aipp=5FReID=5Ftest.sh.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReID-strong-baseline/test/aipp_ReID_test.sh" | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 "Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/test/aipp_ReID_test.sh" diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/test/aipp_ReID_test.sh" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/test/aipp_ReID_test.sh" new file mode 100644 index 0000000..a6ebcba --- /dev/null +++ "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/test/aipp_ReID_test.sh" @@ -0,0 +1,12 @@ +#! /bin/bash + +atc --framework=5 --model=./ReID.onnx --input_format=NCHW --input_shape="image:1,3,256,128" --output=ReID_aipp_bs1 --log=debug --soc_version=Ascend310 --insert_op_conf=./aipp_ReID_pth.config + +ln -s /root/datasets/market1501 ./market1501 +python3.7 gen_dataset_info.py jpg ./market1501/query ./market1501_query.info +python3.7 gen_dataset_info.py jpg ./market1501/bounding_box_test ./market1501_box.info + +./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_query.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True + +./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_box.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True +python3.7 ReID_postprocess.py --query_dir=./market1501/query --gallery_dir=./market1501/bounding_box_test --pred_dir=./result/dumpOutput_device0 > ./result_aipp_bs1.json -- Gitee From f4c77ddb00715a1ec1bf5eb21120f2bf4884242a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=B8=9A=E5=BA=86?= Date: Sat, 24 Jul 2021 09:29:24 +0000 Subject: [PATCH 10/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20As?= =?UTF-8?q?cend-PyTorch=E7=A6=BB=E7=BA=BF=E6=8E=A8=E7=90=86=E6=8C=87?= =?UTF-8?q?=E5=AF=BC/ONNX=E6=A8=A1=E5=9E=8B=E6=8E=A8=E7=90=86=E6=8C=87?= =?UTF-8?q?=E5=AF=BC/official/cv/ReID/ReID-strong-baseline/aipp=5FReID=5Ft?= =?UTF-8?q?est.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 "Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" diff --git "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" "b/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" deleted file mode 100644 index a6ebcba..0000000 --- "a/Ascend-PyTorch\347\246\273\347\272\277\346\216\250\347\220\206\346\214\207\345\257\274/ONNX\346\250\241\345\236\213\346\216\250\347\220\206\346\214\207\345\257\274/official/cv/ReID/ReID-strong-baseline/aipp_ReID_test.sh" +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/bash - -atc --framework=5 --model=./ReID.onnx --input_format=NCHW --input_shape="image:1,3,256,128" --output=ReID_aipp_bs1 --log=debug --soc_version=Ascend310 --insert_op_conf=./aipp_ReID_pth.config - -ln -s /root/datasets/market1501 ./market1501 -python3.7 gen_dataset_info.py jpg ./market1501/query ./market1501_query.info -python3.7 gen_dataset_info.py jpg ./market1501/bounding_box_test ./market1501_box.info - -./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_query.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True - -./benchmark.x86_64 -model_type=vision -device_id=0 -batch_size=1 -om_path=./ReID_aipp_bs1.om -input_text_path=./market1501_box.info -input_width=128 -input_height=256 -output_binary=True -useDvpp=True -python3.7 ReID_postprocess.py --query_dir=./market1501/query --gallery_dir=./market1501/bounding_box_test --pred_dir=./result/dumpOutput_device0 > ./result_aipp_bs1.json -- Gitee