Skip to content

Commit 90aaab1

Browse files
charleskawczynskicharleskawczynski
committed
Apply formatter
1 parent 58aab35 commit 90aaab1

File tree

9 files changed

+167
-88
lines changed

9 files changed

+167
-88
lines changed

‎ext/cuda/data_layouts.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ import CUDA
1313
parent_array_type(::Type{<:CUDA.CuArray{T, N, B} where {N}}) where {T, B} =
1414
CUDA.CuArray{T, N, B} where {N}
1515

16-
parent_array_type(::Type{<:CUDA.CuArray{T, N, B} where {N}}, ::Val{ND}) where {T, B, ND} =
17-
CUDA.CuArray{T, ND, B}
16+
parent_array_type(
17+
::Type{<:CUDA.CuArray{T, N, B} where {N}},
18+
::Val{ND},
19+
) where {T, B, ND} = CUDA.CuArray{T, ND, B}
1820

1921
# Ensure that both parent array types have the same memory buffer type.
2022
promote_parent_array_type(

‎ext/cuda/data_layouts_copyto.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function Base.copyto!(
4040
knl_copyto_field_array!,
4141
(dest, bc, us),
4242
prod(DataLayouts.universal_size(us));
43-
auto = true
43+
auto = true,
4444
)
4545
end
4646
return dest

‎ext/cuda/topologies_dss.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ function dss_load_perimeter_data_kernel!(
4949
(level, p, fidx, elem) = cart_ind(sizep, gidx).I
5050
(ip, jp) = perimeter[p]
5151
data_idx = linear_ind(sized, (level, ip, jp, elem))
52-
pperimeter_data.arrays[fidx][level, p, elem] = pdata.arrays[fidx][data_idx]
52+
pperimeter_data.arrays[fidx][level, p, elem] =
53+
pdata.arrays[fidx][data_idx]
5354
end
5455
return nothing
5556
end
@@ -89,7 +90,8 @@ function dss_unload_perimeter_data_kernel!(
8990
(level, p, fidx, elem) = cart_ind(sizep, gidx).I
9091
(ip, jp) = perimeter[p]
9192
data_idx = linear_ind(sized, (level, ip, jp, fidx, elem))
92-
pdata.arrays[fidx][data_idx] = pperimeter_data.arrays[fidx][level, p, elem]
93+
pdata.arrays[fidx][data_idx] =
94+
pperimeter_data.arrays[fidx][level, p, elem]
9395
end
9496
return nothing
9597
end
@@ -683,7 +685,8 @@ function load_from_recv_buffer_kernel!(
683685
lidx = recv_buf_idx[irecv, 1]
684686
ip = recv_buf_idx[irecv, 2]
685687
idx = level + ((fidx - 1) + (irecv - 1) * nfid) * nlevels
686-
CUDA.@atomic pperimeter_data.arrays[fidx][level, ip, lidx] += recv_data[idx]
688+
CUDA.@atomic pperimeter_data.arrays[fidx][level, ip, lidx] +=
689+
recv_data[idx]
687690
end
688691
return nothing
689692
end

‎src/DataLayouts/DataLayouts.jl

Lines changed: 87 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ function Base.show(io::IO, data::AbstractData)
130130
:limit => true,
131131
:displaysize => (rows, cols - indent_width),
132132
),
133-
map(x->vec(x), parent(data).arrays),
133+
map(x -> vec(x), parent(data).arrays),
134134
)
135135
return io
136136
end
@@ -242,7 +242,11 @@ end
242242
n = union_all(T)
243243
P = Base.tail(type_params(T))
244244
SS = fieldtype(S, i)
245-
return :(Base.@_inline_meta; $n{$SS, $P...}(DataLayouts.generic_property_view(data, $i)))
245+
return :(
246+
Base.@_inline_meta; $n{$SS, $P...}(
247+
DataLayouts.generic_property_view(data, $i),
248+
)
249+
)
246250
end
247251

248252
@inline function Base.getproperty(data::AbstractData{S}, name::Symbol) where {S}
@@ -291,7 +295,10 @@ Base.@propagate_inbounds @generated function _property_view(
291295
))
292296
end
293297

294-
@inline function generic_property_view(data::AbstractData{S}, i::Integer) where {S}
298+
@inline function generic_property_view(
299+
data::AbstractData{S},
300+
i::Integer,
301+
) where {S}
295302
fa = parent(data)
296303
T = eltype(fa)
297304
SS = fieldtype(S, i)
@@ -301,8 +308,20 @@ end
301308
return FieldArray(ntuple(jf -> parent(data).arrays[offset + jf], nbytes))
302309
end
303310

304-
@inline @generated function generic_property_view(data::AbstractData{S}, ::Val{Idx}) where {S, Idx}
305-
:(FieldArray(ntuple(jf -> parent(data).arrays[fieldtypeoffset(eltype(parent(data)), S, i) + jf], typesize(eltype(parent(data)), fieldtype(S, i)))))
311+
@inline @generated function generic_property_view(
312+
data::AbstractData{S},
313+
::Val{Idx},
314+
) where {S, Idx}
315+
:(FieldArray(
316+
ntuple(
317+
jf -> parent(data).arrays[fieldtypeoffset(
318+
eltype(parent(data)),
319+
S,
320+
i,
321+
) + jf],
322+
typesize(eltype(parent(data)), fieldtype(S, i)),
323+
),
324+
))
306325
end
307326

308327
@propagate_inbounds function Base.getindex(
@@ -341,7 +360,7 @@ end
341360
342361
A 3D DataLayout. TODO: Add more docs
343362
"""
344-
struct IJKFVH{S, Nij, Nk, Nv, Nh, FA<:FieldArray} <: Data3D{S, Nij, Nk}
363+
struct IJKFVH{S, Nij, Nk, Nv, Nh, FA <: FieldArray} <: Data3D{S, Nij, Nk}
345364
fa::FA
346365
end
347366
IJKFVH{S, Nij, Nk, Nv, Nh}(fa::FieldArray) where {S, Nij, Nk, Nv, Nh} =
@@ -391,7 +410,8 @@ struct IJFH{S, Nij, Nh, FA <: FieldArray} <: Data2D{S, Nij}
391410
array::FA
392411
end
393412

394-
parent_array_type(::Type{IJFH{S, Nij, Nh, A}}) where {S, Nij, Nh, A} = parent_array_type(A)
413+
parent_array_type(::Type{IJFH{S, Nij, Nh, A}}) where {S, Nij, Nh, A} =
414+
parent_array_type(A)
395415

396416
function IJFH{S, Nij, Nh}(fa::FieldArray) where {S, Nij, Nh}
397417
IJFH{S, Nij, Nh, typeof(fa)}(fa)
@@ -447,10 +467,7 @@ Base.length(data::IJFH) = get_Nh(data)
447467
@boundscheck (1 <= h <= get_Nh(data)) || throw(BoundsError(data, (h,)))
448468
fa = parent(data)
449469
sub_arrays = ntuple(ncomponents(fa)) do jf
450-
view(
451-
fa.arrays[jf],
452-
:, :, h,
453-
)
470+
view(fa.arrays[jf], :, :, h)
454471
end
455472
dataview = FieldArray(sub_arrays)
456473
IJF{S, Nij, typeof(dataview)}(dataview)
@@ -466,7 +483,9 @@ end
466483
@boundscheck (1 <= j <= Nij && 1 <= i <= Nij && 1 <= h <= get_Nh(data)) ||
467484
throw(BoundsError(data, (i, j, h)))
468485
fa = parent(data)
469-
dataview = @inbounds FieldArray(ntuple(jf-> view(parent(fa.arrays[jf]), i, j, h), ncomponents(fa)))
486+
dataview = @inbounds FieldArray(
487+
ntuple(jf -> view(parent(fa.arrays[jf]), i, j, h), ncomponents(fa)),
488+
)
470489
DataF{S, typeof(dataview)}(dataview)
471490
end
472491

@@ -508,9 +527,11 @@ struct IFH{S, Ni, Nh, FA <: FieldArray} <: Data1D{S, Ni}
508527
array::FA
509528
end
510529

511-
IFH{S, Ni, Nh}(fa::FieldArray) where {S, Ni, Nh} = IFH{S, Ni, Nh, typeof(fa)}(fa)
530+
IFH{S, Ni, Nh}(fa::FieldArray) where {S, Ni, Nh} =
531+
IFH{S, Ni, Nh, typeof(fa)}(fa)
512532

513-
parent_array_type(::Type{IFH{S, Ni, Nh, A}}) where {S, Ni, Nh, A} = parent_array_type(A)
533+
parent_array_type(::Type{IFH{S, Ni, Nh, A}}) where {S, Ni, Nh, A} =
534+
parent_array_type(A)
514535

515536
function IFH{S, Ni, Nh}(array::AbstractArray{T, 3}) where {S, Ni, Nh, T}
516537
check_basetype(T, S)
@@ -531,7 +552,10 @@ end
531552
@inline function slab(data::IFH{S, Ni}, h::Integer) where {S, Ni}
532553
@boundscheck (1 <= h <= get_Nh(data)) || throw(BoundsError(data, (h,)))
533554
# dataview = @inbounds view(parent(data), :, :, h)
534-
toa_view = @inbounds ntuple(i->view(parent(data).arrays[i], :, h), ncomponents(data))
555+
toa_view = @inbounds ntuple(
556+
i -> view(parent(data).arrays[i], :, h),
557+
ncomponents(data),
558+
)
535559
dataview = FieldArray(toa_view)
536560
IF{S, Ni}(dataview)
537561
end
@@ -540,7 +564,9 @@ Base.@propagate_inbounds slab(data::IFH, v::Integer, h::Integer) = slab(data, h)
540564
@inline function column(data::IFH{S, Ni}, i, h) where {S, Ni}
541565
@boundscheck (1 <= h <= get_Nh(data) && 1 <= i <= Ni) ||
542566
throw(BoundsError(data, (i, h)))
543-
dataview = @inbounds FieldArray(ntuple(jf-> view(parent(fa.arrays[jf]), i, h), ncomponents(fa)))
567+
dataview = @inbounds FieldArray(
568+
ntuple(jf -> view(parent(fa.arrays[jf]), i, h), ncomponents(fa)),
569+
)
544570
DataF{S, typeof(dataview)}(dataview)
545571
end
546572
Base.@propagate_inbounds column(data::IFH{S, Ni}, i, j, h) where {S, Ni} =
@@ -579,7 +605,7 @@ Base.length(data::Data0D) = 1
579605
580606
Backing `DataLayout` for 0D point data.
581607
"""
582-
struct DataF{S, FA<:FieldArray} <: Data0D{S}
608+
struct DataF{S, FA <: FieldArray} <: Data0D{S}
583609
array::FA
584610
end
585611

@@ -672,7 +698,8 @@ struct IJF{S, Nij, FA <: FieldArray} <: DataSlab2D{S, Nij}
672698
array::FA
673699
end
674700

675-
parent_array_type(::Type{IJF{S, Nij, A}}) where {S, Nij, A} = parent_array_type(A)
701+
parent_array_type(::Type{IJF{S, Nij, A}}) where {S, Nij, A} =
702+
parent_array_type(A)
676703

677704
function IJF{S, Nij}(array::AbstractArray{T, 3}) where {S, Nij, T}
678705
@assert size(array, 1) == Nij
@@ -730,7 +757,9 @@ end
730757
@inline function column(data::IJF{S, Nij}, i, j) where {S, Nij}
731758
@boundscheck (1 <= j <= Nij && 1 <= i <= Nij) ||
732759
throw(BoundsError(data, (i, j)))
733-
dataview = @inbounds FieldArray(ntuple(jf-> view(parent(fa.arrays[jf]), i, j), ncomponents(fa)))
760+
dataview = @inbounds FieldArray(
761+
ntuple(jf -> view(parent(fa.arrays[jf]), i, j), ncomponents(fa)),
762+
)
734763
DataF{S, typeof(dataview)}(dataview)
735764
end
736765

@@ -814,7 +843,9 @@ end
814843
@inline function column(data::IF{S, Ni}, i) where {S, Ni}
815844
@boundscheck (1 <= i <= Ni) || throw(BoundsError(data, (i,)))
816845
fa = parent(data)
817-
dataview = @inbounds FieldArray(ntuple(jf-> view(parent(fa.arrays[jf]), i), ncomponents(fa)))
846+
dataview = @inbounds FieldArray(
847+
ntuple(jf -> view(parent(fa.arrays[jf]), i), ncomponents(fa)),
848+
)
818849
DataF{S, typeof(dataview)}(dataview)
819850
end
820851

@@ -923,7 +954,8 @@ struct VIJFH{S, Nv, Nij, Nh, FA <: FieldArray} <: Data2DX{S, Nv, Nij}
923954
array::FA
924955
end
925956

926-
VIJFH{S, Nv, Nij, Nh}(fa::FieldArray) where {S, Nv, Nij, Nh} = VIJFH{S, Nv, Nij, Nh, typeof(fa)}(fa)
957+
VIJFH{S, Nv, Nij, Nh}(fa::FieldArray) where {S, Nv, Nij, Nh} =
958+
VIJFH{S, Nv, Nij, Nh, typeof(fa)}(fa)
927959

928960
parent_array_type(::Type{VIJFH{S, Nv, Nij, Nh, A}}) where {S, Nv, Nij, Nh, A} =
929961
parent_array_type(A)
@@ -975,12 +1007,11 @@ end
9751007
@boundscheck (1 <= i <= Nij && 1 <= j <= Nij && 1 <= h <= Nh) ||
9761008
throw(BoundsError(data, (i, j, h)))
9771009
Nf = ncomponents(data)
978-
dataview = @inbounds FieldArray(ntuple(ncomponents(fa)) do jf
979-
SubArray(
980-
parent(fa.arrays[jf]),
981-
(Base.Slice(Base.OneTo(Nv)), i, j, h),
982-
)
983-
end)
1010+
dataview = @inbounds FieldArray(
1011+
ntuple(ncomponents(fa)) do jf
1012+
SubArray(parent(fa.arrays[jf]), (Base.Slice(Base.OneTo(Nv)), i, j, h))
1013+
end,
1014+
)
9841015
VF{S, Nv, typeof(dataview)}(dataview)
9851016
end
9861017

@@ -1045,9 +1076,11 @@ struct VIFH{S, Nv, Ni, Nh, FA <: FieldArray} <: Data1DX{S, Nv, Ni}
10451076
array::FA
10461077
end
10471078

1048-
VIFH{S, Nv, Ni, Nh}(fa::FieldArray) where {S, Nv, Ni, Nh} = VIFH{S, Nv, Ni, Nh, typeof(fa)}(fa)
1079+
VIFH{S, Nv, Ni, Nh}(fa::FieldArray) where {S, Nv, Ni, Nh} =
1080+
VIFH{S, Nv, Ni, Nh, typeof(fa)}(fa)
10491081

1050-
parent_array_type(::Type{VIFH{S, Nv, Ni, Nh, A}}) where {S, Nv, Ni, Nh, A} = parent_array_type(A)
1082+
parent_array_type(::Type{VIFH{S, Nv, Ni, Nh, A}}) where {S, Nv, Ni, Nh, A} =
1083+
parent_array_type(A)
10511084

10521085
function VIFH{S, Nv, Ni, Nh}(
10531086
array::AbstractArray{T, 4},
@@ -1159,7 +1192,8 @@ struct IH1JH2{S, Nij, A} <: Data2D{S, Nij}
11591192
array::A
11601193
end
11611194

1162-
parent_array_type(::Type{IH1JH2{S, Nij, A}}) where {S, Nij, A} = parent_array_type(A)
1195+
parent_array_type(::Type{IH1JH2{S, Nij, A}}) where {S, Nij, A} =
1196+
parent_array_type(A)
11631197

11641198
function IH1JH2{S, Nij}(array::AbstractMatrix{S}) where {S, Nij}
11651199
@assert size(array, 1) % Nij == 0
@@ -1202,7 +1236,8 @@ struct IV1JH2{S, n1, Ni, A} <: Data1DX{S, n1, Ni}
12021236
array::A
12031237
end
12041238

1205-
parent_array_type(::Type{IV1JH2{S, n1, Ni, A}}) where {S, n1, Ni, A} = parent_array_type(A)
1239+
parent_array_type(::Type{IV1JH2{S, n1, Ni, A}}) where {S, n1, Ni, A} =
1240+
parent_array_type(A)
12061241

12071242
function IV1JH2{S, n1, Ni}(array::AbstractMatrix{S}) where {S, n1, Ni}
12081243
@assert size(array, 2) % Ni == 0
@@ -1239,7 +1274,7 @@ end
12391274

12401275
rebuild(data::AbstractData, ::Type{DA}) where {DA} =
12411276
rebuild(data, rebuild(getfield(data, :array), DA))
1242-
# rebuild(data, Adapt.adapt_structure(DA, getfield(data, :array)))
1277+
# rebuild(data, Adapt.adapt_structure(DA, getfield(data, :array)))
12431278

12441279
Base.copy(data::AbstractData) =
12451280
union_all(data){type_params(data)...}(copy(parent(data)))
@@ -1478,7 +1513,19 @@ _device_dispatch(x::AbstractData) = _device_dispatch(parent(x))
14781513
_device_dispatch(x::SArray) = ToCPU()
14791514
_device_dispatch(x::MArray) = ToCPU()
14801515

1481-
for DL in (:IJKFVH,:IJFH,:IFH,:DataF,:IJF,:IF,:VF,:VIJFH,:VIFH,:IH1JH2,:IV1JH2)
1516+
for DL in (
1517+
:IJKFVH,
1518+
:IJFH,
1519+
:IFH,
1520+
:DataF,
1521+
:IJF,
1522+
:IF,
1523+
:VF,
1524+
:VIJFH,
1525+
:VIFH,
1526+
:IH1JH2,
1527+
:IV1JH2,
1528+
)
14821529
@eval singleton(::$DL) = $(Symbol(DL, :Singleton))()
14831530
end
14841531

@@ -1490,15 +1537,19 @@ include("non_extruded_broadcasted.jl")
14901537
include("has_uniform_datalayouts.jl")
14911538

14921539

1493-
float_type(::Type{IJKFVH{S, Nij, Nk, Nv, Nh, FA}}) where {S, Nij, Nk, Nv, Nh, FA} = eltype(FA)
1540+
float_type(
1541+
::Type{IJKFVH{S, Nij, Nk, Nv, Nh, FA}},
1542+
) where {S, Nij, Nk, Nv, Nh, FA} = eltype(FA)
14941543
float_type(::Type{IJFH{S, Nij, Nh, FA}}) where {S, Nij, Nh, FA} = eltype(FA)
14951544
float_type(::Type{IFH{S, Ni, Nh, FA}}) where {S, Ni, Nh, FA} = eltype(FA)
14961545
float_type(::Type{DataF{S, FA}}) where {S, FA} = eltype(FA)
14971546
float_type(::Type{IJF{S, Nij, FA}}) where {S, Nij, FA} = eltype(FA)
14981547
float_type(::Type{IF{S, Ni, FA}}) where {S, Ni, FA} = eltype(FA)
14991548
float_type(::Type{VF{S, Nv, FA}}) where {S, Nv, FA} = eltype(FA)
1500-
float_type(::Type{VIJFH{S, Nv, Nij, Nh, FA}}) where {S, Nv, Nij, Nh, FA} = eltype(FA)
1501-
float_type(::Type{VIFH{S, Nv, Ni, Nh, FA}}) where {S, Nv, Ni, Nh, FA} = eltype(FA)
1549+
float_type(::Type{VIJFH{S, Nv, Nij, Nh, FA}}) where {S, Nv, Nij, Nh, FA} =
1550+
eltype(FA)
1551+
float_type(::Type{VIFH{S, Nv, Ni, Nh, FA}}) where {S, Nv, Ni, Nh, FA} =
1552+
eltype(FA)
15021553
float_type(::Type{IH1JH2{S, Nij, A}}) where {S, Nij, A} = eltype(A)
15031554
float_type(::Type{IV1JH2{S, n1, Ni, A}}) where {S, n1, Ni, A} = eltype(A)
15041555

0 commit comments

Comments
 (0)