From e9e27e0f3227a64c029abb93f784e03599839d35 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Mon, 16 Apr 2018 16:16:27 +0800
Subject: [PATCH] Revert

---
 paddle/fluid/framework/details/threaded_ssa_graph_executor.cc | 4 ++--
 paddle/fluid/pybind/tensor_py.h                               | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc b/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc
index 43b520b543f..a371ee10fe0 100644
--- a/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc
+++ b/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc
@@ -204,8 +204,8 @@ void ThreadedSSAGraphExecutor::RunOp(
       VLOG(10) << op << " " << op->Name() << "Signal posted";
     } catch (platform::EnforceNotMet ex) {
       exception_.reset(new platform::EnforceNotMet(ex));
-    } catch (std::exception &exp) {
-      LOG(FATAL) << exp.what();
+    } catch (...) {
+      LOG(FATAL) << "Unknown exception catched";
     }
   };
   if (pool_) {
diff --git a/paddle/fluid/pybind/tensor_py.h b/paddle/fluid/pybind/tensor_py.h
index c9cad15a74b..4a9dbd324c9 100644
--- a/paddle/fluid/pybind/tensor_py.h
+++ b/paddle/fluid/pybind/tensor_py.h
@@ -190,7 +190,6 @@ void PyCUDATensorSetFromArray(
       static_cast<const platform::CUDADeviceContext *>(pool.Get(place));
   paddle::platform::GpuMemcpyAsync(dst, array.data(), sizeof(T) * array.size(),
                                    cudaMemcpyHostToDevice, dev_ctx->stream());
-  dev_ctx->Wait();
 }
 
 template <>
-- 
GitLab