提交 8a1abe54 编写于 作者: T tensor-tang

clean fusion infershape code

上级 916f42bc
...@@ -14,7 +14,7 @@ limitations under the License. */ ...@@ -14,7 +14,7 @@ limitations under the License. */
#include "paddle/fluid/operators/attention_lstm_op.h" #include "paddle/fluid/operators/attention_lstm_op.h"
#include <string> #include <string>
#include "paddle/fluid/framework/shape_runtime_infer.h" #include "paddle/fluid/operators/fusion_infershape_define.h"
#include "paddle/fluid/operators/math/blas.h" #include "paddle/fluid/operators/math/blas.h"
#include "paddle/fluid/operators/math/cpu_vec.h" #include "paddle/fluid/operators/math/cpu_vec.h"
#include "paddle/fluid/operators/math/fc_compute.h" #include "paddle/fluid/operators/math/fc_compute.h"
...@@ -24,38 +24,7 @@ namespace paddle { ...@@ -24,38 +24,7 @@ namespace paddle {
namespace operators { namespace operators {
void AttentionLSTMOp::InferShape(framework::InferShapeContext* ctx) const { void AttentionLSTMOp::InferShape(framework::InferShapeContext* ctx) const {
auto* runtime_ctx = dynamic_cast<framework::RuntimeInferShapeContext*>(ctx); FUSION_INFERSHAPE_INIT;
if (runtime_ctx == nullptr) {
LOG(FATAL) << "Should have runtime infer context";
}
const auto& ins = runtime_ctx->OpBase().Inputs();
const auto& outs = runtime_ctx->OpBase().Outputs();
const auto& scope = runtime_ctx->InferScope();
const auto ins_end = ins.end();
const auto outs_end = outs.end();
auto fair_input = [&](const std::string& name) -> bool {
auto it = ins.find(name);
if (it == ins_end) {
return false;
}
const auto& in = it->second;
if (in.size() != 1 || in[0] == framework::kEmptyVarName) {
return false;
}
return scope.FindVar(in[0]) != nullptr;
};
auto fair_output = [&](const std::string& name) -> bool {
auto it = outs.find(name);
if (it == outs_end) {
return false;
}
const auto& out = it->second;
if (out.size() != 1 || out[0] == framework::kEmptyVarName) {
return false;
}
return scope.FindVar(out[0]) != nullptr;
};
PADDLE_ENFORCE(fair_input("X"), "Assert only one Input(X) of AttentionLSTM."); PADDLE_ENFORCE(fair_input("X"), "Assert only one Input(X) of AttentionLSTM.");
PADDLE_ENFORCE(fair_input("C0"), PADDLE_ENFORCE(fair_input("C0"),
"Assert only one Input(C0) of AttentionLSTM."); "Assert only one Input(C0) of AttentionLSTM.");
......
...@@ -15,7 +15,7 @@ limitations under the License. */ ...@@ -15,7 +15,7 @@ limitations under the License. */
#include "paddle/fluid/operators/fusion_gru_op.h" #include "paddle/fluid/operators/fusion_gru_op.h"
#include <cstring> // for memcpy #include <cstring> // for memcpy
#include <string> #include <string>
#include "paddle/fluid/framework/shape_runtime_infer.h" #include "paddle/fluid/operators/fusion_infershape_define.h"
#include "paddle/fluid/operators/math/blas.h" #include "paddle/fluid/operators/math/blas.h"
#include "paddle/fluid/operators/math/cpu_vec.h" #include "paddle/fluid/operators/math/cpu_vec.h"
#include "paddle/fluid/operators/math/fc_compute.h" #include "paddle/fluid/operators/math/fc_compute.h"
...@@ -26,38 +26,7 @@ namespace paddle { ...@@ -26,38 +26,7 @@ namespace paddle {
namespace operators { namespace operators {
void FusionGRUOp::InferShape(framework::InferShapeContext* ctx) const { void FusionGRUOp::InferShape(framework::InferShapeContext* ctx) const {
auto* runtime_ctx = dynamic_cast<framework::RuntimeInferShapeContext*>(ctx); FUSION_INFERSHAPE_INIT;
if (runtime_ctx == nullptr) {
LOG(FATAL) << "Should have runtime infer context";
}
const auto& ins = runtime_ctx->OpBase().Inputs();
const auto& outs = runtime_ctx->OpBase().Outputs();
const auto& scope = runtime_ctx->InferScope();
const auto ins_end = ins.end();
const auto outs_end = outs.end();
auto fair_input = [&](const std::string& name) -> bool {
auto it = ins.find(name);
if (it == ins_end) {
return false;
}
const auto& in = it->second;
if (in.size() != 1 || in[0] == framework::kEmptyVarName) {
return false;
}
return scope.FindVar(in[0]) != nullptr;
};
auto fair_output = [&](const std::string& name) -> bool {
auto it = outs.find(name);
if (it == outs_end) {
return false;
}
const auto& out = it->second;
if (out.size() != 1 || out[0] == framework::kEmptyVarName) {
return false;
}
return scope.FindVar(out[0]) != nullptr;
};
PADDLE_ENFORCE(fair_input("X"), "Assert only one Input(X) of GRU."); PADDLE_ENFORCE(fair_input("X"), "Assert only one Input(X) of GRU.");
PADDLE_ENFORCE(fair_input("WeightX"), PADDLE_ENFORCE(fair_input("WeightX"),
"Assert only one Input(WeightX) of GRU."); "Assert only one Input(WeightX) of GRU.");
......
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
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. */
#ifndef PADDLE_FLUID_OPERATORS_FUSION_INFERSHAPE_DEFINE_H_
#define PADDLE_FLUID_OPERATORS_FUSION_INFERSHAPE_DEFINE_H_
#include <string>
#include "paddle/fluid/framework/shape_runtime_infer.h"
namespace paddle {
namespace operators {
#define FUSION_INFERSHAPE_INIT \
auto* runtime_ctx = dynamic_cast<framework::RuntimeInferShapeContext*>(ctx); \
if (runtime_ctx == nullptr) { \
LOG(FATAL) << "Should have runtime infer context"; \
} \
const auto& ins = runtime_ctx->OpBase().Inputs(); \
const auto& outs = runtime_ctx->OpBase().Outputs(); \
const auto& scope = runtime_ctx->InferScope(); \
const auto ins_end = ins.end(); \
const auto outs_end = outs.end(); \
auto fair_input = [&](const std::string& name) -> bool { \
auto it = ins.find(name); \
if (it == ins_end) { \
return false; \
} \
const auto& in = it->second; \
if (in.size() != 1 || in[0] == framework::kEmptyVarName) { \
return false; \
} \
return scope.FindVar(in[0]) != nullptr; \
}; \
auto fair_output = [&](const std::string& name) -> bool { \
auto it = outs.find(name); \
if (it == outs_end) { \
return false; \
} \
const auto& out = it->second; \
if (out.size() != 1 || out[0] == framework::kEmptyVarName) { \
return false; \
} \
return scope.FindVar(out[0]) != nullptr; \
}
} // namespace operators
} // namespace paddle
#endif // PADDLE_FLUID_OPERATORS_FUSION_INFERSHAPE_DEFINE_H_
...@@ -14,7 +14,7 @@ limitations under the License. */ ...@@ -14,7 +14,7 @@ limitations under the License. */
#include "paddle/fluid/operators/fusion_lstm_op.h" #include "paddle/fluid/operators/fusion_lstm_op.h"
#include <string> #include <string>
#include "paddle/fluid/framework/shape_runtime_infer.h" #include "paddle/fluid/operators/fusion_infershape_define.h"
#include "paddle/fluid/operators/math/blas.h" #include "paddle/fluid/operators/math/blas.h"
#include "paddle/fluid/operators/math/cpu_vec.h" #include "paddle/fluid/operators/math/cpu_vec.h"
#include "paddle/fluid/operators/math/fc_compute.h" #include "paddle/fluid/operators/math/fc_compute.h"
...@@ -25,38 +25,7 @@ namespace paddle { ...@@ -25,38 +25,7 @@ namespace paddle {
namespace operators { namespace operators {
void FusionLSTMOp::InferShape(framework::InferShapeContext* ctx) const { void FusionLSTMOp::InferShape(framework::InferShapeContext* ctx) const {
auto* runtime_ctx = dynamic_cast<framework::RuntimeInferShapeContext*>(ctx); FUSION_INFERSHAPE_INIT;
if (runtime_ctx == nullptr) {
LOG(FATAL) << "Should have runtime infer context";
}
const auto& ins = runtime_ctx->OpBase().Inputs();
const auto& outs = runtime_ctx->OpBase().Outputs();
const auto& scope = runtime_ctx->InferScope();
const auto ins_end = ins.end();
const auto outs_end = outs.end();
auto fair_input = [&](const std::string& name) -> bool {
auto it = ins.find(name);
if (it == ins_end) {
return false;
}
const auto& in = it->second;
if (in.size() != 1 || in[0] == framework::kEmptyVarName) {
return false;
}
return scope.FindVar(in[0]) != nullptr;
};
auto fair_output = [&](const std::string& name) -> bool {
auto it = outs.find(name);
if (it == outs_end) {
return false;
}
const auto& out = it->second;
if (out.size() != 1 || out[0] == framework::kEmptyVarName) {
return false;
}
return scope.FindVar(out[0]) != nullptr;
};
PADDLE_ENFORCE(fair_input("X"), "Assert only one Input(X) of LSTM."); PADDLE_ENFORCE(fair_input("X"), "Assert only one Input(X) of LSTM.");
PADDLE_ENFORCE(fair_input("WeightX"), PADDLE_ENFORCE(fair_input("WeightX"),
"Assert only one Input(WeightX) of LSTM."); "Assert only one Input(WeightX) of LSTM.");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册