add image-level feature support #320
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
nihui
requested changes
Mar 30, 2018
src/layer/interp.cpp
Outdated
| @@ -56,26 +62,42 @@ int Interp::forward(const Mat &bottom_blob, Mat &top_blob) const | |||
| if (top_blob.empty()) | |||
| return -100; | |||
|
|
|||
| if (resize_type == 1)//nearest | |||
| if (resize_type == 1 || bottom_blob.dims == 1)//nearest | |||
There was a problem hiding this comment.
If bottom_blob is a vector, the resize_type is ignored. move this condition out of resize_type path.
if (bottom_blob.dims == 1)
{
// handle this special case, ignore resize_type
return 0;
}
// all the following code shall not be changed
if (resize_type == 1)//nearest
{
}
src/layer/interp.cpp
Outdated
| { | ||
| const float *ptr = ((float*)bottom_blob.data+q); | ||
| float *output_ptr = top_blob.channel(q); | ||
| for (int i = 0; i < top_blob.cstep; ++i) |
There was a problem hiding this comment.
This is what the Mat::fill() does
nihui
requested changes
Mar 31, 2018
src/layer/interp.cpp
Outdated
| @@ -56,26 +62,38 @@ int Interp::forward(const Mat &bottom_blob, Mat &top_blob) const | |||
| if (top_blob.empty()) | |||
| return -100; | |||
|
|
|||
| if (bottom_blob.dims == 1) | |||
| { | |||
| #pragma omp parallel for | |||
src/layer/interp.cpp
Outdated
| for (int q = 0; q < c; ++q) | ||
| { | ||
| const float *ptr = bottom_blob.channel(q); | ||
| float *output_ptr = top_blob.channel(q); |
There was a problem hiding this comment.
keep the ident space of this block
ghimiredhikura
pushed a commit
to ghimiredhikura/NCNNSFD
that referenced
this pull request
Jul 26, 2020
* add image-level feature support * move special case out * tab to space
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.
Resize Cx1x1 feature map to CxHxW, use in DeepLabv3 etc.