forked from apache/mxnet
-
Notifications
You must be signed in to change notification settings - Fork 4
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
add mkldnn surport for concat #3
Merged
Merged
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
fca247d
add mkldnn surport for concat
wentingj ba9e7fa
simplify MKLDNN Flatten.
zheng-da 4a65d29
Enalbe MKLDNN deconvolution with bias.
zheng-da c6a3470
Fix a bug in CuDNN deconvolution.
zheng-da a3ae39f
avoid using MKLDNNStorage when it's not defined.
zheng-da f766f4f
Remove ./cudnn_lrn-inl.h
zheng-da 26eb557
Merge branch 'mkldnn' of https://github.com/zheng-da/incubator-mxnet …
zheng-da f57fd90
Fix for make lint.
zheng-da ab2d9c6
add mkldnn surport for concat
wentingj 0ceaee0
fix the coding style for pr of mkldnn concat
wentingj e4eb0d9
fix the coding style for pr of mkldnn concat
wentingj b31823a
fix the coding style for pr of mkldnn concat (fix merge conficts)
wentingj 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 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 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,85 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you 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. | ||
*/ | ||
|
||
/*! | ||
* \file mkldnn_concat.cc | ||
* \brief | ||
* \author Wenting Jiang | ||
*/ | ||
#include "../concat-inl.h" | ||
#include "./mkldnn_ops-inl.h" | ||
#include "./mkldnn_base-inl.h" | ||
|
||
#if MXNET_USE_MKLDNN == 1 | ||
namespace mxnet { | ||
namespace op { | ||
|
||
void MKLDNNConcat_Forward(const nnvm::NodeAttrs& attrs, const OpContext &ctx, | ||
const std::vector<NDArray> &in_data, const std::vector<OpReqType> &req, | ||
const std::vector<NDArray> &out_data) { | ||
const ConcatParam& param = nnvm::get<ConcatParam>(attrs.parsed); | ||
int num_in_data = param.num_args; | ||
int concat_dim = param.dim; | ||
std::vector<mkldnn::memory::primitive_desc> data_md; | ||
std::vector<mkldnn::primitive::at> data_mem; | ||
for(int i =0; i < num_in_data; i++) { | ||
std::shared_ptr<const mkldnn::memory> tmp_mem = in_data[i].GetMKLDNNData(); | ||
auto tmp_pd = tmp_mem->get_primitive_desc(); | ||
data_md.push_back(tmp_pd); | ||
data_mem.push_back(*tmp_mem); | ||
} | ||
mkldnn::concat::primitive_desc fwd_pd(concat_dim, data_md); | ||
auto engine = CpuEngine::Instance().get_engine(); | ||
auto out_mem = CreateMKLDNNMem(out_data[concat_enum::kOut], | ||
fwd_pd.dst_primitive_desc(), req[concat_enum::kOut]); | ||
MKLDNNStream::Instance().RegisterPrim(mkldnn::concat(fwd_pd, data_mem, *out_mem.second)); | ||
CommitOutput(out_data[concat_enum::kOut], out_mem); | ||
MKLDNNStream::Instance().Submit(); | ||
} | ||
|
||
void MKLDNNConcat_Backward(const nnvm::NodeAttrs& attrs, const OpContext &ctx, | ||
const std::vector<NDArray>& inputs, const std::vector<OpReqType>& req, | ||
const std::vector<NDArray>& outputs) { | ||
const ConcatParam& param = nnvm::get<ConcatParam>(attrs.parsed); | ||
int num_in_data = param.num_args; | ||
int axis_ = param.dim; | ||
auto engine = CpuEngine::Instance().get_engine(); | ||
std::shared_ptr<const mkldnn::memory>gz_mem = inputs[0].GetMKLDNNData(); | ||
mkldnn::memory::primitive_desc gz_pd = gz_mem->get_primitive_desc(); | ||
/* init the offset */ | ||
mkldnn::memory::dims offsets = {0, 0, 0, 0}; | ||
for (int i = 0; i < num_in_data; i++) { | ||
mkldnn::memory::dims diff_src_tz = {inputs[i+1].shape()[0], inputs[i+1].shape()[1], inputs[i+1].shape()[2], inputs[i+1].shape()[3]}; | ||
auto diff_src_mpd = inputs[i+1].GetMKLDNNData()->get_primitive_desc(); | ||
auto gradi_mem_ = CreateMKLDNNMem(outputs[i], diff_src_mpd, req[i]); | ||
// create view from gy to gxs[i] | ||
std::shared_ptr<mkldnn::view::primitive_desc> view_pd; | ||
view_pd.reset(new mkldnn::view::primitive_desc(gz_pd, diff_src_tz, offsets)); | ||
// create reorder primitive from gy to gxs[i] | ||
mkldnn::reorder::primitive_desc reorder_pd(view_pd.get()->dst_primitive_desc(), diff_src_mpd); | ||
offsets[axis_] += diff_src_tz[axis_]; | ||
MKLDNNStream::Instance().RegisterPrim(mkldnn::reorder(reorder_pd, *gz_mem, *gradi_mem_.second)); | ||
CommitOutput(outputs[i], gradi_mem_); | ||
} | ||
MKLDNNStream::Instance().Submit(); | ||
} | ||
|
||
}//op | ||
}//mxnet | ||
#endif |
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
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.
this makes native concat fail. The native concat only expects out_grad.