fix pitch usage

With alpaka-group#245 the latest alpaka version was introduced in cupla. The alpaka pitch definition has changed with alpaka-group/alpaka#2093. We forget to change the usage in alpaka-group#245. This PR handels the pitch correctly.
psychocoderHPC · Jan 25, 2024 · eeb1a4f · eeb1a4f
1 parent ca42209
commit eeb1a4f
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/src/memory.cpp b/src/memory.cpp
@@ -280,9 +280,9 @@ inline namespace CUPLA_ACCELERATOR_NAMESPACE
     {
         const ::alpaka::Vec<cupla::AlpakaDim<2u>, cupla::MemSizeType> numBytes(height, width);
 
-        const ::alpaka::Vec<cupla::AlpakaDim<2u>, cupla::MemSizeType> dstPitch(dPitch * height, dPitch);
+        const ::alpaka::Vec<cupla::AlpakaDim<2u>, cupla::MemSizeType> dstPitch(dPitch, sizeof(uint8_t));
 
-        const ::alpaka::Vec<cupla::AlpakaDim<2u>, cupla::MemSizeType> srcPitch(sPitch * height, sPitch);
+        const ::alpaka::Vec<cupla::AlpakaDim<2u>, cupla::MemSizeType> srcPitch(sPitch, sizeof(uint8_t));
 
         auto& device(cupla::manager::Device<cupla::AccDev>::get().current());
 
@@ -387,23 +387,15 @@ inline namespace CUPLA_ACCELERATOR_NAMESPACE
 
         const ::alpaka::Vec<cupla::AlpakaDim<3u>, cupla::MemSizeType> offsetDst(p->dstPos.z, p->dstPos.y, p->dstPos.x);
 
-        const ::alpaka::Vec<
-            cupla::AlpakaDim<3u>,
-            cupla::MemSizeType>
-            dstPitch(
-                p->dstPtr.pitch * p->dstPtr.ysize
-                    * (p->extent.depth + p->dstPos.z), // @todo: can't create z pitch,  but is not needed by alpaka
-                p->dstPtr.pitch * p->dstPtr.ysize,
-                p->dstPtr.pitch);
-
-        const ::alpaka::Vec<
-            cupla::AlpakaDim<3u>,
-            cupla::MemSizeType>
-            srcPitch(
-                p->srcPtr.pitch * p->srcPtr.ysize
-                    * (p->extent.depth + p->srcPos.z), // @todo: can't create z pitch, but is not needed by alpaka
-                p->srcPtr.pitch * p->srcPtr.ysize,
-                p->srcPtr.pitch);
+        const ::alpaka::Vec<cupla::AlpakaDim<3u>, cupla::MemSizeType> dstPitch(
+            p->dstPtr.pitch * p->dstPtr.ysize,
+            p->dstPtr.pitch,
+            sizeof(uint8_t));
+
+        const ::alpaka::Vec<cupla::AlpakaDim<3u>, cupla::MemSizeType> srcPitch(
+            p->srcPtr.pitch * p->srcPtr.ysize,
+            p->srcPtr.pitch,
+            sizeof(uint8_t));
 
         auto& device(cupla::manager::Device<cupla::AccDev>::get().current());