Skip to content

Fix GetExpectedKernelType in Concat op #17459

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
jerrywgz merged 6 commits into from
May 23, 2019
+13 −2
Merged

Fix GetExpectedKernelType in Concat op #17459

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
785d177
fix concat op vartype check, test=develop
jerrywgz May 16, 2019
5590ce0
fix concat op vartype check, test=develop
jerrywgz May 17, 2019
406baa6
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
jerrywgz May 20, 2019
d95d855
refine code, test=develop
jerrywgz May 20, 2019
9d4e298
refine code, test=develop
jerrywgz May 20, 2019
5f900ed
refine code,test=develop
jerrywgz May 22, 2019
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
15 changes: 13 additions & 2 deletions paddle/fluid/operators/concat_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,19 @@ class ConcatOp : public framework::OperatorWithKernel {
protected:
framework::OpKernelType GetExpectedKernelType(
const framework::ExecutionContext &ctx) const override {
auto input_data_type =
framework::GetDataTypeOfVar(ctx.MultiInputVar("X")[0]);
auto vars = ctx.MultiInputVar("X");
const size_t num_input = vars.size();
auto input_data_type = paddle::framework::proto::VarType::Type(0);
for (size_t i = 0; i < num_input; ++i) {
try {
input_data_type = framework::GetDataTypeOfVar(vars[i]);
break;
} catch (platform::EnforceNotMet exception) {
if (i == num_input - 1) {
PADDLE_THROW("All Inputs of Concat OP are Empty!");
}
}
}
Copy link
Copy Markdown
Contributor

@chengduoZH chengduoZH May 22, 2019

Choose a reason for hiding this comment

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

The above implementation is a bit complicated.
You can try to fix like the following:

auto inputs = ctx.MultiInputVar("X");
for(auto* input : inputs){
  if(input->IsInitialized()){
    ....
  }
}


#ifdef PADDLE_WITH_MKLDNN
if (platform::CanMKLDNNBeUsed(ctx)) {
Expand Down