From 176487733d34fc03a7f64d34830dddff8069b9ce Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Fri, 22 Oct 2021 07:37:14 +0200 Subject: [PATCH] Fix cuda clang-tidy issues --- src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu | 5 ++--- src/gromacs/ewald/pme_gpu_internal.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu b/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu index 5b1fa48ade..d1b9c01557 100644 --- a/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu +++ b/src/gromacs/ewald/pme_coordinate_receiver_gpu_impl.cu @@ -63,7 +63,7 @@ PmeCoordinateReceiverGpu::Impl::Impl(MPI_Comm comm, { // Create streams to manage pipelining ppCommManagers_.reserve(ppRanks.size()); - for (auto& ppRank : ppRanks) + for (const auto& ppRank : ppRanks) { ppCommManagers_.emplace_back(PpCommManager{ ppRank, @@ -110,9 +110,8 @@ void PmeCoordinateReceiverGpu::Impl::receiveCoordinatesSynchronizerFromPpCudaDir #if GMX_MPI // Receive event from PP task - // NOLINTNEXTLINE(bugprone-sizeof-expression) MPI_Irecv(&ppCommManagers_[ppRank].sync, - sizeof(GpuEventSynchronizer*), + sizeof(GpuEventSynchronizer*), // NOLINT(bugprone-sizeof-expression) MPI_BYTE, ppRank, 0, diff --git a/src/gromacs/ewald/pme_gpu_internal.cpp b/src/gromacs/ewald/pme_gpu_internal.cpp index 2f7da67a3a..35fff48b6a 100644 --- a/src/gromacs/ewald/pme_gpu_internal.cpp +++ b/src/gromacs/ewald/pme_gpu_internal.cpp @@ -594,7 +594,7 @@ static void pme_gpu_init_internal(PmeGpu* pmeGpu, const DeviceContext& deviceCon */ #if GMX_GPU_CUDA - pmeGpu->kernelParams->usePipeline = false; + pmeGpu->kernelParams->usePipeline = char(false); pmeGpu->kernelParams->pipelineAtomStart = 0; pmeGpu->kernelParams->pipelineAtomEnd = 0; pmeGpu->maxGridWidthX = deviceContext.deviceInfo().prop.maxGridSize[0]; @@ -1387,10 +1387,10 @@ void pme_gpu_spread(const PmeGpu* pmeGpu, pme_gpu_start_timing(pmeGpu, timingId); auto* timingEvent = pme_gpu_fetch_timing_event(pmeGpu, timingId); - kernelParamsPtr->usePipeline = computeSplines && spreadCharges && useGpuDirectComm - && (pmeCoordinateReceiverGpu->ppCommNumSenderRanks() > 1) - && !writeGlobalOrSaveSplines; - if (kernelParamsPtr->usePipeline) + kernelParamsPtr->usePipeline = char(computeSplines && spreadCharges && useGpuDirectComm + && (pmeCoordinateReceiverGpu->ppCommNumSenderRanks() > 1) + && !writeGlobalOrSaveSplines); + if (kernelParamsPtr->usePipeline != 0) { int numStagesInPipeline = pmeCoordinateReceiverGpu->ppCommNumSenderRanks(); -- 2.22.0