From 8734c61850b1ecf7873b24d30ba0a40c5db527f3 Mon Sep 17 00:00:00 2001 From: Artem Zhmurov Date: Mon, 14 Oct 2019 23:36:20 +0200 Subject: [PATCH] Fix the single-GPU update-constraints This is a temporary fix to make it work. Better solutions are in other patches. 1. The getter for the update stream returned the stream itself instead of a pointer to it. 2. The copy stream for forces with AtomLocality:All set to updateStream. Change-Id: I02b15beddebc160f2fe4fc21da64975977855699 --- src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp b/src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp index fd591bc984..50294a921c 100644 --- a/src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp +++ b/src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp @@ -124,7 +124,7 @@ StatePropagatorDataGpu::Impl::Impl(const void *pmeStream, fCopyStreams_[AtomLocality::Local] = localStream_; fCopyStreams_[AtomLocality::NonLocal] = nonLocalStream_; - fCopyStreams_[AtomLocality::All] = nullptr; + fCopyStreams_[AtomLocality::All] = updateStream_; } StatePropagatorDataGpu::Impl::Impl(const void *pmeStream, @@ -450,7 +450,7 @@ void StatePropagatorDataGpu::Impl::waitForcesReadyOnHost(AtomLocality atomLocal void* StatePropagatorDataGpu::Impl::getUpdateStream() { - return updateStream_; + return &updateStream_; } int StatePropagatorDataGpu::Impl::numAtomsLocal() -- 2.22.0