From 6c184104873f2e6137434c148f51a9f8f94b6ada Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Sat, 28 Apr 2018 12:55:53 +0800
Subject: [PATCH] Revert code to develop

---
 paddle/fluid/framework/executor.cc                           | 3 ---
 python/paddle/fluid/tests/unittests/test_cross_entropy_op.py | 1 -
 2 files changed, 4 deletions(-)

diff --git a/paddle/fluid/framework/executor.cc b/paddle/fluid/framework/executor.cc
index b719568c65d..766bf0ab0c1 100644
--- a/paddle/fluid/framework/executor.cc
+++ b/paddle/fluid/framework/executor.cc
@@ -348,9 +348,6 @@ void Executor::RunPreparedContext(ExecutorPrepareContext* ctx, Scope* scope,
       }
     }
   }
-
-  platform::DeviceContextPool::Instance().Get(place_)->Wait();
-
   if (create_vars && create_local_scope) {
     scope->DeleteScope(local_scope);
   }
diff --git a/python/paddle/fluid/tests/unittests/test_cross_entropy_op.py b/python/paddle/fluid/tests/unittests/test_cross_entropy_op.py
index 25dde7b334f..c5b9e92d691 100644
--- a/python/paddle/fluid/tests/unittests/test_cross_entropy_op.py
+++ b/python/paddle/fluid/tests/unittests/test_cross_entropy_op.py
@@ -15,7 +15,6 @@
 import unittest
 import numpy as np
 from op_test import OpTest, randomize_probability
-import paddle.fluid as fluid
 
 
 class TestCrossEntropyOp1(OpTest):
-- 
GitLab