Skip to content

Enable mkldnn_fc for general format #3337

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.

Sign up for GitHub

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
Xreki merged 14 commits into from
Aug 11, 2017
Merged

Enable mkldnn_fc for general format #3337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
def959a
add mkldnn fc files
tensor-tang Aug 4, 2017
3c3a11a
add use_mkldnn flag
tensor-tang Aug 4, 2017
94b172a
fix mkldnn lib bug, and mkldnnbase
tensor-tang Aug 6, 2017
90d5be7
add mkldnn fc forward
tensor-tang Aug 6, 2017
1203ebc
add mkldnn fc backward
tensor-tang Aug 6, 2017
ec9009f
add mkldnn tester
tensor-tang Aug 7, 2017
0c95117
pass mkldnn gtest
tensor-tang Aug 7, 2017
6373291
add test case use_mkldnn_wgt
tensor-tang Aug 8, 2017
e18fbd8
skip reset mkldnn when input size does not change
tensor-tang Aug 8, 2017
abc49f7
Merge remote-tracking branch 'upstream/develop' into merge
tensor-tang Aug 8, 2017
f6a9409
remove unused comments, refine and rename
tensor-tang Aug 8, 2017
b2bd671
rename and refine functions
tensor-tang Aug 9, 2017
a475a57
rename files and classes, use uppercase of Mkldnn and Cpu
tensor-tang Aug 10, 2017
2d4c66d
add comments and todo lists
tensor-tang Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions paddle/gserver/layers/MKLDNNFcLayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ class MKLDNNFcLayer : public MKLDNNLayer {
// input layer size, can not be change after init
size_t iLayerSize_; // == ic * ih * iw

// if has already init the weight
bool hasInitedWgt_;

// if input layer has image size info (ih>1 && iw>1)
bool hasSpatial_;
Copy link
Contributor

@luotao1 luotao1 Aug 10, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

照注释的意思，这个变量改成：hasImgSizeInfo_类似的更加直观。或者其他名字也可。


// fc weight and bias
Expand Down
12 changes: 7 additions & 5 deletions paddle/gserver/tests/MKLDNNTester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ void MKLDNNTester::checkForward() {
}

void MKLDNNTester::checkBackwardData() {
const bool isBN = dnnLayer_->getType() == "mkldnn_batch_norm";
// TODO(TJ): uncomment me when batch norm ready
// const bool isBN = dnnLayer_->getType() == "mkldnn_batch_norm";
for (size_t i = 0; i < dataLayers_[DNN].size(); ++i) {
const MatrixPtr& dnnDiff = dataLayers_[DNN][i]->getOutputGrad();
const MatrixPtr& refDiff = dataLayers_[REF][i]->getOutputGrad();
Expand All @@ -134,10 +135,11 @@ void MKLDNNTester::checkBackwardData() {

double delta = compareMatrix(dnnDiff, refDiff);
EXPECT_LE(fabs(delta), eps_);
if (isBN) {
// the other two inputs in batch norm are for moving mean and var
break;
}
// TODO(TJ): uncomment me when batch norm ready
// if (isBN) {
// // the other two inputs in batch norm are for moving mean and var
// break;
// }
}
}

Expand Down
9 changes: 5 additions & 4 deletions paddle/gserver/tests/MKLDNNTester.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ namespace paddle {
*/
class MKLDNNTester {
enum {
DNN = 0,
REF = 1,
NUM = 2,
DNN = 0, // MKLDNN layer
REF = 1, // Reference layer
NUM = 2, // Number of total
Copy link
Contributor

@luotao1 luotao1 Aug 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

total是啥？Number of MKLDNN layer and Reference layer?

};

protected:
Expand Down Expand Up @@ -107,7 +107,8 @@ class MKLDNNTester {
* Get delta percent
* if many(>failRate) wrong(abs(dnn-ref)/abs(ref)>thres) points return the
* max(diff/ref)
* else return sum(abs(a-b)) / sum(abs(b)) should smaller than eps
* else return sum(abs(a-b)) / sum(abs(b))
* The return value should smaller than eps when passing.
Copy link
Contributor

@luotao1 luotao1 Aug 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The return value should be （缺少动词）

*/
double getDelta(const real* d1,
const real* d2,
Expand Down