From d2cb3790e9aecc74cd9915b12346a4c7076f5510 Mon Sep 17 00:00:00 2001 From: Yu Yang Date: Tue, 20 Mar 2018 12:38:15 +0800 Subject: [PATCH] Wait all evernts --- paddle/fluid/framework/parallel_executor.cc | 6 +++--- .../paddle/fluid/tests/unittests/test_parallel_executor.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/paddle/fluid/framework/parallel_executor.cc b/paddle/fluid/framework/parallel_executor.cc index d3122353af..cb1b080eea 100644 --- a/paddle/fluid/framework/parallel_executor.cc +++ b/paddle/fluid/framework/parallel_executor.cc @@ -420,11 +420,11 @@ struct NCCLAllReduceOpHandle : public OpHandle { } } else { if (events_.size() > 1) { - int dev_id = - boost::get(waited_dev->GetPlace()).device; auto stream = static_cast(waited_dev)->stream(); - PADDLE_ENFORCE(cudaStreamWaitEvent(stream, events_[dev_id], 0)); + for (auto &ev : events_) { + PADDLE_ENFORCE(cudaStreamWaitEvent(stream, ev.second, 0)); + } } } } diff --git a/python/paddle/fluid/tests/unittests/test_parallel_executor.py b/python/paddle/fluid/tests/unittests/test_parallel_executor.py index c0ec6442de..cabb8e769d 100644 --- a/python/paddle/fluid/tests/unittests/test_parallel_executor.py +++ b/python/paddle/fluid/tests/unittests/test_parallel_executor.py @@ -47,7 +47,7 @@ class ParallelExecutor(unittest.TestCase): dtypes=['float32', 'int64']) img, label = fluid.layers.read_file(reader) hidden = img - for _ in xrange(2): + for _ in xrange(4): hidden = fluid.layers.fc( hidden, size=200, @@ -60,7 +60,7 @@ class ParallelExecutor(unittest.TestCase): adam = fluid.optimizer.Adam() adam.minimize(loss) act_places = [] - for each in [fluid.CUDAPlace(0), fluid.CUDAPlace(1)]: + for each in [fluid.CUDAPlace(0)]: p = fluid.core.Place() p.set_place(each) act_places.append(p) -- GitLab