From da991aa45ca8f834992543c63ee8ce7f2c7c508c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Szil=C3=A1rd=20P=C3=A1ll?= Date: Sat, 13 Mar 2021 11:05:43 +0000 Subject: [PATCH] Rename launchReceiveCoordinatesFromPpCudaDirect The receiveCoordinatesSynchronizerFromPpCudaDirect() method name better reflects what the code it actually does. Refs #2891 --- src/gromacs/ewald/pme_coordinate_receiver_gpu.h | 6 +++--- src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cpp | 4 ++-- src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu | 10 +++++----- src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.h | 8 ++++---- src/gromacs/ewald/pme_only.cpp | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gromacs/ewald/pme_coordinate_receiver_gpu.h b/src/gromacs/ewald/pme_coordinate_receiver_gpu.h index 0754b3a245..94aefe8501 100644 --- a/src/gromacs/ewald/pme_coordinate_receiver_gpu.h +++ b/src/gromacs/ewald/pme_coordinate_receiver_gpu.h @@ -77,10 +77,10 @@ public: /*! \brief - * launch receive of coordinate data from PP rank - * \param[in] ppRank PP rank to send data + * Receive coordinate synchronizer pointer from the PP ranks. + * \param[in] ppRank PP rank to receive the synchronizer from. */ - void launchReceiveCoordinatesFromPpCudaDirect(int ppRank); + void receiveCoordinatesSynchronizerFromPpCudaDirect(int ppRank); /*! \brief * enqueue wait for coordinate data from PP ranks diff --git a/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cpp b/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cpp index be4cf2a16a..ae68eedca2 100644 --- a/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cpp +++ b/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2019,2020, by the GROMACS development team, led by + * Copyright (c) 2019,2020,2021, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -82,7 +82,7 @@ void PmeCoordinateReceiverGpu::sendCoordinateBufferAddressToPpRanks(DeviceBuffer "correct implementation."); } -void PmeCoordinateReceiverGpu::launchReceiveCoordinatesFromPpCudaDirect(int /* ppRank */) +void PmeCoordinateReceiverGpu::receiveCoordinatesSynchronizerFromPpCudaDirect(int /* ppRank */) { GMX_ASSERT(!impl_, "A CPU stub for PME-PP GPU communication was called instead of the correct " diff --git a/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu b/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu index b37e3ec41d..10f48f1d97 100644 --- a/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu +++ b/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2019,2020, by the GROMACS development team, led by + * Copyright (c) 2019,2020,2021, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -92,8 +92,8 @@ void PmeCoordinateReceiverGpu::Impl::sendCoordinateBufferAddressToPpRanks(Device } } -/*! \brief Receive coordinate data directly using CUDA memory copy */ -void PmeCoordinateReceiverGpu::Impl::launchReceiveCoordinatesFromPpCudaDirect(int ppRank) +/*! \brief Receive coordinate synchronizer pointer from the PP ranks. */ +void PmeCoordinateReceiverGpu::Impl::receiveCoordinatesSynchronizerFromPpCudaDirect(int ppRank) { // Data will be pushed directly from PP task @@ -137,9 +137,9 @@ void PmeCoordinateReceiverGpu::sendCoordinateBufferAddressToPpRanks(DeviceBuffer impl_->sendCoordinateBufferAddressToPpRanks(d_x); } -void PmeCoordinateReceiverGpu::launchReceiveCoordinatesFromPpCudaDirect(int ppRank) +void PmeCoordinateReceiverGpu::receiveCoordinatesSynchronizerFromPpCudaDirect(int ppRank) { - impl_->launchReceiveCoordinatesFromPpCudaDirect(ppRank); + impl_->receiveCoordinatesSynchronizerFromPpCudaDirect(ppRank); } void PmeCoordinateReceiverGpu::enqueueWaitReceiveCoordinatesFromPpCudaDirect() diff --git a/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.h b/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.h index 9094a7c7b3..0f4ca21fa3 100644 --- a/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.h +++ b/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.h @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2019,2020, by the GROMACS development team, led by + * Copyright (c) 2019,2020,2021, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -73,10 +73,10 @@ public: void sendCoordinateBufferAddressToPpRanks(DeviceBuffer d_x); /*! \brief - * launch receive of coordinate data from PP rank - * \param[in] ppRank PP rank to send data + * Receive coordinate synchronizer pointer from the PP ranks. + * \param[in] ppRank PP rank to receive the synchronizer from. */ - void launchReceiveCoordinatesFromPpCudaDirect(int ppRank); + void receiveCoordinatesSynchronizerFromPpCudaDirect(int ppRank); /*! \brief * enqueue wait for coordinate data from PP ranks diff --git a/src/gromacs/ewald/pme_only.cpp b/src/gromacs/ewald/pme_only.cpp index f9041894c0..5ef702e442 100644 --- a/src/gromacs/ewald/pme_only.cpp +++ b/src/gromacs/ewald/pme_only.cpp @@ -467,7 +467,7 @@ static int gmx_pme_recv_coeffs_coords(struct gmx_pme_t* pme, { if (pme_pp->useGpuDirectComm) { - pme_pp->pmeCoordinateReceiverGpu->launchReceiveCoordinatesFromPpCudaDirect( + pme_pp->pmeCoordinateReceiverGpu->receiveCoordinatesSynchronizerFromPpCudaDirect( sender.rankId); } else -- 2.22.0