Skip to content

Commit 0e0e6bf

Browse files
mbaumanmbauman
authored
Merge pull request #42 from rened/j7
fixes for 0.7
2 parents a29db30 + 896c6e1 commit 0e0e6bf

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

‎src/OffsetArrays.jl

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,45 +27,45 @@ OffsetArray(A::AbstractArray{T,N}, offsets::NTuple{N,Int}) where {T,N} =
2727
OffsetArray(A::AbstractArray{T,N}, offsets::Vararg{Int,N}) where {T,N} =
2828
OffsetArray(A, offsets)
2929

30-
OffsetArray{T,N}(::Uninitialized, inds::Indices{N}) where {T,N} =
31-
OffsetArray{T,N,Array{T,N}}(Array{T,N}(uninitialized, map(length, inds)), map(indexoffset, inds))
32-
OffsetArray{T}(::Uninitialized, inds::Indices{N}) where {T,N} = OffsetArray{T,N}(uninitialized, inds)
33-
OffsetArray{T,N}(::Uninitialized, inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T,N}(uninitialized, inds)
34-
OffsetArray{T}(::Uninitialized, inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T,N}(uninitialized, inds)
30+
OffsetArray{T,N}(::UndefInitializer, inds::Indices{N}) where {T,N} =
31+
OffsetArray{T,N,Array{T,N}}(Array{T,N}(undef, map(length, inds)), map(indexoffset, inds))
32+
OffsetArray{T}(::UndefInitializer, inds::Indices{N}) where {T,N} = OffsetArray{T,N}(undef, inds)
33+
OffsetArray{T,N}(::UndefInitializer, inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T,N}(undef, inds)
34+
OffsetArray{T}(::UndefInitializer, inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T,N}(undef, inds)
3535
OffsetArray(A::AbstractArray{T,0}) where {T} = OffsetArray{T,0,typeof(A)}(A, ())
3636

3737
# OffsetVector constructors
3838
OffsetVector(A::AbstractVector, offset) = OffsetArray(A, offset)
39-
OffsetVector{T}(::Uninitialized, inds::AbstractUnitRange) where {T} = OffsetArray{T}(uninitialized, inds)
39+
OffsetVector{T}(::UndefInitializer, inds::AbstractUnitRange) where {T} = OffsetArray{T}(undef, inds)
4040

4141
# deprecated constructors
4242
using Base: @deprecate
4343

4444
# https://github.com/JuliaLang/julia/pull/19989
45-
@static if isdefined(Base, :Uninitialized)
46-
@deprecate OffsetArray(::Type{T}, inds::Vararg{UnitRange{Int},N}) where {T,N} OffsetArray{T}(uninitialized, inds)
47-
@deprecate OffsetVector(::Type{T}, inds::AbstractUnitRange) where {T} OffsetVector{T}(uninitialized, inds)
45+
@static if isdefined(Base, :UndefInitializer)
46+
@deprecate OffsetArray(::Type{T}, inds::Vararg{UnitRange{Int},N}) where {T,N} OffsetArray{T}(undef, inds)
47+
@deprecate OffsetVector(::Type{T}, inds::AbstractUnitRange) where {T} OffsetVector{T}(undef, inds)
4848
else
4949
OffsetArray(::Type{T}, inds::Vararg{UnitRange{Int},N}) where {T,N} = OffsetArray{T}(inds)
5050
OffsetVector(::Type{T}, inds::AbstractUnitRange) where {T} = OffsetVector{T}(inds)
5151
end
5252

