Properly cast allocated pointer from void* to size_type*

dalg24 · Jan 21, 2024 · 237475e · 237475e
1 parent 17f7ffb
commit 237475e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/core/src/Cuda/Kokkos_Cuda_Instance.cpp b/core/src/Cuda/Kokkos_Cuda_Instance.cpp
@@ -346,8 +346,8 @@ Cuda::size_type *CudaInternal::scratch_flags(const std::size_t size) const {
 
     std::size_t alloc_size =
         multiply_overflow_abort(m_scratchFlagsCount, sizeScratchGrain);
-    m_scratchFlags =
-        mem_space.allocate("Kokkos::InternalScratchFlags", alloc_size);
+    m_scratchFlags = static_cast<size_type *>(
+        mem_space.allocate("Kokkos::InternalScratchFlags", alloc_size));
 
     KOKKOS_IMPL_CUDA_SAFE_CALL(
         (cuda_memset_wrapper(m_scratchFlags, 0, alloc_size)));
@@ -369,8 +369,8 @@ Cuda::size_type *CudaInternal::scratch_space(const std::size_t size) const {
 
     std::size_t alloc_size =
         multiply_overflow_abort(m_scratchSpaceCount, sizeScratchGrain);
-    m_scratchSpace =
-        mem_space.allocate("Kokkos::InternalScratchSpace", alloc_size);
+    m_scratchSpace = static_cast<size_type *>(
+        mem_space.allocate("Kokkos::InternalScratchSpace", alloc_size));
   }
 
   return m_scratchSpace;
@@ -390,8 +390,8 @@ Cuda::size_type *CudaInternal::scratch_unified(const std::size_t size) const {
 
     std::size_t alloc_size =
         multiply_overflow_abort(m_scratchUnifiedCount, sizeScratchGrain);
-    m_scratchUnified =
-        mem_space.allocate("Kokkos::InternalScratchUnified", alloc_size);
+    m_scratchUnified = static_cast<size_type *>(
+        mem_space.allocate("Kokkos::InternalScratchUnified", alloc_size));
   }
 
   return m_scratchUnified;
@@ -407,8 +407,8 @@ Cuda::size_type *CudaInternal::scratch_functor(const std::size_t size) const {
       mem_space.deallocate(m_scratchFunctor, std::size_t(-1));  // FIXME
     }
 
-    m_scratchFunctor = mem_space.allocate("Kokkos::InternalScratchFunctor",
-                                          m_scratchFunctorSize);
+    m_scratchFunctor = static_cast<size_type *>(mem_space.allocate(
+        "Kokkos::InternalScratchFunctor", m_scratchFunctorSize));
   }
 
   return m_scratchFunctor;

diff --git a/core/src/HIP/Kokkos_HIP_Instance.cpp b/core/src/HIP/Kokkos_HIP_Instance.cpp
@@ -201,8 +201,8 @@ Kokkos::HIP::size_type *HIPInternal::scratch_space(const std::size_t size) {
 
     std::size_t alloc_size =
         multiply_overflow_abort(m_scratchSpaceCount, sizeScratchGrain);
-    m_scratchSpace =
-        mem_space.allocate("Kokkos::InternalScratchSpace", alloc_size);
+    m_scratchSpace = static_cast<size_type *>(
+        mem_space.allocate("Kokkos::InternalScratchSpace", alloc_size));
   }
 
   return m_scratchSpace;
@@ -221,8 +221,8 @@ Kokkos::HIP::size_type *HIPInternal::scratch_flags(const std::size_t size) {
 
     std::size_t alloc_size =
         multiply_overflow_abort(m_scratchFlagsCount, sizeScratchGrain);
-    m_scratchFlags =
-        mem_space.allocate("Kokkos::InternalScratchFlags", alloc_size);
+    m_scratchFlags = static_cast<size_type *>(
+        mem_space.allocate("Kokkos::InternalScratchFlags", alloc_size));
 
     KOKKOS_IMPL_HIP_SAFE_CALL(hipMemset(m_scratchFlags, 0, alloc_size));
   }
@@ -244,10 +244,10 @@ Kokkos::HIP::size_type *HIPInternal::stage_functor_for_execution(
                                 std::size_t(-1));  // FIXME
     }
 
-    m_scratchFunctor = device_mem_space.allocate(
-        "Kokkos::InternalScratchFunctor", m_scratchFunctorSize);
-    m_scratchFunctorHost = host_mem_space.allocate(
-        "Kokkos::InternalScratchFunctorHost", m_scratchFunctorSize);
+    m_scratchFunctor     = static_cast<size_type *>(device_mem_space.allocate(
+        "Kokkos::InternalScratchFunctor", m_scratchFunctorSize));
+    m_scratchFunctorHost = static_cast<size_type *>(host_mem_space.allocate(
+        "Kokkos::InternalScratchFunctorHost", m_scratchFunctorSize));
   }
 
   // When using HSA_XNACK=1, it is necessary to copy the driver to the host to

diff --git a/core/src/SYCL/Kokkos_SYCL_Instance.cpp b/core/src/SYCL/Kokkos_SYCL_Instance.cpp
@@ -242,8 +242,8 @@ sycl::device_ptr<void> SYCLInternal::scratch_space(const std::size_t size) {
 
     std::size_t alloc_size = Kokkos::Impl::multiply_overflow_abort(
         m_scratchSpaceCount, sizeScratchGrain);
-    m_scratchSpace = mem_space.allocate(
-        "Kokkos::Experimental::SYCL::InternalScratchSpace", alloc_size);
+    m_scratchSpace = static_cast<size_type*>(mem_space.allocate(
+        "Kokkos::Experimental::SYCL::InternalScratchSpace", alloc_size));
   }
 
   return m_scratchSpace;
@@ -261,8 +261,8 @@ sycl::host_ptr<void> SYCLInternal::scratch_host(const std::size_t size) {
 
     std::size_t alloc_size = Kokkos::Impl::multiply_overflow_abort(
         m_scratchHostCount, sizeScratchGrain);
-    m_scratchHost = mem_space.allocate(
-        "Kokkos::Experimental::SYCL::InternalScratchHost", alloc_size);
+    m_scratchHost = static_cast<size_type*>(mem_space.allocate(
+        "Kokkos::Experimental::SYCL::InternalScratchHost", alloc_size));
   }
 
   return m_scratchHost;
@@ -280,8 +280,8 @@ sycl::device_ptr<void> SYCLInternal::scratch_flags(const std::size_t size) {
 
     std::size_t alloc_size = Kokkos::Impl::multiply_overflow_abort(
         m_scratchFlagsCount, sizeScratchGrain);
-    m_scratchFlags = mem_space.allocate(
-        "Kokkos::Experimental::SYCL::InternalScratchFlags", alloc_size);
+    m_scratchFlags = static_cast<size_type*>(mem_space.allocate(
+        "Kokkos::Experimental::SYCL::InternalScratchFlags", alloc_size));
   }
   auto memset_event = m_queue->memset(m_scratchFlags, 0,
                                       m_scratchFlagsCount * sizeScratchGrain);