@@ -22,7 +22,7 @@ function ConcatDiskArray(arrays::AbstractArray{<:AbstractArray{<:Any,N},M}) wher
22
22
T = mapreduce (eltype, promote_type, init= eltype (first (arrays)), arrays)
23
23
24
24
if N > M
25
- newshape = extenddims (size (arrays), size (first (arrays)),1 )
25
+ newshape = extenddims (size (arrays), size (first (arrays)), 1 )
26
26
arrays1 = reshape (arrays, newshape)
27
27
D = N
28
28
else
@@ -42,17 +42,17 @@ function ConcatDiskArray(arrays::AbstractArray)
42
42
error (" Arrays don't have the same dimensions" )
43
43
return error (" Should not be reached" )
44
44
end
45
- extenddims (a:: Tuple{Vararg{<: Any,N}} , b:: Tuple{Vararg{<: Any,M}} , fillval) where {N,M} = extenddims ((a... , fillval), b, fillval)
46
- extenddims (a:: Tuple{Vararg{<: Any,N}} , _:: Tuple{Vararg{<: Any,N}} , _) where {N} = a
45
+ extenddims (a:: Tuple{Vararg{Any,N}} , b:: Tuple{Vararg{Any,M}} , fillval) where {N,M} = extenddims ((a... , fillval), b, fillval)
46
+ extenddims (a:: Tuple{Vararg{Any,N}} , _:: Tuple{Vararg{Any,N}} , _) where {N} = a
47
47
48
48
Base. size (a:: ConcatDiskArray ) = a. size
49
49
50
50
function arraysize_and_startinds (arrays1)
51
- sizes = map (i-> zeros (Int,i),size (arrays1))
51
+ sizes = map (i -> zeros (Int, i), size (arrays1))
52
52
for i in CartesianIndices (arrays1)
53
53
ai = arrays1[i]
54
54
sizecur = extenddims (size (ai), size (arrays1), 1 )
55
- foreach (sizecur,i. I,sizes) do si, ind, sizeall
55
+ foreach (sizecur, i. I, sizes) do si, ind, sizeall
56
56
if sizeall[ind] == 0
57
57
# init the size
58
58
sizeall[ind] = si
@@ -64,9 +64,9 @@ function arraysize_and_startinds(arrays1)
64
64
r = map (sizes) do sizeall
65
65
pushfirst! (sizeall, 1 )
66
66
for i in 2 : length (sizeall)
67
- sizeall[i] = sizeall[i- 1 ]+ sizeall[i]
67
+ sizeall[i] = sizeall[i- 1 ] + sizeall[i]
68
68
end
69
- pop! (sizeall)- 1 , sizeall
69
+ pop! (sizeall) - 1 , sizeall
70
70
end
71
71
map (last, r), map (first, r)
72
72
end
86
86
function writeblock! (a:: ConcatDiskArray , aout, inds:: AbstractUnitRange... )
87
87
_concat_diskarray_block_io (a, inds... ) do outer_range, array_range, I
88
88
data = view (aout, outer_range... )
89
- writeblock! (a. parents[I], data, array_range)
89
+ writeblock! (a. parents[I], data, array_range... )
90
90
end
91
91
end
92
92
@@ -123,11 +123,11 @@ fix_outerrangeshape(res, ::Tuple{}, ::Tuple{}) = res
123
123
124
124
125
125
function concat_chunksize (parents)
126
- newchunks = map (s-> Vector {Union{RegularChunks, IrregularChunks}} (undef, s) , size (parents))
126
+ newchunks = map (s -> Vector {Union{RegularChunks,IrregularChunks}} (undef, s), size (parents))
127
127
for i in CartesianIndices (parents)
128
128
array = parents[i]
129
129
chunks = eachchunk (array)
130
- foreach (chunks. chunks,i. I,newchunks) do c, ind, newc
130
+ foreach (chunks. chunks, i. I, newchunks) do c, ind, newc
131
131
if ! isassigned (newc, ind)
132
132
newc[ind] = c
133
133
elseif c != newc[ind]
@@ -146,7 +146,7 @@ function concat_chunksize(parents)
146
146
init = RegularChunks (approx_chunksize (first (v)), 0 , 0 )
147
147
reduce (mergechunks, v; init= init)
148
148
end
149
- extenddims (newchunks, size (parents), RegularChunks (1 ,0 , 1 ))
149
+ extenddims (newchunks, size (parents), RegularChunks (1 , 0 , 1 ))
150
150
return GridChunks (newchunks... )
151
151
end
152
152
0 commit comments