From 7ad8363036af9d8ae91e6698ff09804023602bdf Mon Sep 17 00:00:00 2001
From: qiaolongfei <qiaolongfei@baidu.com>
Date: Tue, 28 Feb 2017 19:44:56 +0800
Subject: [PATCH] support boot_layer

---
 .../paddle/trainer_config_helpers/layers.py   |  6 ++-
 python/paddle/v2/layer.py                     | 37 ++++++++++++++++---
 python/paddle/v2/tests/CMakeLists.txt         |  1 -
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/python/paddle/trainer_config_helpers/layers.py b/python/paddle/trainer_config_helpers/layers.py
index a8b536dda4f..4f7a2735e29 100755
--- a/python/paddle/trainer_config_helpers/layers.py
+++ b/python/paddle/trainer_config_helpers/layers.py
@@ -3110,7 +3110,8 @@ def recurrent_group(step,
                     name=None,
                     targetInlink=None,
                     is_generating=False,
-                    in_args_converter=None):
+                    in_args_converter=None,
+                    boot_layer=None):
     """
     Recurrent layer group is an extremely flexible recurrent unit in
     PaddlePaddle. As long as the user defines the calculation done within a
@@ -3256,6 +3257,9 @@ def recurrent_group(step,
     if in_args_converter is None:
         layer_outs = step(*in_args)
     else:
+        # append boot_layer to the last of in_args
+        if boot_layer is not None:
+            in_args.append(boot_layer)
         layer_outs = step(*in_args_converter(*in_args)).to_proto(dict())
 
     if isinstance(layer_outs, LayerOutput):
diff --git a/python/paddle/v2/layer.py b/python/paddle/v2/layer.py
index 1155eca9c81..542d5a515c5 100644
--- a/python/paddle/v2/layer.py
+++ b/python/paddle/v2/layer.py
@@ -140,10 +140,13 @@ class Layer(object):
         if self.name is None:
             return self.to_proto_impl(**kwargs)
         elif isinstance(self, MemoryV2):
-            return self.to_proto_impl(**kwargs)
-        elif self.name not in context:
-            context[self.name] = self.to_proto_impl(**kwargs)
+            name = self.name + "#__memory__"
+            if name not in context:
+                context[name] = self.to_proto_impl(**kwargs)
+            return context[name]
 
+        if self.name not in context:
+            context[self.name] = self.to_proto_impl(**kwargs)
         return context[self.name]
 
     def to_proto_impl(self, **kwargs):
@@ -256,9 +259,32 @@ class LayerOutputV2(Layer):
         return self.layer_output
 
 
+class StaticInputV2(Layer):
+    def __init__(self, **kwargs):
+        self.__parent_names__ = ['input']
+        other_kwargs = dict()
+        parent_layers = dict()
+        for pname in self.__parent_names__:
+            if kwargs.has_key(pname):
+                parent_layers[pname] = kwargs[pname]
+        for key in kwargs.keys():
+            if key not in self.__parent_names__:
+                other_kwargs[key] = kwargs[key]
+        self.__kwargs__ = other_kwargs
+        super(StaticInputV2, self).__init__(parent_layers=parent_layers)
+
+    def to_proto_impl(self, **kwargs):
+        args = dict()
+        for each in kwargs:
+            args[each] = kwargs[each]
+        for each in self.__kwargs__:
+            args[each] = self.__kwargs__[each]
+        return conf_helps.StaticInput(**args)
+
+
 class RecurrentGroupV2(Layer):
     def __init__(self, name, **kwargs):
-        self.__parent_names__ = ['input']
+        self.__parent_names__ = ['input', 'boot_layer']
         other_kwargs = dict()
         parent_layers = dict()
         for pname in self.__parent_names__:
@@ -443,7 +469,8 @@ layer_list = [
     ['nce', 'nce_layer', ['input', 'label']],
     ['hsigmoid', 'hsigmoid', ['input', 'label']],
     # check layers
-    ['eos', 'eos_layer', ['input']]
+    ['eos', 'eos_layer', ['input']],
+    ['gru_step_layer', 'gru_step_layer', ['input', 'output_mem']]
 ]
 for l in layer_list:
     globals()[l[0]] = __convert_to_v2__(l[1], l[2])
diff --git a/python/paddle/v2/tests/CMakeLists.txt b/python/paddle/v2/tests/CMakeLists.txt
index 948cebdf727..572deaff356 100644
--- a/python/paddle/v2/tests/CMakeLists.txt
+++ b/python/paddle/v2/tests/CMakeLists.txt
@@ -10,7 +10,6 @@ add_test(NAME test_v2_rnn_layer
         COMMAND ${PROJ_ROOT}/paddle/.set_python_path.sh -d ${PROJ_ROOT}/python/
         ${PYTHON_EXECUTABLE} ${PROJ_ROOT}/python/paddle/v2/tests/test_rnn_layer.py)
 
-
 add_test(NAME test_topology
         COMMAND ${PROJ_ROOT}/paddle/.set_python_path.sh -d ${PROJ_ROOT}/python/
         ${PYTHON_EXECUTABLE} ${PROJ_ROOT}/python/paddle/v2/tests/test_topology.py
-- 
GitLab