From bc021d775ed333dc9dca217203ee0d2999700813 Mon Sep 17 00:00:00 2001
From: dongzhihong <dzhwinter@gmail.com>
Date: Tue, 11 Jul 2017 09:42:07 +0800
Subject: [PATCH] "move opContext to DeviceContext"

---
 paddle/framework/net.cc              |  5 +----
 paddle/framework/net.h               |  6 ++----
 paddle/framework/net_proto.proto     |  2 +-
 paddle/framework/net_test.cc         | 24 ++++++++++++++++++++++++
 paddle/framework/op_registry_test.cc |  2 +-
 5 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 paddle/framework/net_test.cc

diff --git a/paddle/framework/net.cc b/paddle/framework/net.cc
index 8c565c28cb9..20c0aef049c 100644
--- a/paddle/framework/net.cc
+++ b/paddle/framework/net.cc
@@ -11,10 +11,7 @@ void PlainNet::InferShape(Scope* scope) {
   }
 }
 
-void PlainNet::Run(Scope* scope, OpContext* context, OpIndex begin,
-                   OpIndex end) const {
-  // TODO Add implementation here.
-}
+void PlainNet::Run(Scope* scope) const {}
 
 }  // namespace framework
 }  // namespace paddle
diff --git a/paddle/framework/net.h b/paddle/framework/net.h
index 2025bfa4b23..ef501334919 100644
--- a/paddle/framework/net.h
+++ b/paddle/framework/net.h
@@ -69,8 +69,7 @@ class Net {
    * environment for ops. `begin` and `end` specify the scope of `ops_` to run,
    * If no positive indexes are provided, all operators in `ops_` will run.
    */
-  virtual void Run(Scope *scope, OpContext *context, OpIndex begin = -1,
-                   OpIndex end = -1) const = 0;
+  virtual void Run(Scope *scope) const = 0;
 
   /**
    * @brief Add an Operator according to `def`.
@@ -124,8 +123,7 @@ class PlainNet : public Net {
    * scope will be used instead. If no OpContext is provicded, default context
    * will be used.
    */
-  virtual void Run(Scope *scope = nullptr, OpContext *context = nullptr,
-                   OpIndex begin = -1, OpIndex end = -1) const override;
+  virtual void Run(Scope *scope) const override;
 
   /**
    * @brief Add an operator to this network.
diff --git a/paddle/framework/net_proto.proto b/paddle/framework/net_proto.proto
index 2d042457e33..0779f49fe2a 100644
--- a/paddle/framework/net_proto.proto
+++ b/paddle/framework/net_proto.proto
@@ -9,7 +9,7 @@ message NetDesc {
   // operator contains in network
   repeated OpProto operators = 2;
   // network type to run with. e.g "plainNet", "DAG"
-  optional string type = 3;
+  optional string net_type = 3;
   // num worker always
   optional int32 num_workers = 4;
 }
diff --git a/paddle/framework/net_test.cc b/paddle/framework/net_test.cc
new file mode 100644
index 00000000000..04f5efdf79b
--- /dev/null
+++ b/paddle/framework/net_test.cc
@@ -0,0 +1,24 @@
+/* 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/op_registry.h"
+
+#include <gtest/gtest.h>
+
+namespace paddle {
+namespace framework {
+class FakeFC : public OpBase {}
+}  // namespace framework
+}  // namespace paddle
diff --git a/paddle/framework/op_registry_test.cc b/paddle/framework/op_registry_test.cc
index 17849ca0191..ae6b7387129 100644
--- a/paddle/framework/op_registry_test.cc
+++ b/paddle/framework/op_registry_test.cc
@@ -119,4 +119,4 @@ TEST(OpRegistry, CustomChecker) {
   for (size_t i = 0; i < debug_str.length(); ++i) {
     ASSERT_EQ(debug_str[i], str[i]);
   }
-}
\ No newline at end of file
+}
-- 
GitLab