From 1cb74b061b273db10ca79d0df926caefacb170f2 Mon Sep 17 00:00:00 2001
From: peizhilin <wopeizl@163.com>
Date: Wed, 2 Jan 2019 13:12:21 +0800
Subject: [PATCH] fix the whl issue test=develop

---
 python/paddle/fluid/__init__.py                            | 7 -------
 python/paddle/fluid/framework.py                           | 6 ++++++
 .../unittests/test_eager_deletion_dynamic_rnn_base.py      | 6 ++++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/python/paddle/fluid/__init__.py b/python/paddle/fluid/__init__.py
index 7a7267093..abcad4ca5 100644
--- a/python/paddle/fluid/__init__.py
+++ b/python/paddle/fluid/__init__.py
@@ -102,13 +102,6 @@ def __bootstrap__():
     import sys
     import os
     import platform
-
-    if os.name == 'nt':
-        third_lib_path = os.path.abspath(os.path.dirname(
-            __file__)) + os.sep + '..' + os.sep + 'libs'
-        os.environ['path'] += ';' + third_lib_path
-        sys.path.append(third_lib_path)
-
     from . import core
 
     in_test = 'unittest' in sys.modules
diff --git a/python/paddle/fluid/framework.py b/python/paddle/fluid/framework.py
index 921d59158..c15d54a7f 100644
--- a/python/paddle/fluid/framework.py
+++ b/python/paddle/fluid/framework.py
@@ -27,6 +27,12 @@ import numpy as np
 from .. import compat as cpt
 from .proto import framework_pb2
 try:
+    if os.name == 'nt':
+        third_lib_path = os.path.abspath(os.path.dirname(
+            __file__)) + os.sep + '..' + os.sep + 'libs'
+        os.environ['path'] += ';' + third_lib_path
+        sys.path.append(third_lib_path)
+
     from . import core
 except ImportError as e:
     if os.name == 'nt':
diff --git a/python/paddle/fluid/tests/unittests/test_eager_deletion_dynamic_rnn_base.py b/python/paddle/fluid/tests/unittests/test_eager_deletion_dynamic_rnn_base.py
index 89476ee64..81b0b6678 100644
--- a/python/paddle/fluid/tests/unittests/test_eager_deletion_dynamic_rnn_base.py
+++ b/python/paddle/fluid/tests/unittests/test_eager_deletion_dynamic_rnn_base.py
@@ -29,6 +29,12 @@ def train(network, use_cuda, use_parallel_executor, batch_size=32, pass_num=2):
         print('Skip use_cuda=True because Paddle is not compiled with cuda')
         return
 
+    if use_parallel_executor and os.name == 'nt':
+        print(
+            'Skip use_parallel_executor=True because Paddle comes without parallel support on windows'
+        )
+        return
+
     word_dict = paddle.dataset.imdb.word_dict()
     train_reader = paddle.batch(
         paddle.dataset.imdb.train(word_dict), batch_size=batch_size)
-- 
GitLab