5353
# https://github.com/JuliaLang/julia/pull/24652
54-
# Only activate deprecation if `uninitialized` is available from Base;
55-
# should not rely on the user having `uninitialized` available from Compat
56-
# and OffsetArrays.jl should probably not re-export Compat.uninitialized
57-
@static if isdefined(Base, :Uninitialized)
58-
@deprecate OffsetArray{T,N}(inds::Indices{N}) where {T,N} OffsetArray{T,N}(uninitialized, inds)
59-
@deprecate OffsetArray{T}(inds::Indices{N}) where {T,N} OffsetArray{T}(uninitialized, inds)
60-
@deprecate OffsetArray{T,N}(inds::Vararg{AbstractUnitRange,N}) where {T,N} OffsetArray{T,N}(uninitialized, inds)
61-
@deprecate OffsetArray{T}(inds::Vararg{AbstractUnitRange,N}) where {T,N} OffsetArray{T}(uninitialized, inds)
62-
@deprecate OffsetVector{T}(inds::AbstractUnitRange) where {T} OffsetVector{T}(uninitialized, inds)
54+
# Only activate deprecation if `undef` is available from Base;
55+
# should not rely on the user having `undef` available from Compat
56+
# and OffsetArrays.jl should probably not re-export Compat.undef
57+
@static if isdefined(Base, :UndefInitializer)
58+
@deprecate OffsetArray{T,N}(inds::Indices{N}) where {T,N} OffsetArray{T,N}(undef, inds)
59+
@deprecate OffsetArray{T}(inds::Indices{N}) where {T,N} OffsetArray{T}(undef, inds)
60+
@deprecate OffsetArray{T,N}(inds::Vararg{AbstractUnitRange,N}) where {T,N} OffsetArray{T,N}(undef, inds)
61+
@deprecate OffsetArray{T}(inds::Vararg{AbstractUnitRange,N}) where {T,N} OffsetArray{T}(undef, inds)
62+
@deprecate OffsetVector{T}(inds::AbstractUnitRange) where {T} OffsetVector{T}(undef, inds)
6363
else
64-
OffsetArray{T,N}(inds::Indices{N}) where {T,N} = OffsetArray{T,N}(uninitialized, inds)
65-
OffsetArray{T}(inds::Indices{N}) where {T,N} = OffsetArray{T}(uninitialized, inds)
66-
OffsetArray{T,N}(inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T,N}(uninitialized, inds)
67-
OffsetArray{T}(inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T}(uninitialized, inds)
68-
OffsetVector{T}(inds::AbstractUnitRange) where {T} = OffsetVector{T}(uninitialized, inds)
64+
OffsetArray{T,N}(inds::Indices{N}) where {T,N} = OffsetArray{T,N}(undef, inds)
65+
OffsetArray{T}(inds::Indices{N}) where {T,N} = OffsetArray{T}(undef, inds)
66+
OffsetArray{T,N}(inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T,N}(undef, inds)
67+
OffsetArray{T}(inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T}(undef, inds)
68+
OffsetVector{T}(inds::AbstractUnitRange) where {T} = OffsetVector{T}(undef, inds)
6969
end
7070

7171

@@ -119,9 +119,9 @@ Base.similar(f::Function, shape::Tuple{UnitRange,Vararg{UnitRange}}) =
119119
Base.similar(::Type{T}, shape::Tuple{UnitRange,Vararg{UnitRange}}) where {T<:OffsetArray} =
120120
OffsetArray(T(map(length, shape)), map(indexoffset, shape))
121121
Base.similar(::Type{T}, shape::Tuple{UnitRange,Vararg{UnitRange}}) where {T<:Array} =
122-
OffsetArray(T(uninitialized, map(length, shape)), map(indexoffset, shape))
122+
OffsetArray(T(undef, map(length, shape)), map(indexoffset, shape))
123123
Base.similar(::Type{T}, shape::Tuple{UnitRange,Vararg{UnitRange}}) where {T<:BitArray} =
124-
OffsetArray(T(uninitialized, map(length, shape)), map(indexoffset, shape))
124+
OffsetArray(T(undef, map(length, shape)), map(indexoffset, shape))
125125

