Merge mkldnn output grad #4759
Merged
Merge mkldnn output grad #4759
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
and add branch net comparing with cpu result
luotao1
reviewed
Oct 13, 2017
| cpuOutVal_ = out; | ||
| } | ||
| // when output is cpu device, change the mkldnn output value and make they |
paddle/gserver/layers/MKLDNNLayer.h
Outdated
| * and reset the merge grad primitive if needed. | ||
| * note: when this layer have serval output, | ||
| * do not support mixing with cpu device, | ||
| * because can not get memory desc from cpu device. |
There was a problem hiding this comment.
when this layer has serval outputs, it could not be mixed with cpu device, since it can not get memory desc from cpu device.
|
|
||
| auto sumPD = mkldnn::sum::primitive_desc( | ||
| tmpOutGrad_->getMemoryDesc(), scales, srcPDs); | ||
| mergeGrad_.reset(new mkldnn::sum(sumPD, srcs, *tmpOutGrad_)); |
There was a problem hiding this comment.
这里是调用sum这个接口来merge grad，对么？
There was a problem hiding this comment.
是的，调用mkldnn::sum来merge
paddle/gserver/layers/MKLDNNLayer.h
Outdated
| if (outputMap_.size() <= 1) { | ||
| return; | ||
| } | ||
| std::vector<double> scales; |
There was a problem hiding this comment.
这里scale可以初始化为1.0，不需要后面一个个push了吧。我看都是1.0
paddle/trainer/tests/CMakeLists.txt
Outdated
| ${CMAKE_CURRENT_BINARY_DIR}/test_CompareMKLDNNandCPU | ||
| --config_file_a=trainer/tests/sample_trainer_config_branch_net.conf --use_mkldnn_a=True | ||
| --config_file_b=trainer/tests/sample_trainer_config_branch_net.conf --use_mkldnn_b=False | ||
| --use_gpu=False |
There was a problem hiding this comment.
后面是否还会新加对比网络的测试呢？
这里的COMMAND能在CMake里封装下，从而简化下45-56行么？
test_CompareMKLDNNandCPU --config_file=trainer/tests/sample_trainer_config_branch_net.conf
There was a problem hiding this comment.
现在是想着按照种类分，有分支和没有分支的，再加layer就直接改conf文件内容就可以了。
确实可以简化下，done。
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.
fix #4697