-
Notifications
You must be signed in to change notification settings - Fork 5.7k
add SpatialPyramidPoolLayer c++ support #300
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
cdac60f
add SpatialPyramidPoolLayer c++ support
QiJune fcf177f
reuse code of PoolProjection in PoolProjectionLayer
QiJune 766a61c
fix conflict with baidu/develop
QiJune b282caf
Merge remote-tracking branch 'baidu/develop' into feature/sppnet
QiJune 5ece5c9
add python wrap for sppLayer
QiJune db569f2
fix merge conflict
QiJune e2c0713
follow comments
QiJune 3553576
Merge remote-tracking branch 'baidu/develop' into feature/sppnet
QiJune bdc9d10
Merge remote-tracking branch 'baidu/develop' into feature/sppnet
QiJune 70e0468
add getSize method for PoolProjection
QiJune eaf3dec
follow comments
QiJune dfbde28
add some code comments for SppLayer
QiJune f173341
Merge remote-tracking branch 'baidu/develop' into feature/sppnet
QiJune 61444d9
Merge remote-tracking branch 'baidu/develop' into feature/sppnet
QiJune 9dd588b
fix merge conflicts
QiJune File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* Copyright (c) 2016 Baidu, Inc. All Rights Reserve. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. */ | ||
|
|
||
| #include "PoolProjection.h" | ||
|
|
||
| namespace paddle { | ||
|
|
||
| REGISTER_PROJECTION_CREATE_FUNC(pool2, &PoolProjection::create); | ||
|
|
||
| PoolProjection* PoolProjection::create(const ProjectionConfig& config, | ||
| ParameterPtr parameter, bool useGpu) { | ||
| const std::string& pool = config.pool_conf().pool_type(); | ||
| if (pool == "max") { | ||
| return new MaxPoolProjection(config, parameter, useGpu); | ||
| } else if (pool == "avg") { | ||
| return new AvgPoolProjection(config, parameter, useGpu); | ||
| } else { | ||
| LOG(FATAL) << "Unknown pool type: " << pool; | ||
| return nullptr; | ||
| } | ||
| } | ||
|
|
||
| void MaxPoolProjection::forward() { | ||
| MatrixPtr inputV = in_->value; | ||
| MatrixPtr outV = out_->value; | ||
| outV->maxPoolForward(*inputV, imgSizeY_, imgSize_, channels_, | ||
| sizeX_, sizeY_, strideY_, stride_, | ||
| outputY_, outputX_, confPaddingY_, confPadding_); | ||
| } | ||
|
|
||
| void MaxPoolProjection::backward(const UpdateCallback& callback) { | ||
| (void)callback; | ||
| MatrixPtr outGrad = out_->grad; | ||
| MatrixPtr inputV = in_->value; | ||
| MatrixPtr outV = out_->value; | ||
| MatrixPtr inputGrad = in_->grad; | ||
|
|
||
| if (NULL == inputGrad) { | ||
| return; | ||
| } | ||
| inputGrad->maxPoolBackward(*inputV, imgSizeY_, imgSize_, *outGrad, *outV, | ||
| sizeX_, sizeY_, | ||
| strideY_, stride_, outputY_, outputX_, 1, 1, | ||
| confPaddingY_, confPadding_); | ||
| } | ||
|
|
||
| void AvgPoolProjection::forward() { | ||
| MatrixPtr inputV = in_->value; | ||
| MatrixPtr outV = out_->value; | ||
| outV->avgPoolForward(*inputV, imgSizeY_, imgSize_, channels_, | ||
| sizeX_, sizeY_, strideY_, stride_, | ||
| outputY_, outputX_, confPaddingY_, confPadding_); | ||
| } | ||
|
|
||
| void AvgPoolProjection::backward(const UpdateCallback& callback) { | ||
| (void)callback; | ||
|
|
||
| MatrixPtr outputGrad = out_->grad; | ||
| MatrixPtr inputGrad = in_->grad; | ||
|
|
||
| if (NULL == inputGrad) { | ||
| return; | ||
| } | ||
|
|
||
| inputGrad->avgPoolBackward(*outputGrad, imgSizeY_, imgSize_, | ||
| sizeX_, sizeY_, strideY_, stride_, | ||
| outputY_, outputX_, 1, 1, | ||
| confPaddingY_, confPadding_); | ||
| } | ||
| } // namespace paddle |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
注释改成，样本之间的stride， 这样更容易理解些。