Skip to content

fixes and updates for Julia 1.9 #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 12, 2023
Merged

fixes and updates for Julia 1.9 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
522c05b
update uncolon
aplavin Sep 6, 2022
d58f0cb
eachslice with 1.9 semantics
aplavin Sep 6, 2022
47cc2d6
add stack
aplavin Sep 6, 2022
5f4ea56
add TODO
aplavin Oct 18, 2022
6830d6a
fix tests on 1.9
aplavin Oct 18, 2022
bff1056
properly qualify stack
aplavin Oct 18, 2022
20f24ba
remove accidental piracy
aplavin Nov 20, 2022
beb790e
Update src/functions.jl
mcabbott Feb 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/functions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,13 @@ function Base.permutedims(A::KeyedArray, perm)
KeyedArray(data, new_keys)#, copy(A.meta))
end

if VERSION >= v"1.1"
@static if VERSION > v"1.9-DEV"
function Base.eachslice(A::KeyedArray; dims)
dims_ix = AxisKeys.dim(A, dims) |> Tuple
data = @invoke eachslice(A::AbstractArray; dims=dims_ix)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than @invoke, could this just call the next function down? There seems to be an _eachslice which is always called, like so:

@inline function eachslice(A; dims, drop=true)
    _eachslice(A, dims, drop)
end
eachrow(A::AbstractMatrix) = _eachslice(A, (1,), true)
eachcol(A::AbstractMatrix) = _eachslice(A, (2,), true)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of depending on internals, I think either the current @invoke solution or something like eachslice(keyless_unname(A); dims) are cleaner. No preference between the two.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The keyless_unname way may require some processing for inner arrays though.

return KeyedArray(NamedDimsArray(data, map(d -> dimnames(A, d), dims_ix)), map(d -> axiskeys(A, d), dims_ix))
end
elseif VERSION >= v"1.1"
# This copies the implementation from Base, except with numerical_dims:
@inline function Base.eachslice(A::KeyedArray; dims)
Comment on lines +103 to 105
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JuliaLang/Compat.jl#663 still isn't merged, so it makes sense to keep this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I follow. How is Compat related here? This PR only makes changes on 1.9+.

numerical_dims = NamedDims.dim(A, dims)
Expand All @@ -107,6 +113,19 @@ if VERSION >= v"1.1"
end
end

@static if VERSION > v"1.9-DEV"
# TODO: this will ERROR if given dims, instead of falling back to Base
# TODO: ideally it would dispatch on the element type, for e.g. a generator of KeyedArrays
function Base.stack(A::KeyedArray; dims::Colon=:)
data = @invoke stack(A::AbstractArray; dims)
if !allequal(named_axiskeys(a) for a in A)
throw(DimensionMismatch("stack expects uniform axiskeys for all arrays"))
end
akeys = (; named_axiskeys(first(A))..., named_axiskeys(A)...)
KeyedArray(data; akeys...)
end
end

function Base.mapslices(f, A::KeyedArray; dims)
numerical_dims = NamedDims.dim(A, dims)
data = mapslices(f, parent(A); dims=numerical_dims)
Expand Down
10 changes: 8 additions & 2 deletions src/selectors.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,14 @@ end
@inline Base.to_indices(A::Union{KeyedArray,NdaKa}, ax, inds::Tuple{Function, Vararg}) =
select_to_indices(A, ax, inds)

using Base: to_indices, tail, safe_tail, uncolon
using Base: to_indices, tail, safe_tail

if VERSION > v"1.9-DEV"
const uncolon = Base.uncolon
else
uncolon(inds) = Base.uncolon(inds, (:,))
end

@inline Base.to_indices(A::Union{KeyedArray,NdaKa}, inds, I::Tuple{Colon, Vararg{Any}}) =
(uncolon(inds, I), to_indices(A, safe_tail(inds), tail(I))...)
(uncolon(inds), to_indices(A, safe_tail(inds), tail(I))...)

8 changes: 4 additions & 4 deletions src/stack.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using LazyStack
import LazyStack

# for stack_iter
LazyStack.no_wraps(a::KeyedArray) = LazyStack.no_wraps(NamedDims.unname(parent(a)))
Expand All @@ -23,14 +23,14 @@ stack_keys(xs::Tuple{Vararg{KeyedArray}}) =

