From: Szilárd Páll <pall.szilard@gmail.com>
Date: Wed, 10 Mar 2021 10:50:47 +0000 (+0100)
Subject: Rename sendFToPpCudaDirect
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=0faf3c22fb277ef1f2784418e0ef69ccfab316fa;p=alexxy%2Fgromacs.git

Rename sendFToPpCudaDirect

sendFSynchronizerToPpCudaDirect expresses what the method actually does.
---

diff --git a/src/gromacs/ewald/pme_force_sender_gpu.h b/src/gromacs/ewald/pme_force_sender_gpu.h
index 2612609779..edced61504 100644
--- a/src/gromacs/ewald/pme_force_sender_gpu.h
+++ b/src/gromacs/ewald/pme_force_sender_gpu.h
@@ -90,7 +90,7 @@ public:
      * Send force synchronizer to PP rank
      * \param[in] ppRank           PP rank to receive data
      */
-    void sendFToPpCudaDirect(int ppRank);
+    void sendFSynchronizerToPpCudaDirect(int ppRank);
 
 private:
     class Impl;
diff --git a/src/gromacs/ewald/pme_force_sender_gpu_impl.cpp b/src/gromacs/ewald/pme_force_sender_gpu_impl.cpp
index 69974b3119..0365a5563c 100644
--- a/src/gromacs/ewald/pme_force_sender_gpu_impl.cpp
+++ b/src/gromacs/ewald/pme_force_sender_gpu_impl.cpp
@@ -83,7 +83,7 @@ void PmeForceSenderGpu::sendForceBufferAddressToPpRanks(DeviceBuffer<RVec> /* d_
                "correct implementation.");
 }
 
-void PmeForceSenderGpu::sendFToPpCudaDirect(int /* ppRank */)
+void PmeForceSenderGpu::sendFSynchronizerToPpCudaDirect(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_force_sender_gpu_impl.cu b/src/gromacs/ewald/pme_force_sender_gpu_impl.cu
index 509a624d04..753ac483f5 100644
--- a/src/gromacs/ewald/pme_force_sender_gpu_impl.cu
+++ b/src/gromacs/ewald/pme_force_sender_gpu_impl.cu
@@ -91,7 +91,7 @@ void PmeForceSenderGpu::Impl::sendForceBufferAddressToPpRanks(DeviceBuffer<Float
 }
 
 /*! \brief Send PME synchronizer directly using CUDA memory copy */
-void PmeForceSenderGpu::Impl::sendFToPpCudaDirect(int ppRank)
+void PmeForceSenderGpu::Impl::sendFSynchronizerToPpCudaDirect(int ppRank)
 {
     // Data will be pulled directly from PP task
 #if GMX_MPI
@@ -118,9 +118,9 @@ void PmeForceSenderGpu::sendForceBufferAddressToPpRanks(DeviceBuffer<RVec> d_f)
     impl_->sendForceBufferAddressToPpRanks(d_f);
 }
 
-void PmeForceSenderGpu::sendFToPpCudaDirect(int ppRank)
+void PmeForceSenderGpu::sendFSynchronizerToPpCudaDirect(int ppRank)
 {
-    impl_->sendFToPpCudaDirect(ppRank);
+    impl_->sendFSynchronizerToPpCudaDirect(ppRank);
 }
 
 
diff --git a/src/gromacs/ewald/pme_force_sender_gpu_impl.h b/src/gromacs/ewald/pme_force_sender_gpu_impl.h
index c7d4c0d76c..9ff0a15a9a 100644
--- a/src/gromacs/ewald/pme_force_sender_gpu_impl.h
+++ b/src/gromacs/ewald/pme_force_sender_gpu_impl.h
@@ -77,7 +77,7 @@ public:
      * Send force synchronizer to PP rank
      * \param[in] ppRank           PP rank to receive data
      */
-    void sendFToPpCudaDirect(int ppRank);
+    void sendFSynchronizerToPpCudaDirect(int ppRank);
 
 private:
     //! Event indicating when PME forces are ready on the GPU in order for PP stream to sync with the PME stream
diff --git a/src/gromacs/ewald/pme_only.cpp b/src/gromacs/ewald/pme_only.cpp
index 138711440c..4542a05f42 100644
--- a/src/gromacs/ewald/pme_only.cpp
+++ b/src/gromacs/ewald/pme_only.cpp
@@ -555,7 +555,7 @@ static void gmx_pme_send_force_vir_ener(gmx_pme_pp*      pme_pp,
             GMX_ASSERT((pme_pp->pmeForceSenderGpu != nullptr),
                        "The use of GPU direct communication for PME-PP is enabled, "
                        "but the PME GPU force reciever object does not exist");
-            pme_pp->pmeForceSenderGpu->sendFToPpCudaDirect(receiver.rankId);
+            pme_pp->pmeForceSenderGpu->sendFSynchronizerToPpCudaDirect(receiver.rankId);
         }
         else
         {