diff --git a/configs/slim/ofa/ofa_picodet_demo.yml b/configs/slim/ofa/ofa_picodet_demo.yml index b770918c85c6dbf13e267977e4b18961149ad079..a5ade9e3168bb0e6ecb68fabc47d98d789d4ae7d 100644 --- a/configs/slim/ofa/ofa_picodet_demo.yml +++ b/configs/slim/ofa/ofa_picodet_demo.yml @@ -23,7 +23,7 @@ OFA: 'backbone.4_1._conv_pw_mv1._conv', 'backbone.4_2._conv_linear._conv', 'backbone.4_3._conv_linear._conv'] - # For block-wise search, make layers in each block in the same search sapce + # For block-wise search, make layers in each block in the same search space same_search_space: [ ['backbone.2_1._conv_dw_1._conv', 'backbone.2_1._conv_pw_2._conv', 'backbone.2_1._conv_dw_2._conv', 'backbone.2_1._se.conv1', 'backbone.2_1._se.conv2'], diff --git a/configs/sniper/README.md b/configs/sniper/README.md index 8a9e2e77b4247a6ab4b89683b511fd86a7a7dd16..3aadee560ee6d7cd3691075db016a94fec7e0ea3 100644 --- a/configs/sniper/README.md +++ b/configs/sniper/README.md @@ -10,8 +10,8 @@ English | [简体中文](README_cn.md) | w/ | 4 | 1 | ResNet-r50-FPN | [VisDrone](https://github.com/VisDrone/VisDrone-Dataset) | 1x | 29.7 | [Download Link](https://bj.bcebos.com/v1/paddledet/models/faster_rcnn_r50_fpn_1x_sniper_visdrone.pdparams) | [config](./faster_rcnn_r50_fpn_1x_sniper_visdrone.yml) | ### Note -- Here, we use VisDrone dataset, and to detect 9 objects including `person, bicycles, car, van, truck, tricyle, awning-tricyle, bus, motor`. -- Do not support deploy by now because sniper dataset crop behavor. +- Here, we use VisDrone dataset, and to detect 9 objects including `person, bicycles, car, van, truck, tricycle, awning-tricycle, bus, motor`. +- Do not support deploy by now because sniper dataset crop behavior. ## Getting Start ### 1. Training @@ -19,7 +19,7 @@ a. optional: Run `tools/sniper_params_stats.py` to get image_target_sizes\valid_ ```bash python tools/sniper_params_stats.py FasterRCNN annotations/instances_train2017.json ``` -b. optional: trian detector to get negative proposals. +b. optional: train detector to get negative proposals. ```bash python -m paddle.distributed.launch --log_dir=./sniper/ --gpus 0,1,2,3,4,5,6,7 tools/train.py -c configs/sniper/faster_rcnn_r50_fpn_1x_sniper_visdrone.yml --save_proposals --proposals_path=./proposals.json &>sniper.log 2>&1 & ``` diff --git a/configs/ssd/_base_/ssd_vgg16_300.yml b/configs/ssd/_base_/ssd_vgg16_300.yml index 59821054d9ba3005f6e75b3da38255c1fba187f1..8d322d9c1f8646a40d5256180546af63eea8a8fb 100644 --- a/configs/ssd/_base_/ssd_vgg16_300.yml +++ b/configs/ssd/_base_/ssd_vgg16_300.yml @@ -1,7 +1,7 @@ architecture: SSD pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/VGG16_caffe_pretrained.pdparams -# Model Achitecture +# Model Architecture SSD: # model feat info flow backbone: VGG diff --git a/dataset/coco/download_coco.py b/dataset/coco/download_coco.py index 47659fa76dd2c1183404667efac3a48de9b099c2..993218fff32b9d78eab43e4a37264b031338f496 100644 --- a/dataset/coco/download_coco.py +++ b/dataset/coco/download_coco.py @@ -15,7 +15,7 @@ import sys import os.path as osp import logging -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = osp.abspath(osp.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) diff --git a/dataset/roadsign_voc/download_roadsign_voc.py b/dataset/roadsign_voc/download_roadsign_voc.py index 3cb517d3cf362e3ad2ec7b4ebf3bff54acb244d4..7d8ef2252f3d8b91f9c0c30e6be5ad186a00c18f 100644 --- a/dataset/roadsign_voc/download_roadsign_voc.py +++ b/dataset/roadsign_voc/download_roadsign_voc.py @@ -15,7 +15,7 @@ import sys import os.path as osp import logging -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = osp.abspath(osp.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) diff --git a/dataset/spine_coco/download_spine_coco.py b/dataset/spine_coco/download_spine_coco.py index 77d63391c3258f0917a8c4ee5c364307efcfab3a..2b23dd6387b66a9e42f26b59e5fe6fea7bf81d7d 100644 --- a/dataset/spine_coco/download_spine_coco.py +++ b/dataset/spine_coco/download_spine_coco.py @@ -15,7 +15,7 @@ import sys import os.path as osp import logging -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = osp.abspath(osp.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) diff --git a/dataset/voc/create_list.py b/dataset/voc/create_list.py index 5ab804222aa14cce988fd0aa083a460372afb484..7696073448d1dc65e1e0e20919048b69658d5ea1 100644 --- a/dataset/voc/create_list.py +++ b/dataset/voc/create_list.py @@ -15,7 +15,7 @@ import sys import os.path as osp import logging -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = osp.abspath(osp.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) diff --git a/dataset/voc/download_voc.py b/dataset/voc/download_voc.py index e4c449ce207f27f07379a1e93cebcb27ace0b8fe..2375fbf3c17c6424763ea5323f4a470f30eff3df 100644 --- a/dataset/voc/download_voc.py +++ b/dataset/voc/download_voc.py @@ -15,7 +15,7 @@ import sys import os.path as osp import logging -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = osp.abspath(osp.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) diff --git a/deploy/benchmark/log_parser_excel.py b/deploy/benchmark/log_parser_excel.py index 2375e9634ed1c39c2ca6727422b8ace56a9b3262..317b3759572c6acef3438fbc654bc5918e8bdd38 100644 --- a/deploy/benchmark/log_parser_excel.py +++ b/deploy/benchmark/log_parser_excel.py @@ -195,7 +195,7 @@ def trt_perf_analysis(raw_df): gpu_df = raw_df.loc[raw_df['runtime_device'] == 'gpu'] new_df = filter_df_merge(gpu_df, "precision") - # calculate qps diff percentail + # calculate qps diff percentile infer_fp32 = "inference_time(ms)_precision_fp32" infer_fp16 = "inference_time(ms)_precision_fp16" infer_int8 = "inference_time(ms)_precision_int8" @@ -228,7 +228,7 @@ def mkl_perf_analysis(raw_df): output_thread_df = filter_df_merge(thread_compare_df, 'cpu_math_library_num_threads') - # calculate performance diff percentail + # calculate performance diff percentile # compare mkl performance with cpu enable_mkldnn = "inference_time(ms)_enable_mkldnn_True" disable_mkldnn = "inference_time(ms)_enable_mkldnn_False" diff --git a/deploy/cpp/docs/windows_vs2019_build.md b/deploy/cpp/docs/windows_vs2019_build.md index 9fbfcf2048916635ac2ed98a73849db97df36aa3..1a23cabc7bf640ed548942012354013f500d6be2 100755 --- a/deploy/cpp/docs/windows_vs2019_build.md +++ b/deploy/cpp/docs/windows_vs2019_build.md @@ -5,7 +5,7 @@ Windows 平台下,我们使用`Visual Studio 2019 Community` 进行了测试 ## 前置条件 * Visual Studio 2019 (根据Paddle预测库所使用的VS版本选择,请参考 [Visual Studio 不同版本二进制兼容性](https://docs.microsoft.com/zh-cn/cpp/porting/binary-compat-2015-2017?view=vs-2019) ) -* CUDA 9.0 / CUDA 10.0,cudnn 7+ / TensoRT(仅在使用GPU版本的预测库时需要) +* CUDA 9.0 / CUDA 10.0,cudnn 7+ / TensorRT(仅在使用GPU版本的预测库时需要) * CMake 3.0+ [CMake下载](https://cmake.org/download/) **特别注意:windows下预测库需要的TensorRT版本为:**。 diff --git a/deploy/cpp/src/keypoint_detector.cc b/deploy/cpp/src/keypoint_detector.cc index 18af79e31967ad9636d230e96fbd1aa97b6323b1..b0ee884566749c5ab459d8ec76aa98ae4e1d1f3c 100644 --- a/deploy/cpp/src/keypoint_detector.cc +++ b/deploy/cpp/src/keypoint_detector.cc @@ -95,7 +95,7 @@ void KeyPointDetector::LoadModel(const std::string& model_dir, predictor_ = std::move(CreatePredictor(config)); } -// Visualiztion MaskDetector results +// Visualization MaskDetector results cv::Mat VisualizeKptsResult(const cv::Mat& img, const std::vector& results, const std::vector& colormap) { diff --git a/deploy/pipeline/pipeline.py b/deploy/pipeline/pipeline.py index 80af8c5217179e3d730ee03272d26f07dcef732b..04fcfc28be29fa762122116b7c0c983ac5947688 100644 --- a/deploy/pipeline/pipeline.py +++ b/deploy/pipeline/pipeline.py @@ -27,7 +27,7 @@ import time from collections import Sequence, defaultdict from datacollector import DataCollector, Result -# add deploy path of PadleDetection to sys.path +# add deploy path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/deploy/pipeline/pphuman/action_infer.py b/deploy/pipeline/pphuman/action_infer.py index 3e2f397cfc51edb50b6711f0e73ad6caf6e33ca7..b04bd3f881bae8cf70434dd49bb3686d3b14c410 100644 --- a/deploy/pipeline/pphuman/action_infer.py +++ b/deploy/pipeline/pphuman/action_infer.py @@ -23,7 +23,7 @@ import paddle import sys from collections import Sequence -# add deploy path of PadleDetection to sys.path +# add deploy path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/deploy/pipeline/pphuman/attr_infer.py b/deploy/pipeline/pphuman/attr_infer.py index 40ccad05f82b635b16e1e562315bcb6c0755975d..bf9e80bec402d3a64016b7b93edbce40474603d5 100644 --- a/deploy/pipeline/pphuman/attr_infer.py +++ b/deploy/pipeline/pphuman/attr_infer.py @@ -25,7 +25,7 @@ from paddle.inference import Config from paddle.inference import create_predictor import sys -# add deploy path of PadleDetection to sys.path +# add deploy path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..']))) sys.path.insert(0, parent_path) diff --git a/deploy/pipeline/pphuman/mtmct.py b/deploy/pipeline/pphuman/mtmct.py index bb45432a0e544b8aff658ca5eb2d2b60d7d7aef3..f7ff199f94bdb0b973797aabe8d24d4e603bba99 100644 --- a/deploy/pipeline/pphuman/mtmct.py +++ b/deploy/pipeline/pphuman/mtmct.py @@ -202,7 +202,7 @@ def get_cosine(x, y, eps=1e-12): Computes cosine distance between two tensors. The cosine distance is the inverse cosine similarity -> cosine_distance = abs(-cosine_distance) to make it - similar in behaviour to euclidean distance + similar in behavior to euclidean distance """ sim_mt = cosine_similarity(x, y, eps) return sim_mt diff --git a/deploy/pipeline/pphuman/reid.py b/deploy/pipeline/pphuman/reid.py index c20ede3f44f5e9492118eaf2b3deef4d29fec0a3..21b725ce4c7a587652a54176451841ff97d2bd8d 100644 --- a/deploy/pipeline/pphuman/reid.py +++ b/deploy/pipeline/pphuman/reid.py @@ -16,7 +16,7 @@ import os import sys import cv2 import numpy as np -# add deploy path of PadleDetection to sys.path +# add deploy path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/deploy/pipeline/pphuman/video_action_infer.py b/deploy/pipeline/pphuman/video_action_infer.py index aecaa76960746edf0e99f4c10f5423373a641af8..e5e6c10eccd32aabb992393e24cd02362b4d493c 100644 --- a/deploy/pipeline/pphuman/video_action_infer.py +++ b/deploy/pipeline/pphuman/video_action_infer.py @@ -24,7 +24,7 @@ import sys from collections import Sequence import paddle.nn.functional as F -# add deploy path of PadleDetection to sys.path +# add deploy path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/deploy/pipeline/ppvehicle/vehicle_attr.py b/deploy/pipeline/ppvehicle/vehicle_attr.py index 9e20d95cac67bfbaee5b7246ab3fd4c135613e15..4f7923f61e3aae73ece20c2125e5bd39d723e554 100644 --- a/deploy/pipeline/ppvehicle/vehicle_attr.py +++ b/deploy/pipeline/ppvehicle/vehicle_attr.py @@ -23,7 +23,7 @@ import paddle import sys from collections import Sequence -# add deploy path of PadleDetection to sys.path +# add deploy path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) sys.path.insert(0, parent_path) diff --git a/deploy/pptracking/python/det_infer.py b/deploy/pptracking/python/det_infer.py index cf99f0d70ac6c3f3989ea38a529197ff29fd23d8..3dec3e6d6353b324270feaeeb4cd37fbd055e972 100644 --- a/deploy/pptracking/python/det_infer.py +++ b/deploy/pptracking/python/det_infer.py @@ -26,7 +26,7 @@ from paddle.inference import Config from paddle.inference import create_predictor import sys -# add deploy path of PadleDetection to sys.path +# add deploy path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..']))) sys.path.insert(0, parent_path) diff --git a/deploy/python/infer.py b/deploy/python/infer.py index df206f22b59a796a59b44a0b3e8489c2d89e339b..e86761abc55cc78880f0b5f95eabfdf231691547 100644 --- a/deploy/python/infer.py +++ b/deploy/python/infer.py @@ -27,7 +27,7 @@ from paddle.inference import Config from paddle.inference import create_predictor import sys -# add deploy path of PadleDetection to sys.path +# add deploy path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..']))) sys.path.insert(0, parent_path) diff --git a/deploy/python/keypoint_infer.py b/deploy/python/keypoint_infer.py index 70b81375621bdd49ec916f246d90f5d5a243aa33..52e12fda74fdac95d33c95eea3de062ce43ee774 100644 --- a/deploy/python/keypoint_infer.py +++ b/deploy/python/keypoint_infer.py @@ -25,7 +25,7 @@ import numpy as np import paddle import sys -# add deploy path of PadleDetection to sys.path +# add deploy path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..']))) sys.path.insert(0, parent_path) diff --git a/ppdet/modeling/tests/test_ops.py b/ppdet/modeling/tests/test_ops.py index 3614d5b9c232ae9c1ce37b158a502b3349473cb4..4827be5a7bc1fe33d5d736a0fb546bd993c7e059 100644 --- a/ppdet/modeling/tests/test_ops.py +++ b/ppdet/modeling/tests/test_ops.py @@ -14,7 +14,7 @@ from __future__ import print_function import os, sys -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 4))) if parent_path not in sys.path: sys.path.append(parent_path) diff --git a/ppdet/modeling/tests/test_yolov3_loss.py b/ppdet/modeling/tests/test_yolov3_loss.py index e3c1c403b3690053440a8e88405f4313be08a765..0ad1c8e803ef2c6faedf3aab3049c26949fed003 100644 --- a/ppdet/modeling/tests/test_yolov3_loss.py +++ b/ppdet/modeling/tests/test_yolov3_loss.py @@ -18,7 +18,7 @@ import unittest import paddle import paddle.nn.functional as F -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path import os import sys parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 4))) diff --git a/ppdet/modeling/transformers/ext_op/test_ms_deformable_attn_op.py b/ppdet/modeling/transformers/ext_op/test_ms_deformable_attn_op.py index 67476fac40be08d0ef189dbc6deacb10c664cf82..94a05737cbcd6deef55b10f73d39dbd46beeebf7 100644 --- a/ppdet/modeling/transformers/ext_op/test_ms_deformable_attn_op.py +++ b/ppdet/modeling/transformers/ext_op/test_ms_deformable_attn_op.py @@ -21,7 +21,7 @@ import sys import random import numpy as np import paddle -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 5))) if parent_path not in sys.path: sys.path.append(parent_path) diff --git a/tools/anchor_cluster.py b/tools/anchor_cluster.py index adfd869f0fbd1cbbadb0d15aac7ce3c97ec9b373..e892d403090e6569e16d9548c00841368b427793 100644 --- a/tools/anchor_cluster.py +++ b/tools/anchor_cluster.py @@ -18,7 +18,7 @@ from __future__ import print_function import os import sys -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/tools/eval.py b/tools/eval.py index fc4b95b90e90b883f753c7f3e4965b2f04e9f3be..384a497906bc436a9bd20a5d0cb3165dc4af4f3b 100755 --- a/tools/eval.py +++ b/tools/eval.py @@ -19,7 +19,7 @@ from __future__ import print_function import os import sys -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/tools/eval_mot.py b/tools/eval_mot.py index 9f09533a29f111cbe2fff1922a4eba99ec0fad57..b88d0c4a1dec6b368f9753a0b4fa2b319210c87c 100644 --- a/tools/eval_mot.py +++ b/tools/eval_mot.py @@ -19,7 +19,7 @@ from __future__ import print_function import os import sys -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/tools/export_model.py b/tools/export_model.py index b239060eb57753ec9d1f83dc3061c90fb46d5191..20cfcfaa57289f09ed216a912f0a4bccbceacce0 100644 --- a/tools/export_model.py +++ b/tools/export_model.py @@ -19,7 +19,7 @@ from __future__ import print_function import os import sys -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/tools/infer.py b/tools/infer.py index 2b92d7ba12bbcb5148d0ba9a668c1f7fd7d7ce47..65fb3b7253cd214ad757f3e62a1380b8218a92b0 100755 --- a/tools/infer.py +++ b/tools/infer.py @@ -19,7 +19,7 @@ from __future__ import print_function import os import sys -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/tools/infer_mot.py b/tools/infer_mot.py index c93c47b63d883fab88a1144c922555f51c503e2d..547857beaaf7b1cd2246a80d859d4be053ef6404 100644 --- a/tools/infer_mot.py +++ b/tools/infer_mot.py @@ -19,7 +19,7 @@ from __future__ import print_function import os import sys -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/tools/post_quant.py b/tools/post_quant.py index 0c3404007e7932280b2761e5aa53f66e628e25bd..60acaccc87f5be7256f492a2dd8efa439e888d57 100644 --- a/tools/post_quant.py +++ b/tools/post_quant.py @@ -19,7 +19,7 @@ from __future__ import print_function import os import sys -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) diff --git a/tools/train.py b/tools/train.py index 6604495a2b5c91e0c6257653f617a23d21c4e5e0..ec846519e997f0a70183f1972aa3120555a0f446 100755 --- a/tools/train.py +++ b/tools/train.py @@ -19,7 +19,7 @@ from __future__ import print_function import os import sys -# add python path of PadleDetection to sys.path +# add python path of PaddleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path)