Move trainer to py_paddle.trainer

Author: reyoung

demo/mnist/api_train.py

@@ -11,7 +11,7 @@
 from paddle.trainer_config_helpers import *
 
 import mnist_provider
-from trainer import *
+from py_paddle.trainer import *
 
 
 @network(
@@ -40,7 +40,7 @@ def main():
             file_list=['./data/raw_data/train']).with_std_tester(
                 method=mnist_provider.process,
                 file_list=['./data/raw_data/t10k']).build()
-    with runner.use():
+    with runner:
         for _ in xrange(2):
             runner.run_one_pass()
 

paddle/py_paddle/__init__.py

@@ -19,6 +19,7 @@
     'paddle',
     'DataProviderConverter',
     'DataProviderWrapperConverter',  # for deprecated usage.
-    'loadParameterFile'
+    'loadParameterFile',
+    'trainer'
 ]
 util.monkeypatches()

demo/mnist/trainer.py renamed to paddle/py_paddle/trainer/__init__.py

@@ -120,17 +120,6 @@ class RunnerContext(object):
     pass
 
 
-class RunnerSection(object):
-    def __init__(self, runner):
-        self.runner = runner
-
-    def __enter__(self):
-        self.runner.initialize()
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.runner.finalize(self.runner.context)
-
-
 class Runner(object):
     def __init__(self):
         self.chains = []
@@ -197,8 +186,11 @@ def run_one_pass(self, parent=None):
             exit_flag = self.end_batch(self.context)
         self.end_pass(self.context)
 
-    def use(self):
-        return RunnerSection(self)
+    def __enter__(self):
+        self.initialize()
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.finalize(self.context)
 
 
 class DeviceChainItem(RunnerChainItem):

paddle/setup.py.in

@@ -64,7 +64,7 @@ setup(name="py_paddle",
        extra_compile_args = extra_comps
     )
   ],
-  packages=['py_paddle'],
+  packages=['py_paddle', 'py_paddle.trainer'],
   include_dirs = include_dirs,
   install_requires = [
     'numpy>=1.8.0',      # The numpy is required.