Add PP-ModNet and PP-HumanMatting Support #240
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
DefTruth
requested changes
Sep 16, 2022
| int origin_w = im->cols; | ||
| int origin_h = im->rows; | ||
| im->convertTo(*im, CV_32FC(im->channels())); | ||
| int im_size_max = std::min(origin_w, origin_h); |
There was a problem hiding this comment.
这里的逻辑和CpuRun不一致，这里用了std::min(), 是不是用错了？
|
|
||
| static bool Run(Mat* mat, int max_long = -1, int min_long = -1, | ||
| ProcLib lib = ProcLib::OPENCV_CPU); | ||
| int GetMaxLong() { return max_long_; } |
There was a problem hiding this comment.
如果这个函数不修改max_long_ 的话，可以用const限制，这样某些const LimitLong的情形也可以用
int GetMaxLong() const { return max_long_; }|
|
||
| class ResizeByInputShape : public Processor { | ||
| public: | ||
| ResizeByInputShape(int width, int height, int interp = 1) { |
There was a problem hiding this comment.
这些新加的processor可否在头文件中添加简单的文档说明具体的用处，以便于模型开发进行复用。可以参考convert.h或者normalize.h
|
@ziqi-jin 另外比较建议参考ppdet的方式，modnet, humanmatting，hrnet等模型可以继承ppmatting再进行一层简单的封装，这样既方便用户可以通过类名直接调用到关心的模型，也可以在后续的维护中只单独修改某个模型的逻辑 |
DefTruth
approved these changes
Sep 19, 2022
jiangjiajun
requested changes
Sep 20, 2022
| namespace fastdeploy { | ||
| namespace vision { | ||
|
|
||
| bool ResizeByInputShape::CpuRun(Mat* mat) { |
| @@ -25,6 +25,9 @@ class ResizeToIntMult : public Processor { | |||
| mult_int_ = mult_int; | |||
| interp_ = interp; | |||
| } | |||
|
|
|||
| // Resize Mat* mat to make the size divisible by mult_int_. | |||
| namespace fastdeploy { | ||
| namespace vision { | ||
|
|
||
| class ResizeByInputShape : public Processor { |
Merge develop to ppmodnet
Refine ppmatting code
jiangjiajun
approved these changes
Oct 7, 2022
| FDASSERT(axis >= 0 && axis < ndim, | ||
| "The allowed 'axis' must be in range of (0, %lu)!", ndim); | ||
| shape.erase(shape.begin() + axis); | ||
| } |
There was a problem hiding this comment.
此处需判断这一维必须为1，才能squeeze
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.
PR types
PR changes
Describe
add PP-HumanMatting\ ModNet-MobileNetV2\ ModNet-ResNet50_vd\ ModNet-HRNet_w18
add the process of input_shape for PPMatting
add LimitLong function