From 855cae603c5ae25408f394d4f68498a680603535 Mon Sep 17 00:00:00 2001 From: dongzhihong Date: Tue, 18 Jul 2017 22:31:59 +0800 Subject: [PATCH] move unused file --- paddle/framework/fully_connected_op.cc | 39 ---------- paddle/framework/fully_connected_op.h | 2 + paddle/framework/net_op_test.cc | 102 +++++++++++-------------- paddle/framework/net_test.cc | 27 ------- 4 files changed, 45 insertions(+), 125 deletions(-) delete mode 100644 paddle/framework/fully_connected_op.cc delete mode 100644 paddle/framework/net_test.cc diff --git a/paddle/framework/fully_connected_op.cc b/paddle/framework/fully_connected_op.cc deleted file mode 100644 index 28be46366ff..00000000000 --- a/paddle/framework/fully_connected_op.cc +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. - - 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. */ - -#include "paddle/framework/fully_connected_op.h" -#include -namespace paddle { -namespace framework { - -void FCOp::Run(const ScopePtr& scope, - const platform::DeviceContext& dev_ctx) const override { - std::cout << "FC" << std::endl; -} - -void FCOp::InferShape(const ScopePtr& scope) const override {} - -void FCGradientOp::Run(const ScopePtr& scope, - const platform::DeviceContext& dev_ctx) const override { - std::cout << "FCGrad" << std::endl; -} - -void FCGradientOp::InferShape(const ScopePtr& scope) const override {} - -REGISTER_OP(my_fc, paddle::framework::FCOp, - paddle::framework::FCOpProtoAndCheckerMaker); -REGISTER_OP(my_fc_grad, paddle::framework::FCGradientOp, - paddle::framework::FCGradientOpProtoAndCheckerMaker); -} // namespace framework -} // namespace paddle diff --git a/paddle/framework/fully_connected_op.h b/paddle/framework/fully_connected_op.h index 948116f653f..f049eda9bbd 100644 --- a/paddle/framework/fully_connected_op.h +++ b/paddle/framework/fully_connected_op.h @@ -47,6 +47,8 @@ class FCGradientOp : public OperatorBase { }; // class FCGradientOpProtoAndCheckerMaker : public OpProtoAndCheckerMaker {}; +REGISTER_OP(my_fc, FCOp, FCOpProtoAndCheckerMaker); +REGISTER_GRADIENT_OP(my_fc_grad, FCGradientOp); } // namespace framework } // namespace paddle diff --git a/paddle/framework/net_op_test.cc b/paddle/framework/net_op_test.cc index 814f397c7da..18151c56d9a 100644 --- a/paddle/framework/net_op_test.cc +++ b/paddle/framework/net_op_test.cc @@ -2,6 +2,7 @@ #include #include #include +#include "paddle/framework/fully_connected_op.h" namespace paddle { namespace framework { @@ -31,68 +32,51 @@ void AssertSameVectorWithoutOrder(const std::vector& expected, } } -class PlainNetTest : public testing::Test { - public: - virtual void SetUp() { - net_ = std::make_shared(); - ASSERT_NE(net_, nullptr); - - auto op1 = std::make_shared(); - op1->inputs_ = {"x", "w1", "b1"}; - op1->outputs_ = {"y"}; - net_->AddOp(op1); - - auto op2 = std::make_shared(); - op2->inputs_ = {"y", "w2", "b2"}; - op2->outputs_ = {"z"}; - net_->AddOp(op2); - net_->CompleteAddOp(); - } - - virtual void TearDown() {} - - virtual void TestBody() {} - - void TestOpKernel() { - AssertSameVectorWithoutOrder({"x", "w1", "b1", "w2", "b2"}, net_->inputs_); - AssertSameVectorWithoutOrder({"y", "z"}, net_->outputs_); - auto tmp_idx_iter = net_->attrs_.find("temporary_index"); - ASSERT_NE(net_->attrs_.end(), tmp_idx_iter); - auto& tmp_idx = boost::get>(tmp_idx_iter->second); - ASSERT_EQ(1UL, tmp_idx.size()); - ASSERT_EQ("y", net_->outputs_[tmp_idx[0]]); - - auto scope = std::make_shared(); - platform::CPUDeviceContext dev_ctx; - - net_->InferShape(scope); - net_->Run(scope, dev_ctx); - ASSERT_EQ(2, infer_shape_cnt); - ASSERT_EQ(2, run_cnt); - - auto op2 = std::make_shared(); - ASSERT_THROW(net_->AddOp(op2), EnforceNotMet); - } - - void TestAddBackwardOp() { - auto grad_ops = AddBackwardOp(net_); - for (auto& op : grad_ops->ops_) { - op->DebugString(); - } - } - - private: - std::shared_ptr net_; -}; - TEST(OpKernel, all) { - PlainNetTest net; - net.TestOpKernel(); + auto net = std::make_shared(); + ASSERT_NE(net, nullptr); + + auto op1 = std::make_shared(); + op1->inputs_ = {"x", "w1", "b1"}; + op1->outputs_ = {"y"}; + net->AddOp(op1); + + auto op2 = std::make_shared(); + op2->inputs_ = {"y", "w2", "b2"}; + op2->outputs_ = {"z"}; + net->AddOp(op2); + + net->CompleteAddOp(); + AssertSameVectorWithoutOrder({"x", "w1", "b1", "w2", "b2"}, net->inputs_); + AssertSameVectorWithoutOrder({"y", "z"}, net->outputs_); + auto tmp_idx_iter = net->attrs_.find("temporary_index"); + ASSERT_NE(net->attrs_.end(), tmp_idx_iter); + auto& tmp_idx = boost::get>(tmp_idx_iter->second); + ASSERT_EQ(1UL, tmp_idx.size()); + ASSERT_EQ("y", net->outputs_[tmp_idx[0]]); + + auto scope = std::make_shared(); + platform::CPUDeviceContext dev_ctx; + + net->InferShape(scope); + net->Run(scope, dev_ctx); + ASSERT_EQ(2, infer_shape_cnt); + ASSERT_EQ(2, run_cnt); + + ASSERT_THROW(net->AddOp(op2), EnforceNotMet); } -TEST(AddBackwardOp, TestAddBackwardOp) { - PlainNetTest net; - net.TestAddBackwardOp(); +TEST(AddBackwardOp, TestGradOp) { + auto net = std::make_shared(); + ASSERT_NE(net, nullptr); + auto op1 = std::make_shared(); + op1->inputs_ = {"x", "w1", "b1"}; + op1->outputs_ = {"y"}; + net->AddOp(op1); + auto grad_ops = AddBackwardOp(net); + for (auto& op : grad_ops->ops_) { + op->DebugString(); + } } } // namespace framework diff --git a/paddle/framework/net_test.cc b/paddle/framework/net_test.cc deleted file mode 100644 index 5afc0d9204b..00000000000 --- a/paddle/framework/net_test.cc +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. - - 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. */ - -#include "paddle/framework/net.h" -#include "paddle/framework/fully_connected_op.h" -#include "paddle/framework/op_registry.h" - -#include - -namespace paddle { -namespace framework { - -TEST(AddBackwardOp, ALL) - -} // namespace framework -} // namespace paddle -- GitLab