# array of arrays: first strip off outer containers...
function LazyStack.stack(xs::KeyedArray{<:AbstractArray})
KeyedArray(stack(parent(xs)), stack_keys(xs))
KeyedArray(LazyStack.stack(parent(xs)), stack_keys(xs))
end
function LazyStack.stack(xs::KeyedArray{<:AbstractArray,N,<:NamedDimsArray{L}}) where {L,N}
data = stack(parent(parent(xs)))
data = LazyStack.stack(parent(parent(xs)))
KeyedArray(LazyStack.ensure_named(data, LazyStack.getnames(xs)), stack_keys(xs))
end
function LazyStack.stack(xs::NamedDimsArray{L,<:AbstractArray,N,<:KeyedArray}) where {L,N}
data = stack(parent(parent(xs)))
data = LazyStack.stack(parent(parent(xs)))
LazyStack.ensure_named(KeyedArray(data, stack_keys(xs)), LazyStack.getnames(xs))
end

Expand Down
2 changes: 1 addition & 1 deletion test/_basic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ end
N2 = NamedDimsArray(KeyedArray(data, axiskeys(N1)), dimnames(N1))
N3 = KeyedArray(NamedDimsArray(data, dimnames(N1)), axiskeys(N1))

@testset "with $(typeof(N).name) outside" for N in [N2, N3]
@testset "with $(typeof(N).name) outside" for N in (N2, N3)
@test axiskeys(N) == (['a', 'b', 'c'], 10:10:40)
@test axiskeys(N, :iter) == 10:10:40
@test dimnames(N) == (:obs, :iter)
Expand Down
11 changes: 11 additions & 0 deletions test/_functions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ A3 = wrapdims(rand(Int8, 3,4,2), r='a':'c', c=2:5, p=[10.0, 20.0])
if VERSION >= v"1.1"
@test axiskeys(first(eachslice(M, dims=:r))) === (2:5,)
end
if VERSION >= v"1.9-DEV"
arr = KeyedArray([
KeyedArray([1, 2], a=[:x, :y]),
KeyedArray([3, 4], a=[:x, :y]),
KeyedArray([5, 6], a=[:x, :y]),
], b=10:12)

sk = stack(arr)::KeyedArray
@test sk == [1 3 5; 2 4 6]
@test named_axiskeys(sk) == (a=[:x, :y], b=10:12)
end

@test axiskeys(selectdim(M, :r, [true, false, true])) == (['a', 'c'], 2:5)

Expand Down
20 changes: 10 additions & 10 deletions test/_packages.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,25 +129,25 @@ end
end
end
@testset "stack" begin
using LazyStack
using LazyStack: stack as lstack

rin = [wrapdims(1:3, a='a':'c') for i=1:4]

@test axiskeys(stack(rin), :a) == 'a':'c'
@test axiskeys(stack(:b, rin...), :a) == 'a':'c' # tuple
@test axiskeys(stack(z for z in rin), :a) == 'a':'c' # generator
@test axiskeys(lstack(rin), :a) == 'a':'c'
@test axiskeys(lstack(:b, rin...), :a) == 'a':'c' # tuple
@test axiskeys(lstack(z for z in rin), :a) == 'a':'c' # generator

rout = wrapdims([[1,2], [3,4]], b=10:11)
@test axiskeys(stack(rout), :b) == 10:11
@test axiskeys(lstack(rout), :b) == 10:11

rboth = wrapdims(rin, b=10:13)
@test axiskeys(stack(rboth), :a) == 'a':'c'
@test axiskeys(stack(rboth), :b) == 10:13
@test axiskeys(lstack(rboth), :a) == 'a':'c'
@test axiskeys(lstack(rboth), :b) == 10:13

nts = [(i=i, j="j", k=33) for i=1:3]
@test axiskeys(stack(nts), 1) == [:i, :j, :k]
@test axiskeys(stack(:z, nts...), 1) == [:i, :j, :k]
@test axiskeys(stack(n for n in nts), 1) == [:i, :j, :k]
@test axiskeys(lstack(nts), 1) == [:i, :j, :k]
@test axiskeys(lstack(:z, nts...), 1) == [:i, :j, :k]
@test axiskeys(lstack(n for n in nts), 1) == [:i, :j, :k]

end
@testset "dates" begin
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Test, AxisKeys, NamedDims
using Statistics, OffsetArrays, Tables, UniqueVectors, LazyStack
using Statistics, OffsetArrays, Tables, UniqueVectors
using ChainRulesCore: ProjectTo, NoTangent
using ChainRulesTestUtils: test_rrule
using FiniteDifferences
Expand Down