From a2ffbd5326b84564251388dd0ebe72576dfefba1 Mon Sep 17 00:00:00 2001
From: Helin Wang <ustc.harry@gmail.com>
Date: Tue, 1 May 2018 13:51:41 -0700
Subject: [PATCH] scaffolding for the new Fluid API

---
 python/paddle/fluid/__init__.py   | 13 ++++++++-
 python/paddle/fluid/inferencer.py | 28 +++++++++++++++++++
 python/paddle/fluid/params.py     | 33 ++++++++++++++++++++++
 python/paddle/fluid/trainer.py    | 46 +++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 python/paddle/fluid/inferencer.py
 create mode 100644 python/paddle/fluid/params.py
 create mode 100644 python/paddle/fluid/trainer.py

diff --git a/python/paddle/fluid/__init__.py b/python/paddle/fluid/__init__.py
index 04f6905ce68..1e6482e3c18 100644
--- a/python/paddle/fluid/__init__.py
+++ b/python/paddle/fluid/__init__.py
@@ -20,6 +20,16 @@ from framework import *
 import executor
 from executor import *
 
+import trainer
+from trainer import Trainer
+from trainer import Event
+
+import inferencer
+from inferencer import Inferencer
+
+import params
+from params import Params
+
 import io
 import evaluator
 import initializer
@@ -47,7 +57,8 @@ from parallel_executor import ParallelExecutor
 
 Tensor = LoDTensor
 
-__all__ = framework.__all__ + executor.__all__ + concurrency.__all__ + [
+__all__ = framework.__all__ + executor.__all__ + concurrency.__all__ +\
+          trainer.__all__ + inferencer.__all__ + params.__all__ + [
     'io',
     'initializer',
     'layers',
diff --git a/python/paddle/fluid/inferencer.py b/python/paddle/fluid/inferencer.py
new file mode 100644
index 00000000000..276bc03109c
--- /dev/null
+++ b/python/paddle/fluid/inferencer.py
@@ -0,0 +1,28 @@
+#   Copyright (c) 2018 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.
+
+
+__all__ = [
+    'Inferencer',
+]
+
+
+class Inferencer(object):
+    def __init__(self, network_func, params, place=None):
+        self.network_func = network_func
+        self.params = params
+        self.place = place
+
+    def infer(self, inputs):
+        pass
diff --git a/python/paddle/fluid/params.py b/python/paddle/fluid/params.py
new file mode 100644
index 00000000000..fcdb8617a97
--- /dev/null
+++ b/python/paddle/fluid/params.py
@@ -0,0 +1,33 @@
+#   Copyright (c) 2018 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.
+
+from . import core
+
+__all__ = [
+    'Params',
+]
+
+
+class Params(object):
+    def __init__(self, path=None):
+        self.scope = core.Scope()
+
+        if path:
+            self._load(path)
+
+    def _load(self, path):
+        pass
+
+    def save(self, path):
+        pass
diff --git a/python/paddle/fluid/trainer.py b/python/paddle/fluid/trainer.py
new file mode 100644
index 00000000000..a878ed9d780
--- /dev/null
+++ b/python/paddle/fluid/trainer.py
@@ -0,0 +1,46 @@
+#   Copyright (c) 2018 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.
+
+from enum import Enum
+
+__all__ = [
+    'Event',
+    'Trainer',
+]
+
+
+class Event(Enum):
+    BEGIN_EPOCH = 0
+    END_EPOCH = 1
+    BEGIN_STEP = 2
+    END_STEP = 3
+
+    def __init__(self):
+        self.step = 0
+        self.epoch = 0
+        self.type = Event.BEGIN_EPOCH
+
+
+class Trainer(object):
+    def __init__(self, network_func, optimizer, params=None, place=None):
+        self.network_func = network_func
+        self.optimizer = optimizer
+        self.params = params
+        self.place = place
+
+    def train(self, reader, num_epochs, event_handler):
+        pass
+
+    def test(self, reader):
+        pass
-- 
GitLab