From f4e25550cd0d8900d8cb15dc1c1568f39f33047a Mon Sep 17 00:00:00 2001 From: fengjiayi Date: Mon, 24 Jul 2017 18:04:36 +0800 Subject: [PATCH] Fix compile error Replace `OperatorPtr` with `std::shared_ptr` --- paddle/framework/grad_op_creator_test.cc | 5 +++-- paddle/framework/op_registry.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/paddle/framework/grad_op_creator_test.cc b/paddle/framework/grad_op_creator_test.cc index ad836727c3..27ac658131 100644 --- a/paddle/framework/grad_op_creator_test.cc +++ b/paddle/framework/grad_op_creator_test.cc @@ -9,8 +9,9 @@ namespace paddle { namespace framework { TEST(GradOpCreator, AddTwo) { - OperatorPtr add_op(OpRegistry::CreateOp("add_two", {"x", "y"}, {"out"}, {})); - OperatorPtr grad_add_op = OpRegistry::CreateGradOp(add_op); + std::shared_ptr add_op( + OpRegistry::CreateOp("add_two", {"x", "y"}, {"out"}, {})); + std::shared_ptr grad_add_op = OpRegistry::CreateGradOp(add_op); EXPECT_EQ(static_cast(grad_add_op->inputs_.size()), 4); EXPECT_EQ(static_cast(grad_add_op->outputs_.size()), 2); EXPECT_EQ(grad_add_op->Input("X"), "x"); diff --git a/paddle/framework/op_registry.h b/paddle/framework/op_registry.h index 5c8b86c8a9..41c7830932 100644 --- a/paddle/framework/op_registry.h +++ b/paddle/framework/op_registry.h @@ -298,9 +298,10 @@ class OpRegistry { return CreateOp(op_desc.type(), inputs, outputs, attrs); } - static OperatorPtr CreateGradOp(OperatorPtr op) { + static std::shared_ptr CreateGradOp( + std::shared_ptr op) { GradOpCreator creator(op.get()); - OperatorPtr grad_op(creator.Create()); + std::shared_ptr grad_op(creator.Create()); grad_op->Init(); return grad_op; } -- GitLab