Merge #1462

1462: inline all FD operators and axisvector conversions r=simonbyrne a=simonbyrne See #1455 - [ ] Code follows the [style guidelines](https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/) OR N/A. - [ ] Unit tests are included OR N/A. - [ ] Code is exercised in an integration test OR N/A. - [ ] Documentation has been added/updated OR N/A. Co-authored-by: Simon Byrne <[email protected]>
CliMA · Sep 18, 2023 · 1107e79 · 1107e79
2 parents 72c1063 + 25e8f21
commit 1107e79
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 21 deletions.
diff --git a/src/Geometry/axistensors.jl b/src/Geometry/axistensors.jl
@@ -609,10 +609,13 @@ end
             push!(vals, val)
         end
     end
-    return :(@inbounds Axis2Tensor(
-        (ato, axes(x, 2)),
-        SMatrix{$(length(Ito)), $M}($(vals...)),
-    ))
+    quote
+        Base.@_propagate_inbounds_meta
+        @inbounds Axis2Tensor(
+            (ato, axes(x, 2)),
+            SMatrix{$(length(Ito)), $M}($(vals...)),
+        )
+    end
 end
 
 @inline transform(ato::CovariantAxis, v::CovariantTensor) = _project(ato, v)

diff --git a/src/Geometry/conversions.jl b/src/Geometry/conversions.jl
@@ -49,65 +49,73 @@ CovariantVector(
 ) where {T, I} = local_geometry.gᵢⱼ * u
 
 # Converting to specific dimension types
-(::Type{<:ContravariantVector{<:Any, I}})(
+@inline (::Type{<:ContravariantVector{<:Any, I}})(
     u::ContravariantVector{<:Any, I},
     ::LocalGeometry{I},
 ) where {I} = u
 
-(::Type{<:ContravariantVector{<:Any, I}})(
+@inline (::Type{<:ContravariantVector{<:Any, I}})(
     u::ContravariantVector,
     ::LocalGeometry,
 ) where {I} = project(ContravariantAxis{I}(), u)
 
-(::Type{<:ContravariantVector{<:Any, I}})(
+@inline (::Type{<:ContravariantVector{<:Any, I}})(
     u::AxisVector,
     local_geometry::LocalGeometry,
 ) where {I} =
     project(ContravariantAxis{I}(), ContravariantVector(u, local_geometry))
 
-(::Type{<:CovariantVector{<:Any, I}})(
+@inline (::Type{<:CovariantVector{<:Any, I}})(
     u::CovariantVector{<:Any, I},
     ::LocalGeometry{I},
 ) where {I} = u
 
-(::Type{<:CovariantVector{<:Any, I}})(
+@inline (::Type{<:CovariantVector{<:Any, I}})(
     u::CovariantVector,
     ::LocalGeometry,
 ) where {I} = project(CovariantAxis{I}(), u)
 
-(::Type{<:CovariantVector{<:Any, I}})(
+@inline (::Type{<:CovariantVector{<:Any, I}})(
     u::AxisVector,
     local_geometry::LocalGeometry,
 ) where {I} = project(CovariantAxis{I}(), CovariantVector(u, local_geometry))
 
-(::Type{<:LocalVector{<:Any, I}})(
+@inline (::Type{<:LocalVector{<:Any, I}})(
     u::LocalVector{<:Any, I},
     ::LocalGeometry{I},
 ) where {I} = u
 
-(::Type{<:LocalVector{<:Any, I}})(u::LocalVector, ::LocalGeometry) where {I} =
-    project(LocalAxis{I}(), u)
+@inline (::Type{<:LocalVector{<:Any, I}})(
+    u::LocalVector,
+    ::LocalGeometry,
+) where {I} = project(LocalAxis{I}(), u)
 
-(::Type{<:LocalVector{<:Any, I}})(
+@inline (::Type{<:LocalVector{<:Any, I}})(
     u::AxisVector,
     local_geometry::LocalGeometry,
 ) where {I} = project(LocalAxis{I}(), LocalVector(u, local_geometry))
 
 # Generic N-axis conversion functions,
 # Convert to specific local geometry dimension then convert vector type
-LocalVector(u::CovariantVector, local_geometry::LocalGeometry{I}) where {I} =
+@inline LocalVector(
+    u::CovariantVector,
+    local_geometry::LocalGeometry{I},
+) where {I} =
     project(LocalAxis{I}(), project(CovariantAxis{I}(), u), local_geometry)
 
-LocalVector(
+@inline LocalVector(
     u::ContravariantVector,
     local_geometry::LocalGeometry{I},
 ) where {I} =
     project(LocalAxis{I}(), project(ContravariantAxis{I}(), u), local_geometry)
 
-CovariantVector(u::LocalVector, local_geometry::LocalGeometry{I}) where {I} =
+@inline CovariantVector(
+    u::LocalVector,
+    local_geometry::LocalGeometry{I},
+) where {I} =
     project(CovariantAxis{I}(), project(LocalAxis{I}(), u), local_geometry)
 
-CovariantVector(
+@inline CovariantVector(
     u::ContravariantVector,
     local_geometry::LocalGeometry{I},
 ) where {I} = project(
@@ -116,13 +124,13 @@ CovariantVector(
     local_geometry,
 )
 
-ContravariantVector(
+@inline ContravariantVector(
     u::LocalVector,
     local_geometry::LocalGeometry{I},
 ) where {I} =
     project(ContravariantAxis{I}(), project(LocalAxis{I}(), u), local_geometry)
 
-ContravariantVector(
+@inline ContravariantVector(
     u::CovariantVector,
     local_geometry::LocalGeometry{I},
 ) where {I} = project(

diff --git a/src/Operators/finitedifference.jl b/src/Operators/finitedifference.jl
@@ -3446,7 +3446,7 @@ function Base.copyto!(
     max_threads = 256
     nitems = Nv * Nq * Nq * Nh # # of independent items
     (nthreads, nblocks) = Spaces._configure_threadblock(max_threads, nitems)
-    @cuda threads = (nthreads,) blocks = (nblocks,) copyto_stencil_kernel!(
+    @cuda always_inline = true threads = (nthreads,) blocks = (nblocks,) copyto_stencil_kernel!(
         strip_space(out, space),
         strip_space(bc, space),
         axes(out),