Skip to content

Commit 0a4384a

Browse files
Remove unnecessary broadcast type (#2207)
1 parent 6fd8eed commit 0a4384a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

ext/cuda/operators_finite_difference.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ AbstractStencilStyle(bc, ::ClimaComms.CUDADevice) =
1515
Operators.any_fd_shmem_supported(bc) ? CUDAWithShmemColumnStencilStyle :
1616
CUDAColumnStencilStyle
1717

18+
Base.Broadcast.BroadcastStyle(
19+
x::Operators.ColumnStencilStyle,
20+
y::CUDAColumnStencilStyle,
21+
) = y
22+
1823
include("operators_fd_shmem_is_supported.jl")
1924

2025
function Base.copyto!(

src/Operators/finitedifference.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,6 @@ strip_space(op::FiniteDifferenceOperator, parent_space) =
219219

220220
abstract type AbstractStencilStyle <: Fields.AbstractFieldStyle end
221221

222-
# the .f field is an operator
223-
struct StencilStyle <: AbstractStencilStyle end
224-
225222
struct ColumnStencilStyle <: AbstractStencilStyle end
226223

227224
AbstractStencilStyle(bc, ::ClimaComms.AbstractCPUDevice) = ColumnStencilStyle
@@ -3815,8 +3812,7 @@ Base.@propagate_inbounds function getidx(
38153812
end
38163813
end
38173814

3818-
3819-
# broadcasting a StencilStyle gives a CompositeStencilStyle
3815+
# broadcasting a ColumnStencilStyle gives the StencilBroadcasted's style
38203816
Base.Broadcast.BroadcastStyle(
38213817
::Type{<:StencilBroadcasted{Style}},
38223818
) where {Style} = Style()
@@ -3945,7 +3941,7 @@ end
39453941
function Base.Broadcast.broadcasted(op::FiniteDifferenceOperator, args...)
39463942
args′ = map(Base.Broadcast.broadcastable, args)
39473943
style = Base.Broadcast.result_style(
3948-
StencilStyle(),
3944+
ColumnStencilStyle(),
39493945
Base.Broadcast.combine_styles(args′...),
39503946
)
39513947
Base.Broadcast.broadcasted(style, op, args′...)

0 commit comments

Comments
 (0)