Extend GPU traits class

[alexxy/gromacs.git] / src / gromacs / mdtypes / state_propagator_data_gpu_impl.h

diff --git a/src/gromacs/mdtypes/state_propagator_data_gpu_impl.h b/src/gromacs/mdtypes/state_propagator_data_gpu_impl.h
index 6ba40d987e93154e06907dfd940969f57f46b4ae..f32d6df9debf731fbf64c6615b285b4451b32677 100644 (file)
--- a/src/gromacs/mdtypes/state_propagator_data_gpu_impl.h
+++ b/src/gromacs/mdtypes/state_propagator_data_gpu_impl.h
@@ -71,22 +71,22 @@ class StatePropagatorDataGpu::Impl
          * PME work on the GPU, and if that rank also does PP work that is the only
          * rank. So all coordinates are always transferred.
          *
-         * \note \p commandStream and \p gpuContext are allowed to be nullptr if
+         * \note \p commandStream and \p deviceContext are allowed to be nullptr if
          *       StatePropagatorDataGpu is not used in the OpenCL run (e.g. if PME
          *       does not run on the GPU).
          *
-         * \todo Make CommandStream visible in the CPU parts of the code so we
-         *       will not have to pass a void*.
-         * \todo Make a Context object visible in CPU parts of the code so we
-         *       will not have to pass a void*.
+         * \todo A CommandStream is now visible in the CPU parts of the code so we
+         *       can stop passing a void*.
+         * \todo A DeviceContext object is visible in CPU parts of the code so we
+         *       can stop passing a void*.
          *
          *  \param[in] commandStream  GPU stream, nullptr allowed.
-         *  \param[in] gpuContext     GPU context, nullptr allowed.
+         *  \param[in] deviceContext  GPU context, nullptr allowed.
          *  \param[in] transferKind   H2D/D2H transfer call behavior (synchronous or not).
          *  \param[in] paddingSize    Padding size for coordinates buffer.
          */
         Impl(const void        *commandStream,
-             const void        *gpuContext,
+             const void        *deviceContext,
              GpuApiCallBehavior transferKind,
              int                paddingSize);
 
@@ -209,7 +209,7 @@ class StatePropagatorDataGpu::Impl
         /*! \brief GPU context (for OpenCL builds)
          * \todo Make a Context class usable in CPU code
          */
-        Context              gpuContext_                 = nullptr;
+        DeviceContext        deviceContext_              = nullptr;
         //! Default GPU calls behavior
         GpuApiCallBehavior   transferKind_               = GpuApiCallBehavior::Async;
         //! Padding size for the coordinates buffer