Skip to content

Commit 52d84c0

Browse files
Apply formatter
1 parent 8dd4b91 commit 52d84c0

File tree

21 files changed

+540
-386
lines changed

21 files changed

+540
-386
lines changed

ext/cuda/data_layouts_copyto.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ function cuda_copyto!(dest::AbstractData, bc)
6767
if Nv > 0 && Nh > 0
6868
if has_uniform_datalayouts(bc)
6969
bc′ = to_non_extruded_broadcasted(bc)
70-
auto_launch!(knl_copyto_linear!, (dest, bc′, us), nitems; auto = true)
70+
auto_launch!(
71+
knl_copyto_linear!,
72+
(dest, bc′, us),
73+
nitems;
74+
auto = true,
75+
)
7176
else
7277
auto_launch!(knl_copyto_flat!, (dest, bc, us), nitems; auto = true)
7378
end

ext/cuda/topologies_dss.jl

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -270,23 +270,27 @@ function dss_transform_kernel!(
270270
end
271271
for fidx in covariant12fidx
272272
data_idx = linear_ind(sizet_data, (level, ip, jp, elem))
273-
(idx11, idx12, idx21, idx22) = (1,2,3,4)
274-
# Topologies._get_idx_metric(sizet_metric, (level, ip, jp, elem))
273+
(idx11, idx12, idx21, idx22) = (1, 2, 3, 4)
274+
# Topologies._get_idx_metric(sizet_metric, (level, ip, jp, elem))
275275
pperimeter_data[level, p, fidx, elem] =
276276
(
277-
p∂ξ∂x.arrays[idx11][data_idx] * pdata.arrays[fidx][data_idx] +
278-
p∂ξ∂x.arrays[idx12][data_idx] * pdata.arrays[fidx+1][data_idx]
277+
p∂ξ∂x.arrays[idx11][data_idx] *
278+
pdata.arrays[fidx][data_idx] +
279+
p∂ξ∂x.arrays[idx12][data_idx] *
280+
pdata.arrays[fidx + 1][data_idx]
279281
) * weight
280282
pperimeter_data[level, p, fidx + 1, elem] =
281283
(
282-
p∂ξ∂x.arrays[idx21][data_idx] * pdata.arrays[fidx][data_idx] +
283-
p∂ξ∂x.arrays[idx22][data_idx] * pdata.arrays[fidx+1][data_idx]
284+
p∂ξ∂x.arrays[idx21][data_idx] *
285+
pdata.arrays[fidx][data_idx] +
286+
p∂ξ∂x.arrays[idx22][data_idx] *
287+
pdata.arrays[fidx + 1][data_idx]
284288
) * weight
285289
end
286290
for fidx in contravariant12fidx
287291
data_idx = linear_ind(sizet_data, (level, ip, jp, elem))
288-
(idx11, idx12, idx21, idx22) = (1,2,3,4)
289-
# Topologies._get_idx_metric(sizet_metric, (level, ip, jp, elem))
292+
(idx11, idx12, idx21, idx22) = (1, 2, 3, 4)
293+
# Topologies._get_idx_metric(sizet_metric, (level, ip, jp, elem))
290294
pperimeter_data[level, p, fidx, elem] =
291295
(
292296
p∂x∂ξ[idx11] * pdata[data_idx1] +

src/DataLayouts/DataLayouts.jl

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ abstract type AbstractData{S} end
5353

5454
struct ArraySize{FD, Nf, S} end
5555
@inline ArraySize(data::AbstractData, i::Integer) = ArraySize(data)[i]
56-
@inline ArraySize(data::AbstractData) = ArraySize{field_dim(data), ncomponents(data), farray_size(data)}()
56+
@inline ArraySize(data::AbstractData) =
57+
ArraySize{field_dim(data), ncomponents(data), farray_size(data)}()
5758
@inline Base.ndims(::ArraySize{FD, Nf, S}) where {FD, Nf, S} = length(S)
5859
@inline Base.ndims(::Type{ArraySize{FD, Nf, S}}) where {FD, Nf, S} = length(S)
5960

@@ -382,7 +383,7 @@ function IJFH{S, Nij, Nh}(array::AbstractArray{T, 4}) where {S, Nij, Nh, T}
382383
@assert size(array, 3) == typesize(T, S)
383384
@assert size(array, 4) == Nh
384385
# fa = field_array(array, IJFHSingleton())
385-
fa = field_array(array, ArraySize{3,Nf,(Nij,Nij,Nf,Nh)}())
386+
fa = field_array(array, ArraySize{3, Nf, (Nij, Nij, Nf, Nh)}())
386387
@assert ncomponents(fa) == typesize(T, S)
387388
IJFH{S, Nij, Nh, typeof(fa)}(fa)
388389
end
@@ -417,7 +418,8 @@ end
417418
@boundscheck (1 <= j <= Nij && 1 <= i <= Nij && 1 <= h <= get_Nh(data)) ||
418419
throw(BoundsError(data, (i, j, h)))
419420
fa = field_array(data)
420-
sub_arrays = @inbounds ntuple(f -> view(fa.arrays[f], i, j, h), ncomponents(fa))
421+
sub_arrays =
422+
@inbounds ntuple(f -> view(fa.arrays[f], i, j, h), ncomponents(fa))
421423
dataview = FieldArray{field_dim(DataF)}(sub_arrays)
422424
DataF{S, typeof(dataview)}(dataview)
423425
end
@@ -620,7 +622,9 @@ IJF{S, Nij}(fa::FieldArray) where {S, Nij} = IJF{S, Nij, typeof(fa)}(fa)
620622
function IJF{S, Nij}(::Type{MArray}, ::Type{T}) where {S, Nij, T}
621623
Nf = typesize(T, S)
622624
# array = MArray{Tuple{Nij, Nij, Nf}, T, 3, Nij * Nij * Nf}(undef)
623-
array = FieldArray{field_dim(IJF)}(ntuple(f->MArray{Tuple{Nij, Nij}, T, 2, Nij * Nij}(undef), Nf))
625+
array = FieldArray{field_dim(IJF)}(
626+
ntuple(f -> MArray{Tuple{Nij, Nij}, T, 2, Nij * Nij}(undef), Nf),
627+
)
624628
IJF{S, Nij}(array)
625629
end
626630
function SArray(ijf::IJF{S, Nij, <:FieldArray}) where {S, Nij}
@@ -682,7 +686,9 @@ end
682686
function IF{S, Ni}(::Type{MArray}, ::Type{T}) where {S, Ni, T}
683687
Nf = typesize(T, S)
684688
# array = MArray{Tuple{Ni, Nf}, T, 2, Ni * Nf}(undef)
685-
fa = FieldArray{field_dim(IF)}(ntuple(f->MArray{Tuple{Ni}, T, 1, Ni}(undef), Nf))
689+
fa = FieldArray{field_dim(IF)}(
690+
ntuple(f -> MArray{Tuple{Ni}, T, 1, Ni}(undef), Nf),
691+
)
686692
IF{S, Ni}(fa)
687693
end
688694
function SArray(data::IF{S, Ni, <:FieldArray}) where {S, Ni}
@@ -917,10 +923,7 @@ Base.length(data::VIFH) = nlevels(data) * get_Nh(data)
917923
throw(BoundsError(data, (v, h)))
918924
Nf = ncomponents(data)
919925
sub_arrays = @inbounds ntuple(ncomponents(data)) do f
920-
SubArray(
921-
array.arrays[f],
922-
(v, Base.Slice(Base.OneTo(Ni)), h),
923-
)
926+
SubArray(array.arrays[f], (v, Base.Slice(Base.OneTo(Ni)), h))
924927
end
925928
dataview = FieldArray{field_dim(IF)}(sub_arrays)
926929
IF{S, Ni}(dataview)
@@ -950,10 +953,7 @@ end
950953
throw(BoundsError(data, (i, j, h)))
951954
Nf = ncomponents(data)
952955
sub_arrays = @inbounds ntuple(Nf) do f
953-
SubArray(
954-
parent(array.arrays[f]),
955-
(Base.Slice(Base.OneTo(Nv)), i, h),
956-
)
956+
SubArray(parent(array.arrays[f]), (Base.Slice(Base.OneTo(Nv)), i, h))
957957
end
958958
dataview = FieldArray{field_dim(VF)}(sub_arrays)
959959
VF{S, Nv}(dataview)
@@ -1010,8 +1010,11 @@ end
10101010
n2 = div(N2, Nij)
10111011
z2, z1 = fldmod(h - 1, n1)
10121012
@boundscheck (1 <= h <= n1 * n2) || throw(BoundsError(data, (h,)))
1013-
dataview =
1014-
@inbounds view(field_array(data), Nij * z1 .+ (1:Nij), Nij * z2 .+ (1:Nij))
1013+
dataview = @inbounds view(
1014+
field_array(data),
1015+
Nij * z1 .+ (1:Nij),
1016+
Nij * z2 .+ (1:Nij),
1017+
)
10151018
return dataview
10161019
end
10171020

@@ -1322,7 +1325,13 @@ end
13221325
) where {S}
13231326
s_array = farray_size(data)
13241327
ss = StaticSize(s_array, field_dim(data))
1325-
@inbounds get_struct_linear(field_array(data), S, Val(field_dim(data)), ss, I)
1328+
@inbounds get_struct_linear(
1329+
field_array(data),
1330+
S,
1331+
Val(field_dim(data)),
1332+
ss,
1333+
I,
1334+
)
13261335
end
13271336
@propagate_inbounds function linear_setindex!(
13281337
data::AbstractData{S},

src/DataLayouts/broadcast.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ function Base.similar(
360360
Nf = typesize(eltype(A), Eltype)
361361
# array = MArray{Tuple{Ni, Nf}, eltype(A), 2, Ni * Nf}(undef)
362362
MAT = MArray{Tuple{Ni}, eltype(A), 2, Ni}
363-
_size = (Ni, )
363+
_size = (Ni,)
364364
as = ArraySize{field_dim(IF), Nf, ()}() # size is unused
365365
fa = similar(rebuild_field_array_type(A, as, MAT), _size)
366366
return IF{Eltype, Ni}(fa)
@@ -377,7 +377,7 @@ function Base.similar(
377377
::Val{newNv},
378378
) where {Nv, A, Eltype, newNv}
379379
Nf = typesize(eltype(A), Eltype)
380-
_size = (newNv, )
380+
_size = (newNv,)
381381
as = ArraySize{field_dim(VF), Nf, _size}()
382382
fa = similar(rebuild_field_array_type(A, as), _size)
383383
return VF{Eltype, newNv, typeof(fa)}(fa)

0 commit comments

Comments
 (0)