Merge pull request #1778 from CliMA/ck/fix_dss_type_param

Fix dss type param
CliMA · Jun 4, 2024 · 7038214 · 7038214 · charleskawczynski · Jun 4, 2024
2 parents c6bf4aa + b8d42e7
commit 7038214
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ClimaCore"
 uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
 authors = ["CliMA Contributors <clima-software@caltech.edu>"]
-version = "0.14.6"
+version = "0.14.7"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

diff --git a/ext/cuda/topologies_dss.jl b/ext/cuda/topologies_dss.jl
@@ -17,9 +17,9 @@ _configure_threadblock(nitems) =
 function Topologies.dss_load_perimeter_data!(
     ::ClimaComms.CUDADevice,
     dss_buffer::Topologies.DSSBuffer,
-    data::Union{DataLayouts.IJFH{S, Nij}, DataLayouts.VIJFH{S, Nij}},
+    data::Union{DataLayouts.IJFH, DataLayouts.VIJFH},
     perimeter::Topologies.Perimeter2D,
-) where {S, Nij}
+)
     pperimeter_data = parent(dss_buffer.perimeter_data)
     pdata = parent(data)
     (nlevels, nperimeter, nfid, nelems) = size(pperimeter_data)
@@ -56,10 +56,10 @@ end
 
 function Topologies.dss_unload_perimeter_data!(
     ::ClimaComms.CUDADevice,
-    data::Union{DataLayouts.IJFH{S, Nij}, DataLayouts.VIJFH{S, Nij}},
+    data::Union{DataLayouts.IJFH, DataLayouts.VIJFH},
     dss_buffer::Topologies.DSSBuffer,
     perimeter,
-) where {S, Nij}
+)
     pperimeter_data = parent(dss_buffer.perimeter_data)
     pdata = parent(data)
     (nlevels, nperimeter, nfid, nelems) = size(pperimeter_data)

diff --git a/src/Spaces/dss.jl b/src/Spaces/dss.jl
@@ -27,9 +27,9 @@ perimeter(space::AbstractSpectralElementSpace) = Topologies.Perimeter2D(
 Creates a [`DSSBuffer`](@ref) for the field data corresponding to `data`
 """
 function create_dss_buffer(
-    data::Union{DataLayouts.IJFH{S, Nij}, DataLayouts.VIJFH{S, <:Any, Nij}},
+    data::Union{DataLayouts.IJFH, DataLayouts.VIJFH},
     hspace::SpectralElementSpace2D,
-) where {S, Nij}
+)
     create_dss_buffer(
         data,
         topology(hspace),
@@ -39,9 +39,9 @@ function create_dss_buffer(
 end
 
 function create_dss_buffer(
-    data::Union{DataLayouts.IFH{S, Nij}, DataLayouts.VIFH{S, <:Any, Nij}},
+    data::Union{DataLayouts.IFH, DataLayouts.VIFH},
     hspace::SpectralElementSpace1D,
-) where {S, Nij}
+)
     nothing
 end
 

diff --git a/src/Topologies/dss.jl b/src/Topologies/dss.jl
@@ -795,7 +795,7 @@ end
 Computed unweighted/pure DSS of `data`.
 """
 function dss!(
-    data::Union{DataLayouts.IJFH{S, Nij}, DataLayouts.VIJFH{S, Nij}},
+    data::Union{DataLayouts.IJFH{S, Nij}, DataLayouts.VIJFH{S, <:Any, Nij}},
     topology::Topology2D,
 ) where {S, Nij}
     length(parent(data)) == 0 && return nothing

diff --git a/src/Topologies/dss_transform.jl b/src/Topologies/dss_transform.jl
@@ -316,7 +316,7 @@ recv_buffer(ghost::GhostBuffer) = ghost.recv_data
 create_ghost_buffer(data, topology::Topologies.AbstractTopology) = nothing
 
 function create_ghost_buffer(
-    data::Union{DataLayouts.IJFH{S, Nij}, DataLayouts.VIJFH{S, Nij}},
+    data::Union{DataLayouts.IJFH{S, Nij}, DataLayouts.VIJFH{S, <:Any, Nij}},
     topology::Topologies.Topology2D,
 ) where {S, Nij}
     if data isa DataLayouts.IJFH