From 6e12a9a8c5f0c0f8d7348ab3661d38092e6fbfc7 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 18 Aug 2022 19:13:37 +0800 Subject: [PATCH 1/2] [docs] update osx and win prebuilt cpp libs links (#130) (#131) Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> --- docs/quick_start/CPP_prebuilt_libraries.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/quick_start/CPP_prebuilt_libraries.md b/docs/quick_start/CPP_prebuilt_libraries.md index 398221cc93..c5aaf1bdc3 100644 --- a/docs/quick_start/CPP_prebuilt_libraries.md +++ b/docs/quick_start/CPP_prebuilt_libraries.md @@ -21,8 +21,8 @@ FastDeploy提供了在Windows/Linux/Mac上的预先编译CPP部署库，开发 | 部署库下载地址 | 硬件 | 说明 | | :------------- | :--- | :--- | -| [fastdeploy-win-x64-0.2.0.zip](https://bj.bcebos.com/paddlehub/fastdeploy/cpp/fastdeploy-win-x64-0.2.0.zip) | CPU | Visual Studio 16 2019 编译产出 | -| [fastdeploy-win-x64-gpu-0.2.0.zip](https://bj.bcebos.com/paddlehub/fastdeploy/cpp/fastdeploy-win-x64-gpu-0.2.0.zip) | CPU/GPU | Visual Studio 16 2019，cuda 11.2, cudnn 8.2编译产出 | +| [fastdeploy-win-x64-0.2.0.zip](https://bj.bcebos.com/fastdeploy/release/cpp/fastdeploy-win-x64-0.2.0.zip) | CPU | Visual Studio 16 2019 编译产出 | +| [fastdeploy-win-x64-gpu-0.2.0.zip](https://bj.bcebos.com/fastdeploy/release/cpp/fastdeploy-win-x64-gpu-0.2.0.zip) | CPU/GPU | Visual Studio 16 2019，cuda 11.2, cudnn 8.2编译产出 | ### Linux aarch64平台 @@ -35,8 +35,8 @@ FastDeploy提供了在Windows/Linux/Mac上的预先编译CPP部署库，开发 | 部署库下载地址 | 架构 |硬件 | | :---- | :-- | :------ | -| [fastdeploy-osx-x86_64-0.2.0.tgz](https://bj.bcebos.com/paddlehub/fastdeploy/cpp/fastdeploy-osx-x86_64-0.2.0.tgz) | x86 | CPU | -| [fastdeploy-osx-arm64-0.2.0.tgz](https://bj.bcebos.com/paddlehub/fastdeploy/cpp/fastdeploy-osx-arm64-0.2.0.tgz) | arm64 | CPU | +| [fastdeploy-osx-x86_64-0.2.0.tgz](https://bj.bcebos.com/fastdeploy/release/cpp/fastdeploy-osx-x86_64-0.2.0.tgz) | x86 | CPU | +| [fastdeploy-osx-arm64-0.2.0.tgz](https://bj.bcebos.com/fastdeploy/release/cpp/fastdeploy-osx-arm64-0.2.0.tgz) | arm64 | CPU | ## 其它文档 From c7c29f94c159ba6e79c63152bb807fec33e9cdae Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 18 Aug 2022 19:31:51 +0800 Subject: [PATCH 2/2] Update release 0.2 (#132) * [docs] update osx and win prebuilt cpp libs links (#130) * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update requirements.txt * Update README.md Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> Co-authored-by: leiqing <54695910+leiqing1@users.noreply.github.com> --- README.md | 4 ++-- .../vision/detection/paddledetection/python/README.md | 9 +++++---- examples/vision/detection/scaledyolov4/python/README.md | 9 ++++----- examples/vision/detection/yolor/python/README.md | 9 ++++----- requirements.txt | 4 +++- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index c7109a1acb..221e00bd07 100644 --- a/README.md +++ b/README.md @@ -64,11 +64,11 @@ #### 安装 CPU Python 版本 ``` -pip install fastdeploy-python -f https://www.paddlepaddle.org.cn/whl/fastdeploy.html +pip install numpy opencv-python fastdeploy-python -f https://www.paddlepaddle.org.cn/whl/fastdeploy.html ``` #### 安装 GPU Python 版本 ``` -pip install fastdeploy-gpu-python -f https://www.paddlepaddle.org.cn/whl/fastdeploy.html +pip install numpy opencv-python fastdeploy-gpu-python -f https://www.paddlepaddle.org.cn/whl/fastdeploy.html ``` #### 安装 C++ 版本 diff --git a/examples/vision/detection/paddledetection/python/README.md b/examples/vision/detection/paddledetection/python/README.md index 71baa359d6..7c72e265a5 100644 --- a/examples/vision/detection/paddledetection/python/README.md +++ b/examples/vision/detection/paddledetection/python/README.md @@ -8,15 +8,16 @@ 本目录下提供`infer_xxx.py`快速完成PPYOLOE/PicoDet等模型在CPU/GPU，以及GPU上通过TensorRT加速部署的示例。执行如下脚本即可完成 ``` + +#下载部署示例代码 +git clone https://github.com/PaddlePaddle/FastDeploy.git +cd examples/vision/detection/paddledetection/python/ + #下载PPYOLOE模型文件和测试图片 wget https://bj.bcebos.com/paddlehub/fastdeploy/ppyoloe_crn_l_300e_coco.tgz wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg tar xvf ppyoloe_crn_l_300e_coco.tgz -#下载部署示例代码 -git clone https://github.com/PaddlePaddle/FastDeploy.git -cd examples/vison/detection/paddledetection/python/ - # CPU推理 python infer.py --model_dir ppyoloe_crn_l_300e_coco --image 000000087038.jpg --device cpu # GPU推理 diff --git a/examples/vision/detection/scaledyolov4/python/README.md b/examples/vision/detection/scaledyolov4/python/README.md index d441493294..99de05449b 100644 --- a/examples/vision/detection/scaledyolov4/python/README.md +++ b/examples/vision/detection/scaledyolov4/python/README.md @@ -8,15 +8,14 @@ 本目录下提供`infer.py`快速完成ScaledYOLOv4在CPU/GPU，以及GPU上通过TensorRT加速部署的示例。执行如下脚本即可完成 ``` -#下载scaledyolov4模型文件和测试图片 -wget https://bj.bcebos.com/paddlehub/fastdeploy/scaled_yolov4-p5.onnx -wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg - - #下载部署示例代码 git clone https://github.com/PaddlePaddle/FastDeploy.git cd examples/vison/detection/scaledyolov4/python/ +#下载scaledyolov4模型文件和测试图片 +wget https://bj.bcebos.com/paddlehub/fastdeploy/scaled_yolov4-p5.onnx +wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg + # CPU推理 python infer.py --model scaled_yolov4-p5.onnx --image 000000014439.jpg --device cpu # GPU推理 diff --git a/examples/vision/detection/yolor/python/README.md b/examples/vision/detection/yolor/python/README.md index 75cd454e64..50eac0f5db 100644 --- a/examples/vision/detection/yolor/python/README.md +++ b/examples/vision/detection/yolor/python/README.md @@ -8,15 +8,14 @@ 本目录下提供`infer.py`快速完成YOLOR在CPU/GPU，以及GPU上通过TensorRT加速部署的示例。执行如下脚本即可完成 ``` -#下载YOLOR模型文件和测试图片 -wget https://bj.bcebos.com/paddlehub/fastdeploy/yolor-p6-paper-541-640-640.onnx -wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg - - #下载部署示例代码 git clone https://github.com/PaddlePaddle/FastDeploy.git cd examples/vison/detection/yolor/python/ +#下载YOLOR模型文件和测试图片 +wget https://bj.bcebos.com/paddlehub/fastdeploy/yolor-p6-paper-541-640-640.onnx +wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg + # CPU推理 python infer.py --model yolor-p6-paper-541-640-640.onnx --image 000000014439.jpg --device cpu # GPU推理 diff --git a/requirements.txt b/requirements.txt index 2c8b74ebd0..62c894c202 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,4 @@ requests -tqdm \ No newline at end of file +tqdm +numpy +opencv-python