From 6d107b0f392c8471ca6295a9a5366fd390cb7950 Mon Sep 17 00:00:00 2001
From: minqiyang <minqiyang@baidu.com>
Date: Wed, 22 Aug 2018 19:43:56 +0800
Subject: [PATCH] Fix the test_desc_clone's problem

---
 paddle/scripts/paddle_build.sh                     |  6 ------
 python/paddle/dataset/flowers.py                   |  2 +-
 python/paddle/fluid/tests/unittests/CMakeLists.txt |  2 +-
 .../fluid/tests/unittests/test_desc_clone.py       | 14 ++++++--------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh
index 1e3e2ed0e9e..8460f93b841 100755
--- a/paddle/scripts/paddle_build.sh
+++ b/paddle/scripts/paddle_build.sh
@@ -192,12 +192,6 @@ function build() {
     cd ${PADDLE_ROOT}/build
     cat <<EOF
     ============================================
-    CPUINFO ...
-    ============================================
-EOF
-    cat /proc/cpuinfo
-    cat <<EOF
-    ============================================
     Building in /paddle/build ...
     ============================================
 EOF
diff --git a/python/paddle/dataset/flowers.py b/python/paddle/dataset/flowers.py
index 2a020ce6d01..fd191b6a6d4 100644
--- a/python/paddle/dataset/flowers.py
+++ b/python/paddle/dataset/flowers.py
@@ -120,7 +120,7 @@ def reader_creator(data_file,
                 file = file.strip()
                 batch = None
                 with open(file, 'rb') as f:
-                    batch = pickle.load(f)
+                    batch = pickle.loads(f.read())
                 data = batch['data']
                 labels = batch['label']
                 for sample, label in zip(data, batch['label']):
diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt
index 228a5ab917b..ae13d7ff31b 100644
--- a/python/paddle/fluid/tests/unittests/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt
@@ -64,7 +64,7 @@ if(WITH_DISTRIBUTE)
 endif()
 py_test_modules(test_parallel_executor_crf MODULES test_parallel_executor_crf SERIAL)
 py_test_modules(test_parallel_executor_fetch_feed MODULES test_parallel_executor_fetch_feed SERIAL)
-set_tests_properties(test_parallel_executor_fetch_feed PROPERTIES TIMEOUT 300)
+set_tests_properties(test_parallel_executor_fetch_feed PROPERTIES TIMEOUT 500)
 py_test_modules(test_dist_transformer MODULES test_dist_transformer SERIAL)
 py_test_modules(test_dist_se_resnext MODULES test_dist_se_resnext SERIAL)
 py_test_modules(test_parallel_executor_transformer MODULES test_parallel_executor_transformer SERIAL)
diff --git a/python/paddle/fluid/tests/unittests/test_desc_clone.py b/python/paddle/fluid/tests/unittests/test_desc_clone.py
index fa6b6795625..08579c7dd62 100644
--- a/python/paddle/fluid/tests/unittests/test_desc_clone.py
+++ b/python/paddle/fluid/tests/unittests/test_desc_clone.py
@@ -120,8 +120,8 @@ def operator_equal(a, b):
                 raise ValueError("In operator_equal not equal:{0}\n".format(k))
 
         elif isinstance(v, collections.OrderedDict):
-            v0 = sorted(six.iteritems(v), key=lambda x: x[0])
-            v1 = sorted(six.iteritems(b.__dict__[k]), key=lambda x: x[0])
+            v0 = sorted(list(six.iteritems(v)), key=lambda x: x[0])
+            v1 = sorted(list(six.iteritems(b.__dict__[k])), key=lambda x: x[0])
 
             if v0 != v1:
                 raise ValueError("In operator_equal not equal:{0}\n".format(k))
@@ -139,17 +139,15 @@ def block_equal(a, b):
             continue
 
         elif k == "ops":
+            assert (len(a.ops) == len(b.ops))
             for i in range(0, len(a.ops)):
                 if not operator_equal(a.ops[i], b.ops[i]):
                     raise ValueError("In block_equal not equal:{0}\n".format(k))
-            assert (len(a.ops) == len(b.ops))
 
         elif isinstance(v, collections.OrderedDict):
-            v0 = sorted(six.iteritems(v), key=lambda x: x[0])
-            v1 = sorted(six.iteritems(b.__dict__[k]), key=lambda x: x[0])
-
-            if v0 != v1:
-                raise ValueError("In block_equal not equal:{0}\n".format(k))
+            for key, value in six.iteritems(v):
+                if str(value) != str(b.__dict__[k][key]):
+                    raise ValueError("In block_equal not equal:{0}\n".format(k))
 
         elif (v != b.__dict__[k]):
             raise ValueError("In block_equal not equal:{0}\n".format(k))
-- 
GitLab