Skip to content

Commit

Permalink
Dygraph performance optimization (v2) (PaddlePaddle#42103)
Browse files Browse the repository at this point in the history
* optimiaze performance of PreparePhiData

* dygraph performance optimization
  • Loading branch information
zyfncg committed Apr 24, 2022
1 parent 2044806 commit 778155a
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 35 deletions.
6 changes: 3 additions & 3 deletions paddle/fluid/framework/infershape_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@ CompatInferMetaContext BuildInferMetaContext(InferShapeContext* ctx,
CompatInferMetaContext infer_meta_context(
{ctx->IsRuntime(), ctx->IsRunMKLDNNKernel()});

auto& input_names = std::get<0>(signature.args);
auto& attr_names = std::get<1>(signature.args);
auto& output_names = std::get<2>(signature.args);
const auto& input_names = signature.input_names;
const auto& attr_names = signature.attr_names;
const auto& output_names = signature.output_names;

const auto& args_def =
phi::KernelFactory::Instance().GetFirstKernelArgsDef(signature.name);
Expand Down
22 changes: 14 additions & 8 deletions paddle/fluid/framework/operator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1200,8 +1200,10 @@ bool OperatorWithKernel::SupportsMKLDNN(

bool OperatorWithKernel::CanMKLDNNBeUsed(const framework::ExecutionContext& ctx,
proto::VarType::Type data_type) const {
bool use_mkldnn_ctx = ctx.HasAttr("use_mkldnn") &&
ctx.Attr<bool>("use_mkldnn") &&
const auto& attrs_map = ctx.Attrs();
auto iter = attrs_map.find("use_mkldnn");
bool use_mkldnn_ctx = iter != attrs_map.end() &&
BOOST_GET_CONST(bool, iter->second) &&
platform::is_cpu_place(ctx.GetPlace());
return use_mkldnn_ctx && this->SupportsMKLDNN(data_type);
}
Expand Down Expand Up @@ -2126,7 +2128,7 @@ KernelSignature OperatorWithKernel::GetExpectedPhiKernelArgs(
Scope* OperatorWithKernel::PreparePhiData(
const Scope& scope, const phi::Kernel& pt_kernel,
const KernelSignature& pt_kernel_signature, RuntimeContext* ctx) const {
auto& input_names = std::get<0>(pt_kernel_signature.args);
const auto& input_names = pt_kernel_signature.input_names;
auto input_defs = pt_kernel.args_def().input_defs();
PADDLE_ENFORCE_EQ(input_names.size(), input_defs.size(),
platform::errors::InvalidArgument(
Expand Down Expand Up @@ -2178,11 +2180,15 @@ Scope* OperatorWithKernel::PreparePhiData(
if (in_def.backend == phi::Backend::ALL_BACKEND) {
continue;
}
auto expected_place = phi::TransToPhiPlace(in_def.backend);
if (platform::is_same_place(tensor_in->place(), expected_place)) {

auto tensor_backend = phi::TransToPhiBackend(tensor_in->place());
if (in_def.backend == tensor_backend ||
(in_def.backend == phi::Backend::GPUDNN &&
tensor_backend == phi::Backend::GPU)) {
continue;
}

auto expected_place = phi::TransToPhiPlace(in_def.backend);
VLOG(3) << "phi Transform Variable " << input_names[i] << " from "
<< tensor_in->place() << " to " << expected_place;

Expand Down Expand Up @@ -2219,9 +2225,9 @@ void OperatorWithKernel::BuildPhiKernelContext(
phi::KernelContext* pt_kernel_context) const {
pt_kernel_context->SetDeviceContext(dev_ctx);

auto& input_names = std::get<0>(pt_kernel_signature_->args);
auto& attr_names = std::get<1>(pt_kernel_signature_->args);
auto& output_names = std::get<2>(pt_kernel_signature_->args);
auto& input_names = pt_kernel_signature_->input_names;
auto& attr_names = pt_kernel_signature_->attr_names;
auto& output_names = pt_kernel_signature_->output_names;

auto input_defs = pt_kernel_->args_def().input_defs();
auto attr_defs = pt_kernel_->args_def().attribute_defs();
Expand Down
8 changes: 4 additions & 4 deletions paddle/fluid/imperative/prepared_operator.h
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,9 @@ void BuildDygraphPhiKernelContext(
platform::DeviceContext* dev_ctx, phi::KernelContext* kernel_ctx) {
kernel_ctx->SetDeviceContext(dev_ctx);

auto& input_names = std::get<0>(pt_kernel_signature.args);
auto& attr_names = std::get<1>(pt_kernel_signature.args);
auto& output_names = std::get<2>(pt_kernel_signature.args);
const auto& input_names = pt_kernel_signature.input_names;
const auto& attr_names = pt_kernel_signature.attr_names;
const auto& output_names = pt_kernel_signature.output_names;

auto& input_defs = pt_kernel.args_def().input_defs();
auto& output_defs = pt_kernel.args_def().output_defs();
Expand Down Expand Up @@ -570,7 +570,7 @@ template <typename VarType>
void PreparePhiData(const phi::Kernel& pt_kernel,
const framework::KernelSignature& pt_kernel_signature,
const NameVarMap<VarType>& ins) {
auto& input_names = std::get<0>(pt_kernel_signature.args);
const auto& input_names = pt_kernel_signature.input_names;
auto& input_defs = pt_kernel.args_def().input_defs();

PADDLE_ENFORCE_EQ(input_names.size(), input_defs.size(),
Expand Down
6 changes: 3 additions & 3 deletions paddle/fluid/pybind/imperative.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2050,9 +2050,9 @@ void BindImperative(py::module *m_ptr) {
};
auto ret = self.GetExpectedKernelSignature(type, ins_map,
outs_map, attrs);
auto kernelsig_ins = input_to_vector(std::get<0>(ret.args));
auto kernelsig_attrs = attr_to_vector(std::get<1>(ret.args));
auto kernelsig_outs = output_to_vector(std::get<2>(ret.args));
auto kernelsig_ins = input_to_vector(ret.input_names);
auto kernelsig_attrs = attr_to_vector(ret.attr_names);
auto kernelsig_outs = output_to_vector(ret.output_names);
return std::make_tuple(kernelsig_ins, kernelsig_attrs,
kernelsig_outs);
}
Expand Down
8 changes: 4 additions & 4 deletions paddle/fluid/pybind/kernel_signature_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,25 @@ int main(int argc, char **argv) {
if (kernel_signature_map.Has(op_name)) {
kernel_signature_map_str =
kernel_signature_map_str + "\"" + op_kernel_pair.first + "\":{";
auto &args = kernel_signature_map.Get(op_name).args;
const auto &args = kernel_signature_map.Get(op_name);

kernel_signature_map_str += "\"inputs\":[";
auto inputs_ = std::get<0>(args);
auto inputs_ = args.input_names;
for (size_t i = 0; i < inputs_.size(); i++) {
kernel_signature_map_str =
kernel_signature_map_str + "\"" + inputs_[i] + "\",";
}
if (inputs_.size()) kernel_signature_map_str.pop_back();

kernel_signature_map_str += "],\"attrs\":[";
auto attrs_ = std::get<1>(args);
auto attrs_ = args.attr_names;
for (size_t i = 0; i < attrs_.size(); i++) {
kernel_signature_map_str =
kernel_signature_map_str + "\"" + attrs_[i] + "\",";
}
if (attrs_.size()) kernel_signature_map_str.pop_back();
kernel_signature_map_str += "],\"outputs\":[";
auto outputs_ = std::get<2>(args);
auto outputs_ = args.output_names;
for (size_t i = 0; i < outputs_.size(); i++) {
kernel_signature_map_str =
kernel_signature_map_str + "\"" + outputs_[i] + "\",";
Expand Down
4 changes: 2 additions & 2 deletions paddle/infrt/dialect/phi/pass/phi_op_convert_pass.cc
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void PhiOpConvertPass::convertStage() {
// resort input&output according to kernel_sign
::llvm::SmallVector<mlir::Value, 4> inputs, ori_output;
::llvm::SmallVector<mlir::Type, 4> output_types;
for (const std::string &str : std::get<0>(kernel_sign.args)) {
for (const std::string &str : kernel_sign.input_names) {
if (pd_dialect_inputs_info_map_.at(op_name).count(str) == 0) {
LOG(ERROR) << "No input info for Op " << op_name << " and argument "
<< str;
Expand All @@ -125,7 +125,7 @@ void PhiOpConvertPass::convertStage() {
inputs.push_back(op->getOperands()[index]);
}

for (const std::string &str : std::get<2>(kernel_sign.args)) {
for (const std::string &str : kernel_sign.output_names) {
if (pd_dialect_outputs_info_map_.at(op_name).count(str) == 0) {
LOG(ERROR) << "No output info for Op " << op_name << " and argument "
<< str;
Expand Down
6 changes: 3 additions & 3 deletions paddle/phi/core/compat/arg_map_context.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ limitations under the License. */
namespace phi {
std::ostream& operator<<(std::ostream& os, KernelSignature signature) {
os << "Kernel Signature - name: " << signature.name << "; inputs: "
<< paddle::string::join_strings(std::get<0>(signature.args), ", ")
<< paddle::string::join_strings(signature.input_names, ", ")
<< "; attributes: "
<< paddle::string::join_strings(std::get<1>(signature.args), ", ")
<< paddle::string::join_strings(signature.attr_names, ", ")
<< "; outputs: "
<< paddle::string::join_strings(std::get<2>(signature.args), ", ");
<< paddle::string::join_strings(signature.output_names, ", ");
return os;
}

Expand Down
18 changes: 14 additions & 4 deletions paddle/phi/core/compat/arg_map_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,36 @@ using KernelArgsTuple = std::tuple<paddle::SmallVector<const char*>,

struct KernelSignature {
const char* name;
KernelArgsTuple args;
paddle::SmallVector<const char*> input_names;
paddle::SmallVector<const char*> attr_names;
paddle::SmallVector<const char*> output_names;

KernelSignature() = default;

KernelSignature(const char* kernel_name,
paddle::SmallVector<const char*>&& inputs,
paddle::SmallVector<const char*>&& attrs,
paddle::SmallVector<const char*>&& outputs)
: name(kernel_name), args(std::make_tuple(inputs, attrs, outputs)) {}
: name(kernel_name),
input_names(std::move(inputs)),
attr_names(std::move(attrs)),
output_names(std::move(outputs)) {}
KernelSignature(const char* kernel_name,
const paddle::SmallVector<const char*>& inputs,
const paddle::SmallVector<const char*>& attrs,
const paddle::SmallVector<const char*>& outputs)
: name(kernel_name), args(std::make_tuple(inputs, attrs, outputs)) {}
: name(kernel_name),
input_names(inputs),
attr_names(attrs),
output_names(outputs) {}

// TODO(chenweihang): add assign constructor to solve windows compile
// problem, remove it later
KernelSignature& operator=(const KernelSignature& other) {
name = other.name;
args = other.args;
input_names = other.input_names;
attr_names = other.attr_names;
output_names = other.output_names;
return *this;
}
};
Expand Down
6 changes: 2 additions & 4 deletions paddle/phi/tests/ops/test_op_signature.cc
Original file line number Diff line number Diff line change
Expand Up @@ -560,8 +560,7 @@ TEST(ARG_MAP, allclose) {
auto signature1 =
OpUtilsMap::Instance().GetArgumentMappingFn("allclose")(arg_case1);
ASSERT_EQ(signature1.name, "allclose");
auto attr_names1 = std::get<1>(signature1.args);
ASSERT_EQ(attr_names1[0], "Rtol");
ASSERT_EQ(signature1.attr_names[0], "Rtol");

TestArgumentMappingContext arg_case2(
{"Input", "Other", "Atol"},
Expand All @@ -573,8 +572,7 @@ TEST(ARG_MAP, allclose) {
auto signature2 =
OpUtilsMap::Instance().GetArgumentMappingFn("allclose")(arg_case2);
ASSERT_EQ(signature2.name, "allclose");
auto attr_names2 = std::get<1>(signature2.args);
ASSERT_EQ(attr_names2[1], "Atol");
ASSERT_EQ(signature2.attr_names[1], "Atol");
}

TEST(ARG_MAP, reshape) {
Expand Down

0 comments on commit 778155a

Please sign in to comment.