From a8d8b3670d2e993aa557517decc4db17ad537232 Mon Sep 17 00:00:00 2001 From: Allison Vacanti Date: Mon, 25 Jun 2018 14:53:53 -0400 Subject: [PATCH] Suppress host/device warnings on CUDA atomics. --- .../internal/DeviceAdapterAtomicArrayImplementationCuda.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAtomicArrayImplementationCuda.h b/vtkm/cont/cuda/internal/DeviceAdapterAtomicArrayImplementationCuda.h index 289f21b10..db176d4d0 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterAtomicArrayImplementationCuda.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterAtomicArrayImplementationCuda.h @@ -72,16 +72,19 @@ private: vtkm::cont::DeviceAdapterTagCuda>::Portal; PortalType Portal; + VTKM_SUPPRESS_EXEC_WARNINGS __device__ vtkm::Int64 vtkmAtomicAdd(vtkm::Int64* address, const vtkm::Int64& value) const { return atomicAdd((unsigned long long*)address, (unsigned long long)value); } + VTKM_SUPPRESS_EXEC_WARNINGS __device__ vtkm::Int32 vtkmAtomicAdd(vtkm::Int32* address, const vtkm::Int32& value) const { return atomicAdd(address, value); } + VTKM_SUPPRESS_EXEC_WARNINGS __device__ vtkm::Int32 vtkmCompareAndSwap(vtkm::Int32* address, const vtkm::Int32& newValue, const vtkm::Int32& oldValue) const @@ -89,6 +92,7 @@ private: return atomicCAS(address, oldValue, newValue); } + VTKM_SUPPRESS_EXEC_WARNINGS __device__ vtkm::Int64 vtkmCompareAndSwap(vtkm::Int64* address, const vtkm::Int64& newValue, const vtkm::Int64& oldValue) const