126126
Base.reshape(A::AbstractArray, inds::Tuple{UnitRange,Vararg{UnitRange}}) =
127127
OffsetArray(reshape(A, map(length, inds)), map(indexoffset, inds))
@@ -168,7 +168,7 @@ end
168168
### Convenience functions ###
169169

170170
Base.fill(x, inds::Tuple{UnitRange,Vararg{UnitRange}}) =
171-
fill!(OffsetArray{typeof(x)}(uninitialized, inds), x)
171+
fill!(OffsetArray{typeof(x)}(undef, inds), x)
172172
@inline Base.fill(x, ind1::UnitRange, inds::UnitRange...) = fill(x, (ind1, inds...))
173173

174174
### Low-level utilities ###

‎test/runtests.jl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ using Compat.DelimitedFiles
99
# Basics
1010
for n = 0:5
1111
for a in (OffsetArray(ones(Int,ntuple(d->1,n)), ntuple(x->x-1,n)),
12-
fill!(OffsetArray{Float64}(uninitialized, ntuple(x->x:x, n)), 1),
13-
fill!(OffsetArray{Float64}(uninitialized, ntuple(x->x:x, n)...), 1),
14-
fill!(OffsetArray{Float64,n}(uninitialized, ntuple(x->x:x, n)), 1),
15-
fill!(OffsetArray{Float64,n}(uninitialized, ntuple(x->x:x, n)...), 1))
12+
fill!(OffsetArray{Float64}(undef, ntuple(x->x:x, n)), 1),
13+
fill!(OffsetArray{Float64}(undef, ntuple(x->x:x, n)...), 1),
14+
fill!(OffsetArray{Float64,n}(undef, ntuple(x->x:x, n)), 1),
15+
fill!(OffsetArray{Float64,n}(undef, ntuple(x->x:x, n)...), 1))
1616
@test length(linearindices(a)) == 1
1717
@test axes(a) == ntuple(x->x:x, n)
1818
@test a[1] == 1
@@ -24,7 +24,7 @@ a = OffsetArray(a0)
2424
@test ndims(a) == 0
2525
@test a[] == 3
2626

27-
y = OffsetArray{Float64}(uninitialized, -1:1, -7:7, -128:512, -5:5, -1:1, -3:3, -2:2, -1:1)
27+
y = OffsetArray{Float64}(undef, -1:1, -7:7, -128:512, -5:5, -1:1, -3:3, -2:2, -1:1)
2828
@test axes(y) == (-1:1, -7:7, -128:512, -5:5, -1:1, -3:3, -2:2, -1:1)
2929
y[-1,-7,-128,-5,-1,-3,-2,-1] = 14
3030
y[-1,-7,-128,-5,-1,-3,-2,-1] += 5
@@ -210,7 +210,7 @@ v = view(A0, 1:1, i1)
210210
@test A[A .> 2] == [3,4]
211211

