Merge pull request #1932 from CliMA/ck/DL_size

Refactor DataLayouts
CliMA · Aug 14, 2024 · c2451ad · c2451ad
2 parents 7ab0acf + 60e313d
commit c2451ad
Show file tree

Hide file tree

Showing 4 changed files with 199 additions and 453 deletions.
diff --git a/ext/cuda/data_layouts_copyto.jl b/ext/cuda/data_layouts_copyto.jl
@@ -97,7 +97,7 @@ function knl_copyto_flat!(dest::AbstractData, bc, us)
 end
 
 function cuda_copyto!(dest::AbstractData, bc)
-    (_, _, Nv, Nh) = DataLayouts.universal_size(dest)
+    (_, _, Nv, _, Nh) = DataLayouts.universal_size(dest)
     us = DataLayouts.UniversalSize(dest)
     if Nv > 0 && Nh > 0
         auto_launch!(knl_copyto_flat!, (dest, bc, us), dest; auto = true)

diff --git a/ext/cuda/data_layouts_fill.jl b/ext/cuda/data_layouts_fill.jl
@@ -11,7 +11,7 @@ function knl_fill_flat!(dest::AbstractData, val, us)
 end
 
 function cuda_fill!(dest::AbstractData, val)
-    (_, _, Nv, Nh) = DataLayouts.universal_size(dest)
+    (_, _, Nv, _, Nh) = DataLayouts.universal_size(dest)
     us = DataLayouts.UniversalSize(dest)
     if Nv > 0 && Nh > 0
         auto_launch!(knl_fill_flat!, (dest, val, us), dest; auto = true)