refine fusion lstm infershape

fix-develop-build.sh
tensor-tang 7 years ago
parent 94b66bdb5d
commit e0436ad8bb

File diff suppressed because it is too large Load Diff

@ -0,0 +1,86 @@
/* Copyright (c) 2016 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. */
#pragma once
#include <string>
#include <vector>
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/framework/shape_inference.h"
#include "paddle/fluid/framework/var_type.h"
namespace paddle {
namespace framework {
class RuntimeInferShapeContext : public InferShapeContext {
public:
RuntimeInferShapeContext(const OperatorBase& op, const Scope& scope)
: op_(op), scope_(scope) {}
bool HasInput(const std::string& name) const override;
bool HasOutput(const std::string& name) const override;
bool HasInputs(const std::string& name) const override;
bool HasOutputs(const std::string& name) const override;
const OperatorBase& OpBase() const { return op_; }
const Scope& InferScope() const { return scope_; }
AttrReader Attrs() const override { return AttrReader(op_.Attrs()); }
const std::vector<std::string>& Inputs(
const std::string& name) const override {
return op_.Inputs(name);
}
const std::vector<std::string>& Outputs(
const std::string& name) const override {
return op_.Outputs(name);
}
void ShareLoD(const std::string& in, const std::string& out, size_t i = 0,
size_t j = 0) const override;
void ShareLayout(const std::string& in, const std::string& out, size_t i = 0,
size_t j = 0) const;
bool IsRuntime() const override { return true; }
protected:
DDim GetDim(const std::string& name) const override;
void SetDim(const std::string& name, const DDim& dim) override;
std::vector<DDim> GetRepeatedDims(const std::string& name) const override {
PADDLE_THROW("Only compile time support this method");
}
void SetRepeatedDims(const std::string& name,
const std::vector<DDim>& dims) override {
PADDLE_THROW("Only compile time support this method");
}
proto::VarType::Type GetVarType(const std::string& name) const override {
auto* var = scope_.FindVar(name);
return ToVarType(var->Type());
}
InferShapeVarPtr GetVarPtr(const std::string& name) override {
return scope_.FindVar(name);
}
private:
const OperatorBase& op_;
const Scope& scope_;
};
} // namespace framework
} // namespace paddle

@ -14,6 +14,7 @@ limitations under the License. */
#include "paddle/fluid/operators/fusion_lstm_op.h"
#include <string>
#include "paddle/fluid/framework/shape_runtime_infer.h"
#include "paddle/fluid/operators/math/blas.h"
#include "paddle/fluid/operators/math/cpu_vec.h"
#include "paddle/fluid/operators/math/fc_compute.h"
@ -24,26 +25,54 @@ namespace paddle {
namespace operators {
void FusionLSTMOp::InferShape(framework::InferShapeContext* ctx) const {
PADDLE_ENFORCE(ctx->HasInput("X"), "Input(X) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasInput("WeightX"),
"Input(WeightX) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasInput("WeightH"),
"Input(WeightH) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasInput("Bias"),
"Input(Bias) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasOutput("XX"),
"Output(XX) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasOutput("Hidden"),
"Output(Hidden) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasOutput("Cell"),
"Output(Cell) of LSTM should not be null.");
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;
};
PADDLE_ENFORCE(fair_input("X"), "Assert only one Input(X) of LSTM.");
PADDLE_ENFORCE(fair_input("WeightX"),
"Assert only one Input(WeightX) of LSTM.");
PADDLE_ENFORCE(fair_input("WeightH"),
"Assert only one Input(WeightH) of LSTM.");
PADDLE_ENFORCE(fair_input("Bias"), "Assert only one Input(Bias) of LSTM.");
PADDLE_ENFORCE(fair_output("XX"), "Assert only one Output(XX) of LSTM.");
PADDLE_ENFORCE(fair_output("Hidden"),
"Assert only one Output(Hidden) of LSTM.");
PADDLE_ENFORCE(fair_output("Cell"), "Assert only one Output(Cell) of LSTM.");
auto x_dims = ctx->GetInputDim("X");
PADDLE_ENFORCE_EQ(x_dims.size(), 2, "Input(X)'s rank must be 2.");
if (ctx->HasInput("H0")) {
PADDLE_ENFORCE(ctx->HasInput("C0"),
if (fair_input("H0")) {
PADDLE_ENFORCE(fair_input("C0"),
"Input(Cell) and Input(Hidden) of LSTM should not "
"be null at the same time.");
auto h_dims = ctx->GetInputDim("H0");
@ -95,16 +124,16 @@ void FusionLSTMOp::InferShape(framework::InferShapeContext* ctx) const {
xx_width = wx_dims[1];
} else {
xx_width = x_dims[1] > wx_dims[1] ? wx_dims[1] : x_dims[1];
PADDLE_ENFORCE(ctx->HasOutput("BatchedInput"),
"Output(BatchedInput) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasOutput("BatchedHidden"),
"Output(BatchedHidden) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasOutput("BatchedCell"),
"Output(BatchedCell) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasOutput("ReorderedH0"),
"Output(ReorderedH0) of LSTM should not be null.");
PADDLE_ENFORCE(ctx->HasOutput("ReorderedC0"),
"Output(ReorderedC0) of LSTM should not be null.");
PADDLE_ENFORCE(fair_output("BatchedInput"),
"Assert only one Output(BatchedInput) of LSTM.");
PADDLE_ENFORCE(fair_output("BatchedHidden"),
"Assert only one Output(BatchedHidden) of LSTM.");
PADDLE_ENFORCE(fair_output("BatchedCell"),
"Assert only one Output(BatchedCell) of LSTM.");
PADDLE_ENFORCE(fair_output("ReorderedH0"),
"Assert only one Output(ReorderedH0) of LSTM");
PADDLE_ENFORCE(fair_output("ReorderedC0"),
"Assert only one Output(ReorderedC0) of LSTM.");
ctx->SetOutputDim("BatchedInput", {x_dims[0], wx_dims[1]});
ctx->SetOutputDim("BatchedHidden", out_dims);
ctx->SetOutputDim("BatchedCell", out_dims);

Loading…
Cancel
Save