From 7afcd4b37300a7a93fb3b68f11493fccf0bfd34c Mon Sep 17 00:00:00 2001 From: jiangjiajun Date: Sun, 9 Oct 2022 02:49:58 +0000 Subject: [PATCH] Correct PP-Series models' name --- examples/vision/detection/README.md | 4 ++-- examples/vision/detection/paddledetection/README.md | 4 ++-- .../ocr/{PPOCRSystemv2 => PP-OCRv2}/cpp/CMakeLists.txt | 0 .../ocr/{PPOCRSystemv2 => PP-OCRv2}/cpp/README.md | 0 .../ocr/{PPOCRSystemv2 => PP-OCRv2}/cpp/infer.cc | 0 .../ocr/{PPOCRSystemv2 => PP-OCRv2}/python/README.md | 2 +- .../ocr/{PPOCRSystemv2 => PP-OCRv2}/python/infer.py | 0 .../ocr/{PPOCRSystemv3 => PP-OCRv3}/cpp/CMakeLists.txt | 0 .../ocr/{PPOCRSystemv3 => PP-OCRv3}/cpp/README.md | 0 .../ocr/{PPOCRSystemv3 => PP-OCRv3}/cpp/infer.cc | 0 .../ocr/{PPOCRSystemv3 => PP-OCRv3}/python/README.md | 2 +- .../ocr/{PPOCRSystemv3 => PP-OCRv3}/python/infer.py | 0 examples/vision/ocr/README.md | 10 +++++----- 13 files changed, 11 insertions(+), 11 deletions(-) rename examples/vision/ocr/{PPOCRSystemv2 => PP-OCRv2}/cpp/CMakeLists.txt (100%) rename examples/vision/ocr/{PPOCRSystemv2 => PP-OCRv2}/cpp/README.md (100%) rename examples/vision/ocr/{PPOCRSystemv2 => PP-OCRv2}/cpp/infer.cc (100%) rename examples/vision/ocr/{PPOCRSystemv2 => PP-OCRv2}/python/README.md (99%) rename examples/vision/ocr/{PPOCRSystemv2 => PP-OCRv2}/python/infer.py (100%) rename examples/vision/ocr/{PPOCRSystemv3 => PP-OCRv3}/cpp/CMakeLists.txt (100%) rename examples/vision/ocr/{PPOCRSystemv3 => PP-OCRv3}/cpp/README.md (100%) rename examples/vision/ocr/{PPOCRSystemv3 => PP-OCRv3}/cpp/infer.cc (100%) rename examples/vision/ocr/{PPOCRSystemv3 => PP-OCRv3}/python/README.md (99%) rename examples/vision/ocr/{PPOCRSystemv3 => PP-OCRv3}/python/infer.py (100%) diff --git a/examples/vision/detection/README.md b/examples/vision/detection/README.md index 28c476273..9bdef85df 100644 --- a/examples/vision/detection/README.md +++ b/examples/vision/detection/README.md @@ -4,11 +4,11 @@ FastDeploy目前支持如下目标检测模型部署 | 模型 | 说明 | 模型格式 | 版本 | | :--- | :--- | :------- | :--- | -| [PaddleDetection/PPYOLOE](./paddledetection) | PPYOLOE系列模型 | Paddle | [Release/2.4](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4) | +| [PaddleDetection/PP-YOLOE](./paddledetection) | PPYOLOE系列模型 | Paddle | [Release/2.4](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4) | | [PaddleDetection/PicoDet](./paddledetection) | PicoDet系列模型 | Paddle | [Release/2.4](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4) | | [PaddleDetection/YOLOX](./paddledetection) | Paddle版本的YOLOX系列模型 | Paddle | [Release/2.4](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4) | | [PaddleDetection/YOLOv3](./paddledetection) | YOLOv3系列模型 | Paddle | [Release/2.4](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4) | -| [PaddleDetection/PPYOLO](./paddledetection) | PPYOLO系列模型 | Paddle | [Release/2.4](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4) | +| [PaddleDetection/PP-YOLO](./paddledetection) | PPYOLO系列模型 | Paddle | [Release/2.4](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4) | | [PaddleDetection/FasterRCNN](./paddledetection) | FasterRCNN系列模型 | Paddle | [Release/2.4](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4) | | [WongKinYiu/YOLOv7](./yolov7) | YOLOv7、YOLOv7-X等系列模型 | ONNX | [Release/v0.1](https://github.com/WongKinYiu/yolov7/tree/v0.1) | | [RangiLyu/NanoDetPlus](./nanodet_plus) | NanoDetPlus 系列模型 | ONNX | [Release/v1.0.0-alpha-1](https://github.com/RangiLyu/nanodet/tree/v1.0.0-alpha-1) | diff --git a/examples/vision/detection/paddledetection/README.md b/examples/vision/detection/paddledetection/README.md index 0060d7706..6dbcf6cd8 100644 --- a/examples/vision/detection/paddledetection/README.md +++ b/examples/vision/detection/paddledetection/README.md @@ -8,9 +8,9 @@ 目前FastDeploy支持如下模型的部署 -- [PPYOLOE系列模型](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4/configs/ppyoloe) +- [PP-YOLOE系列模型](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4/configs/ppyoloe) - [PicoDet系列模型](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4/configs/picodet) -- [PPYOLO系列模型(含v2)](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4/configs/ppyolo) +- [PP-YOLO系列模型(含v2)](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4/configs/ppyolo) - [YOLOv3系列模型](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4/configs/yolov3) - [YOLOX系列模型](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4/configs/yolox) - [FasterRCNN系列模型](https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.4/configs/faster_rcnn) diff --git a/examples/vision/ocr/PPOCRSystemv2/cpp/CMakeLists.txt b/examples/vision/ocr/PP-OCRv2/cpp/CMakeLists.txt similarity index 100% rename from examples/vision/ocr/PPOCRSystemv2/cpp/CMakeLists.txt rename to examples/vision/ocr/PP-OCRv2/cpp/CMakeLists.txt diff --git a/examples/vision/ocr/PPOCRSystemv2/cpp/README.md b/examples/vision/ocr/PP-OCRv2/cpp/README.md similarity index 100% rename from examples/vision/ocr/PPOCRSystemv2/cpp/README.md rename to examples/vision/ocr/PP-OCRv2/cpp/README.md diff --git a/examples/vision/ocr/PPOCRSystemv2/cpp/infer.cc b/examples/vision/ocr/PP-OCRv2/cpp/infer.cc similarity index 100% rename from examples/vision/ocr/PPOCRSystemv2/cpp/infer.cc rename to examples/vision/ocr/PP-OCRv2/cpp/infer.cc diff --git a/examples/vision/ocr/PPOCRSystemv2/python/README.md b/examples/vision/ocr/PP-OCRv2/python/README.md similarity index 99% rename from examples/vision/ocr/PPOCRSystemv2/python/README.md rename to examples/vision/ocr/PP-OCRv2/python/README.md index e2d2f6e06..431ba5b5a 100644 --- a/examples/vision/ocr/PPOCRSystemv2/python/README.md +++ b/examples/vision/ocr/PP-OCRv2/python/README.md @@ -26,7 +26,7 @@ wget https://gitee.com/paddlepaddle/PaddleOCR/raw/release/2.6/ppocr/utils/ppocr_ #下载部署示例代码 git clone https://github.com/PaddlePaddle/FastDeploy.git -cd examples/vison/ocr/PPOCRSystemv2/python/ +cd examples/vison/ocr/PP-OCRv2/python/ # CPU推理 python infer.py --det_model ch_PP-OCRv2_det_infer --cls_model ch_ppocr_mobile_v2.0_cls_infer --rec_model ch_PP-OCRv2_rec_infer --rec_label_file ppocr_keys_v1.txt --image 12.jpg --device cpu diff --git a/examples/vision/ocr/PPOCRSystemv2/python/infer.py b/examples/vision/ocr/PP-OCRv2/python/infer.py similarity index 100% rename from examples/vision/ocr/PPOCRSystemv2/python/infer.py rename to examples/vision/ocr/PP-OCRv2/python/infer.py diff --git a/examples/vision/ocr/PPOCRSystemv3/cpp/CMakeLists.txt b/examples/vision/ocr/PP-OCRv3/cpp/CMakeLists.txt similarity index 100% rename from examples/vision/ocr/PPOCRSystemv3/cpp/CMakeLists.txt rename to examples/vision/ocr/PP-OCRv3/cpp/CMakeLists.txt diff --git a/examples/vision/ocr/PPOCRSystemv3/cpp/README.md b/examples/vision/ocr/PP-OCRv3/cpp/README.md similarity index 100% rename from examples/vision/ocr/PPOCRSystemv3/cpp/README.md rename to examples/vision/ocr/PP-OCRv3/cpp/README.md diff --git a/examples/vision/ocr/PPOCRSystemv3/cpp/infer.cc b/examples/vision/ocr/PP-OCRv3/cpp/infer.cc similarity index 100% rename from examples/vision/ocr/PPOCRSystemv3/cpp/infer.cc rename to examples/vision/ocr/PP-OCRv3/cpp/infer.cc diff --git a/examples/vision/ocr/PPOCRSystemv3/python/README.md b/examples/vision/ocr/PP-OCRv3/python/README.md similarity index 99% rename from examples/vision/ocr/PPOCRSystemv3/python/README.md rename to examples/vision/ocr/PP-OCRv3/python/README.md index 4e438fc5c..e3ec0e5a0 100644 --- a/examples/vision/ocr/PPOCRSystemv3/python/README.md +++ b/examples/vision/ocr/PP-OCRv3/python/README.md @@ -25,7 +25,7 @@ wget https://gitee.com/paddlepaddle/PaddleOCR/raw/release/2.6/ppocr/utils/ppocr_ #下载部署示例代码 git clone https://github.com/PaddlePaddle/FastDeploy.git -cd examples/vison/ocr/PPOCRSystemv3/python/ +cd examples/vison/ocr/PP-OCRv3/python/ # CPU推理 python infer.py --det_model ch_PP-OCRv3_det_infer --cls_model ch_ppocr_mobile_v2.0_cls_infer --rec_model ch_PP-OCRv3_rec_infer --rec_label_file ppocr_keys_v1.txt --image 12.jpg --device cpu diff --git a/examples/vision/ocr/PPOCRSystemv3/python/infer.py b/examples/vision/ocr/PP-OCRv3/python/infer.py similarity index 100% rename from examples/vision/ocr/PPOCRSystemv3/python/infer.py rename to examples/vision/ocr/PP-OCRv3/python/infer.py diff --git a/examples/vision/ocr/README.md b/examples/vision/ocr/README.md index 4a88654d7..a8f55d9e9 100644 --- a/examples/vision/ocr/README.md +++ b/examples/vision/ocr/README.md @@ -11,9 +11,9 @@ | OCR版本 | 文本框检测 | 方向分类模型 | 文字识别 |字典文件| 说明 | |:----|:----|:----|:----|:----|:--------| -| PPOCRv3[推荐] |[ch_PP-OCRv3_det](https://paddleocr.bj.bcebos.com/PP-OCRv3/chinese/ch_PP-OCRv3_det_infer.tar) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [ch_PP-OCRv3_rec](https://paddleocr.bj.bcebos.com/PP-OCRv3/chinese/ch_PP-OCRv3_rec_infer.tar) | [ppocr_keys_v1.txt](https://bj.bcebos.com/paddlehub/fastdeploy/ppocr_keys_v1.txt) | OCRv3系列原始超轻量模型，支持中英文、多语种文本检测 | -| PPOCRv3[推荐] |[en_PP-OCRv3_det](https://bj.bcebos.com/paddlehub/fastdeploy/en_PP-OCRv3_det_infer.tar.gz) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [en_PP-OCRv3_rec](https://paddleocr.bj.bcebos.com/PP-OCRv3/english/en_PP-OCRv3_rec_infer.tar) | [en_dict.txt](https://bj.bcebos.com/paddlehub/fastdeploy/en_dict.txt) | OCRv3系列原始超轻量模型，支持英文与数字识别，除检测模型和识别模型的训练数据与中文模型不同以外，无其他区别 | -| PPOCRv2 |[ch_PP-OCRv2_det](https://bj.bcebos.com/paddlehub/fastdeploy/ch_PP-OCRv2_det_infer.tar.gz) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [ch_PP-OCRv2_rec](https://bj.bcebos.com/paddlehub/fastdeploy/ch_PP-OCRv2_rec_infer.tar.gz) | [ppocr_keys_v1.txt](https://bj.bcebos.com/paddlehub/fastdeploy/ppocr_keys_v1.txt) | OCRv2系列原始超轻量模型，支持中英文、多语种文本检测 | -| PPOCRv2_mobile |[ch_ppocr_mobile_v2.0_det](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_det_infer.tar.gz) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [ch_ppocr_mobile_v2.0_rec](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_rec_infer.tar.gz) | [ppocr_keys_v1.txt](https://bj.bcebos.com/paddlehub/fastdeploy/ppocr_keys_v1.txt) | OCRv2系列原始超轻量模型，支持中英文、多语种文本检测,比PPOCRv2更加轻量 | -| PPOCRv2_server |[ch_ppocr_server_v2.0_det](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_server_v2.0_det_infer.tar.gz) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [ch_ppocr_server_v2.0_rec](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_server_v2.0_rec_infer.tar.gz) |[ppocr_keys_v1.txt](https://bj.bcebos.com/paddlehub/fastdeploy/ppocr_keys_v1.txt) | OCRv2服务器系列模型, 支持中英文、多语种文本检测，比超轻量模型更大，但效果更好| +| ch_PP-OCRv3[推荐] |[ch_PP-OCRv3_det](https://paddleocr.bj.bcebos.com/PP-OCRv3/chinese/ch_PP-OCRv3_det_infer.tar) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [ch_PP-OCRv3_rec](https://paddleocr.bj.bcebos.com/PP-OCRv3/chinese/ch_PP-OCRv3_rec_infer.tar) | [ppocr_keys_v1.txt](https://bj.bcebos.com/paddlehub/fastdeploy/ppocr_keys_v1.txt) | OCRv3系列原始超轻量模型，支持中英文、多语种文本检测 | +| en_PP-OCRv3[推荐] |[en_PP-OCRv3_det](https://bj.bcebos.com/paddlehub/fastdeploy/en_PP-OCRv3_det_infer.tar.gz) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [en_PP-OCRv3_rec](https://paddleocr.bj.bcebos.com/PP-OCRv3/english/en_PP-OCRv3_rec_infer.tar) | [en_dict.txt](https://bj.bcebos.com/paddlehub/fastdeploy/en_dict.txt) | OCRv3系列原始超轻量模型，支持英文与数字识别，除检测模型和识别模型的训练数据与中文模型不同以外，无其他区别 | +| ch_PP-OCRv2 |[ch_PP-OCRv2_det](https://bj.bcebos.com/paddlehub/fastdeploy/ch_PP-OCRv2_det_infer.tar.gz) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [ch_PP-OCRv2_rec](https://bj.bcebos.com/paddlehub/fastdeploy/ch_PP-OCRv2_rec_infer.tar.gz) | [ppocr_keys_v1.txt](https://bj.bcebos.com/paddlehub/fastdeploy/ppocr_keys_v1.txt) | OCRv2系列原始超轻量模型，支持中英文、多语种文本检测 | +| ch_PP-OCRv2_mobile |[ch_ppocr_mobile_v2.0_det](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_det_infer.tar.gz) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [ch_ppocr_mobile_v2.0_rec](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_rec_infer.tar.gz) | [ppocr_keys_v1.txt](https://bj.bcebos.com/paddlehub/fastdeploy/ppocr_keys_v1.txt) | OCRv2系列原始超轻量模型，支持中英文、多语种文本检测,比PPOCRv2更加轻量 | +| ch_PP-OCRv2_server |[ch_ppocr_server_v2.0_det](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_server_v2.0_det_infer.tar.gz) | [ch_ppocr_mobile_v2.0_cls](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_mobile_v2.0_cls_infer.tar.gz) | [ch_ppocr_server_v2.0_rec](https://bj.bcebos.com/paddlehub/fastdeploy/ch_ppocr_server_v2.0_rec_infer.tar.gz) |[ppocr_keys_v1.txt](https://bj.bcebos.com/paddlehub/fastdeploy/ppocr_keys_v1.txt) | OCRv2服务器系列模型, 支持中英文、多语种文本检测，比超轻量模型更大，但效果更好|