212212
# copyto!
213-
a = OffsetArray{Int}(uninitialized, (-3:-1,))
213+
a = OffsetArray{Int}(undef, (-3:-1,))
214214
fill!(a, -1)
215215
copyto!(a, (1,2)) # non-array iterables
216216
@test a[-3] == 1
@@ -254,7 +254,7 @@ copyto!(a, -3, b, 2)
254254
@test a[-3] == 2
255255
@test a[-2] == a[-1] == -1
256256
@test_throws BoundsError copyto!(a, -3, b, 1, 4)
257-
am = OffsetArray{Int}(uninitialized, (1:1, 7:9)) # for testing linear indexing
257+
am = OffsetArray{Int}(undef, (1:1, 7:9)) # for testing linear indexing
258258
fill!(am, -1)
259259
copyto!(am, b)
260260
@test am[1] == 1
@@ -275,17 +275,17 @@ A = OffsetArray(rand(4,4), (-3,5))
275275
@test minimum(A) == minimum(parent(A))
276276
@test extrema(A) == extrema(parent(A))
277277
C = similar(A)
278-
cumsum!(C, A, 1)
279-
@test parent(C) == cumsum(parent(A), 1)
280-
@test parent(cumsum(A, 1)) == cumsum(parent(A), 1)
281-
cumsum!(C, A, 2)
282-
@test parent(C) == cumsum(parent(A), 2)
278+
Compat.cumsum!(C, A, dims = 1)
279+
@test parent(C) == Compat.cumsum(parent(A), dims = 1)
280+
@test parent(Compat.cumsum(A, dims = 1)) == Compat.cumsum(parent(A), dims = 1)
281+
Compat.cumsum!(C, A, dims = 2)
282+
@test parent(C) == Compat.cumsum(parent(A), dims = 2)
283283
R = similar(A, (1:1, 6:9))
284284
maximum!(R, A)
285-
@test parent(R) == maximum(parent(A), 1)
285+
@test parent(R) == Compat.maximum(parent(A), dims = 1)
286286
R = similar(A, (-2:1, 1:1))
287287
maximum!(R, A)
288-
@test parent(R) == maximum(parent(A), 2)
288+
@test parent(R) == Compat.maximum(parent(A), dims = 2)
289289
amin, iamin = findmin(A)
290290
pmin, ipmin = findmin(parent(A))
291291
@test amin == pmin
@@ -320,16 +320,16 @@ v = OffsetArray(rand(8), (-2,))
320320
@test sort(v) == OffsetArray(sort(parent(v)), v.offsets)
321321
@test sortrows(A) == OffsetArray(sortrows(parent(A)), A.offsets)
322322
@test sortcols(A) == OffsetArray(sortcols(parent(A)), A.offsets)
323-
@test sort(A, 1) == OffsetArray(sort(parent(A), 1), A.offsets)
324-
@test sort(A, 2) == OffsetArray(sort(parent(A), 2), A.offsets)
323+
@test Compat.sort(A, dims = 1) == OffsetArray(Compat.sort(parent(A), dims = 1), A.offsets)
324+
@test Compat.sort(A, dims = 2) == OffsetArray(Compat.sort(parent(A), dims = 2), A.offsets)
325325

326326
@test mapslices(v->sort(v), A, 1) == OffsetArray(mapslices(v->sort(v), parent(A), 1), A.offsets)
327327
@test mapslices(v->sort(v), A, 2) == OffsetArray(mapslices(v->sort(v), parent(A), 2), A.offsets)
328328

329329
@test rotl90(A) == OffsetArray(rotl90(parent(A)), A.offsets[[2,1]])
330330
@test rotr90(A) == OffsetArray(rotr90(parent(A)), A.offsets[[2,1]])
331-
@test flipdim(A, 1) == OffsetArray(flipdim(parent(A), 1), A.offsets)
332-
@test flipdim(A, 2) == OffsetArray(flipdim(parent(A), 2), A.offsets)
331+
@test Compat.reverse(A, dims = 1) == OffsetArray(Compat.reverse(parent(A), dims = 1), A.offsets)
332+
@test Compat.reverse(A, dims = 2) == OffsetArray(Compat.reverse(parent(A), dims = 2), A.offsets)
333333

334334
@test A.+1 == OffsetArray(parent(A).+1, A.offsets)
335335
@test 2*A == OffsetArray(2*parent(A), A.offsets)
@@ -368,5 +368,5 @@ end
368368
local v = rand(5)
369369
@test OffsetVector(v, -2) == OffsetArray(v, -2)
370370
@test OffsetVector(v, -2:2) == OffsetArray(v, -2:2)
371-
@test typeof(OffsetVector{Float64}(uninitialized, -2:2)) == typeof(OffsetArray{Float64}(uninitialized, -2:2))
371+
@test typeof(OffsetVector{Float64}(undef, -2:2)) == typeof(OffsetArray{Float64}(undef, -2:2))
372372
end

0 commit comments

Comments
 (0)