Add PPMatting Support #163
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
ziqi-jin
commented
Aug 26, 2022
ziqi-jin
commented
- add PPMatting-512 and PPMatting-1024 support
- add swap background function for MattingResult and SegmentationResult
DefTruth
requested changes
Aug 29, 2022
| #endif | ||
|
|
||
| bool LimitShort::Run(Mat* mat, int max_short, int min_short, ProcLib lib) { | ||
| auto r = LimitShort(max_short, min_short); |
There was a problem hiding this comment.
这个缩写是不是改成 l 更合理？像normalize是n，convert是c，等等
| @@ -0,0 +1,187 @@ | |||
| #include "fastdeploy/vision/matting/ppmatting/ppmatting.h" | |||
| @@ -0,0 +1,44 @@ | |||
| #pragma once | |||
| bool Postprocess(std::vector<FDTensor>& infer_result, MattingResult* result, | ||
| const std::map<std::string, std::array<int, 2>>& im_info); | ||
|
|
||
| bool is_resized = false; |
There was a problem hiding this comment.
private应该加下划线 is_resized_
| return vis_img; | ||
| } | ||
| // 对SegmentationResult做背景替换，由于分割模型可以预测多个类别其中background_label | ||
| // 是 |
| @@ -15,20 +15,24 @@ cd examples/vision/matting/modnet/python/ | |||
| #下载modnet模型文件和测试图片 | |||
| wget https://bj.bcebos.com/paddlehub/fastdeploy/modnet_photographic_portrait_matting.onnx | |||
| wget https://raw.githubusercontent.com/DefTruth/lite.ai.toolkit/main/examples/lite/resources/test_lite_matting_input.jpg | |||
| wget https://raw.githubusercontent.com/DefTruth/lite.ai.toolkit/main/examples/lite/resources/test_lite_matting_bgr.jpg | |||
| # GPU上使用TensorRT推理 | ||
| python infer.py --model modnet_photographic_portrait_matting.onnx --image test_lite_matting_input.jpg --device gpu --use_trt True | ||
| python infer.py --model modnet_photographic_portrait_matting.onnx --image test_lite_matting_input.jpg --bg test_lite_matting_bgr.jpg --device gpu --use_trt True |
| # 下载PPMatting模型文件和测试图片 | ||
| wget https://bj.bcebos.com/paddlehub/fastdeploy/PP-Matting-512.tgz | ||
| tar -xvf PP-Matting-512.tgz | ||
| wget https://raw.githubusercontent.com/DefTruth/lite.ai.toolkit/main/examples/lite/resources/test_lite_matting_input.jpg |
| # GPU推理 (TODO: ORT-GPU 推理会报错) | ||
| ./infer_demo PP-Matting-512 test_lite_matting_input.jpg test_lite_matting_bgr.jpg 1 | ||
| # GPU上TensorRT推理 | ||
| ./infer_demo PP-Matting-512 test_lite_matting_input.jpg test_lite_matting_bgr.jpg 2 |
| result, C.vision. | ||
| SegmentationResult), "The result must be SegmentaitonResult type" | ||
| return C.vision.Visualize.swap_background_segmentation( | ||
| im_data, background, background_label, result) |
There was a problem hiding this comment.
增加remove_small_connected_area定义
DefTruth
approved these changes
Aug 31, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.