From 876d597495015ba416639af7426258d32587986e Mon Sep 17 00:00:00 2001
From: qiaolongfei <qiaolongfei@baidu.com>
Date: Mon, 27 Feb 2017 20:41:00 +0800
Subject: [PATCH] memory have same name with some layer

---
 python/paddle/v2/layer.py             | 2 ++
 python/paddle/v2/tests/CMakeLists.txt | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/python/paddle/v2/layer.py b/python/paddle/v2/layer.py
index 6dea3afbcf..dbd802bee8 100644
--- a/python/paddle/v2/layer.py
+++ b/python/paddle/v2/layer.py
@@ -139,6 +139,8 @@ 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)
 
diff --git a/python/paddle/v2/tests/CMakeLists.txt b/python/paddle/v2/tests/CMakeLists.txt
index bc0f247927..b2f43c42de 100644
--- a/python/paddle/v2/tests/CMakeLists.txt
+++ b/python/paddle/v2/tests/CMakeLists.txt
@@ -1,7 +1,11 @@
 add_test(NAME test_v2_layer
         COMMAND ${PROJ_ROOT}/paddle/.set_python_path.sh -d ${PROJ_ROOT}/python/
-        ${PYTHON_EXECUTABLE} ${PROJ_ROOT}/python/paddle/v2/tests/test_layer.py)
+        ${PYTHON_EXECUTABLE} ${PROJ_ROOT}/python/paddle/v2/tests/test_layer.py
+        WORKING_DIRECTORY ${PROJ_ROOT}/python/paddle)
 
 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_v2_api
+        COMMAND bash ${PROJ_ROOT}/python/paddle/v2/tests/run_tests.sh ${PYTHON_EXECUTABLE})
-- 
GitLab