Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/SparseArrayKit.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ using TupleTools

export SparseArray
export nonzero_pairs, nonzero_keys, nonzero_values, nonzero_length
export reindexdims, reindexdims!

include("sparsearray.jl")
include("base.jl")
Expand Down
24 changes: 24 additions & 0 deletions src/base.jl
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,27 @@ function Base.reshape(parent::SparseArray{T}, dims::Dims) where {T}
end
return child
end

@doc """
reindexdims(A, p)
reindexdims!(C, A, p)

Reindex the dimensions (axes) of array `A`. `p` is a tuple of integers specifying which indices are selected.
This is similar to `permutedims(!)`, but also allows both repeated and omitted integers.
The former boils down to a broadcasting along the diagonal, i.e. `C[i, i, j, k, ...] = A[i, j, k, ...]`,
while the latter signifies a reduction over the omitted index, i.e. `C[j, k, ...] = ∑_i A[i, j, k, ...]`.
""" reindexdims, reindexdims!

function reindexdims(A::SparseArray, p::IndexTuple)
C = similar(A, TupleTools.getindices(size(A), p))
return reindexdims!(C, A, p)
end
function reindexdims!(C::SparseArray{T, N}, A::SparseArray, p::IndexTuple{N}) where {T, N}
_zero!(C)
_sizehint!(C, nonzero_length(A))
for (IA, vA) in nonzero_pairs(A)
IC = CartesianIndex(TupleTools.getindices(IA.I, p))
increaseindex!(C, vA, IC)
end
return C
end
17 changes: 17 additions & 0 deletions test/basic.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module BasicTests

using SparseArrayKit
using Test, TestExtras, LinearAlgebra, Random
using TupleTools

#=
generate a whole bunch of random contractions, compare with the dense result
Expand Down Expand Up @@ -96,4 +98,19 @@ end
@test size(SparseArray(I, 3, 8)) == (3, 8)
end

@timedtestset "Index manipulations" begin
dims = (2, 3, 4)
A = randn_sparse(Float64, dims)
@test @constinferred(reindexdims(A, (2, 1, 3))) == permutedims(A, (2, 1, 3))

A_expanded = @constinferred reindexdims(A, (1, 1, 2, 3))
@test size(A_expanded) == TupleTools.getindices(size(A), (1, 1, 2, 3))
@test norm(A_expanded) ≈ norm(A)
@test reindexdims(A_expanded, (1, 3, 4)) == A

A_reduced = @constinferred reindexdims(A, (1, 2))
@test size(A_reduced) == TupleTools.getindices(size(A), (1, 2))
@test Array(A_reduced) ≈ sum(Array(A); dims = 3)
end

end
Loading