From b48c19f251f0a5cb22c9a5bbf3416c36af6db8a8 Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Mon, 24 Aug 2020 08:57:38 -0400
Subject: [PATCH] Correct warnings found by using clang as the host compiler
 for cuda

---
 .../cuda/internal/DeviceAdapterAlgorithmCuda.cu    |  8 ++++----
 .../internal/DeviceAdapterMemoryManagerCuda.cu     | 14 ++++++++++----
 .../cont/cuda/testing/UnitTestCudaMathEdgeCases.cu |  2 ++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.cu b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.cu
index 5bd0749e6..30ebdf33e 100644
--- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.cu
+++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.cu
@@ -207,8 +207,8 @@ void DeviceAdapterAlgorithm<vtkm::cont::DeviceAdapterTagCuda>::GetBlocksAndThrea
   int deviceId;
   VTKM_CUDA_CALL(cudaGetDevice(&deviceId)); //get deviceid from cuda
   const auto& params = cuda::internal::scheduling_1d_parameters[static_cast<size_t>(deviceId)];
-  blocks = params.first;
-  threadsPerBlock = params.second;
+  blocks = static_cast<vtkm::UInt32>(params.first);
+  threadsPerBlock = static_cast<vtkm::UInt32>(params.second);
 }
 
 void DeviceAdapterAlgorithm<vtkm::cont::DeviceAdapterTagCuda>::GetBlocksAndThreads(
@@ -223,13 +223,13 @@ void DeviceAdapterAlgorithm<vtkm::cont::DeviceAdapterTagCuda>::GetBlocksAndThrea
   if (size.z <= 1)
   { //2d images
     const auto& params = cuda::internal::scheduling_2d_parameters[static_cast<size_t>(deviceId)];
-    blocks = params.first;
+    blocks = static_cast<vtkm::UInt32>(params.first);
     threadsPerBlock = params.second;
   }
   else
   { //3d images
     const auto& params = cuda::internal::scheduling_3d_parameters[static_cast<size_t>(deviceId)];
-    blocks = params.first;
+    blocks = static_cast<vtkm::UInt32>(params.first);
     threadsPerBlock = params.second;
   }
 }
diff --git a/vtkm/cont/cuda/internal/DeviceAdapterMemoryManagerCuda.cu b/vtkm/cont/cuda/internal/DeviceAdapterMemoryManagerCuda.cu
index 473b438ac..c972505a8 100644
--- a/vtkm/cont/cuda/internal/DeviceAdapterMemoryManagerCuda.cu
+++ b/vtkm/cont/cuda/internal/DeviceAdapterMemoryManagerCuda.cu
@@ -145,8 +145,11 @@ void DeviceAdapterMemoryManager<vtkm::cont::DeviceAdapterTagCuda>::CopyHostToDev
                vtkm::cont::GetHumanReadableSize(static_cast<std::size_t>(size)).c_str(),
                size);
 
-    VTKM_CUDA_CALL(cudaMemcpyAsync(
-      dest.GetPointer(), src.GetPointer(), size, cudaMemcpyHostToDevice, cudaStreamPerThread));
+    VTKM_CUDA_CALL(cudaMemcpyAsync(dest.GetPointer(),
+                                   src.GetPointer(),
+                                   static_cast<std::size_t>(size),
+                                   cudaMemcpyHostToDevice,
+                                   cudaStreamPerThread));
   }
 }
 
@@ -203,8 +206,11 @@ void DeviceAdapterMemoryManager<vtkm::cont::DeviceAdapterTagCuda>::CopyDeviceToH
                vtkm::cont::GetHumanReadableSize(static_cast<std::size_t>(size)).c_str(),
                size);
 
-    VTKM_CUDA_CALL(cudaMemcpyAsync(
-      dest.GetPointer(), src.GetPointer(), size, cudaMemcpyDeviceToHost, cudaStreamPerThread));
+    VTKM_CUDA_CALL(cudaMemcpyAsync(dest.GetPointer(),
+                                   src.GetPointer(),
+                                   static_cast<std::size_t>(size),
+                                   cudaMemcpyDeviceToHost,
+                                   cudaStreamPerThread));
   }
 
   //In all cases we have possibly multiple async calls queued up in
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaMathEdgeCases.cu b/vtkm/cont/cuda/testing/UnitTestCudaMathEdgeCases.cu
index 1129ff515..a78e28c95 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaMathEdgeCases.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaMathEdgeCases.cu
@@ -22,7 +22,9 @@
 #include <random>
 #include <vector>
 
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include "curand_kernel.h"
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace
 {