Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into deadlinks

weixing02 · weixing02 · commit 9ae7e4e60447 · 2018-04-20T17:35:51.000+08:00
diff --git a/paddle/fluid/framework/details/reduce_op_handle_test.cc b/paddle/fluid/framework/details/reduce_op_handle_test.cc
@@ -109,7 +109,7 @@ struct TestReduceOpHandle {
     // add input
     for (size_t j = 0; j < gpu_list_.size(); ++j) {
       if (!use_gpu_) {
-        op_handle_->dev_ctxes_[gpu_list_[j]] = ctxs_[j].get();
+        op_handle_->SetDeviceContext(gpu_list_[j], ctxs_[j].get());
       }
       auto *in_var_handle = new VarHandle(1, j, "input", gpu_list_[j]);
       in_var_handle->generated_op_ = nullptr;

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ struct TestReduceOpHandle {`
`109`	`109`	`// add input`
`110`	`110`	`for (size_t j = 0; j < gpu_list_.size(); ++j) {`
`111`	`111`	`if (!use_gpu_) {`
`112`		`- op_handle_->dev_ctxes_[gpu_list_[j]] = ctxs_[j].get();`
	`112`	`+ op_handle_->SetDeviceContext(gpu_list_[j], ctxs_[j].get());`
`113`	`113`	`}`
`114`	`114`	`auto *in_var_handle = new VarHandle(1, j, "input", gpu_list_[j]);`
`115`	`115`	`in_var_handle->generated_op_ = nullptr;`