Skip to content
Merged
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
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "DiagonalArrays"
uuid = "74fd4be6-21e2-4f6f-823a-4360d37c7a77"
authors = ["ITensor developers <support@itensor.org> and contributors"]
version = "0.2.5"
version = "0.2.6"

[deps]
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
Expand All @@ -15,5 +15,5 @@ ArrayLayouts = "1.10.4"
DerivableInterfaces = "0.3.7"
FillArrays = "1.13.0"
LinearAlgebra = "1.10.0"
SparseArraysBase = "0.2.1, 0.3"
SparseArraysBase = "0.4"
julia = "1.10"
1 change: 0 additions & 1 deletion src/DiagonalArrays.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module DiagonalArrays

include("diaginterface/defaults.jl")
include("diaginterface/diaginterface.jl")
include("diaginterface/diagindex.jl")
include("diaginterface/diagindices.jl")
Expand Down
1 change: 0 additions & 1 deletion src/diaginterface/defaults.jl

This file was deleted.

22 changes: 10 additions & 12 deletions src/diagonalarray/diagonalarray.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using SparseArraysBase: SparseArraysBase, SparseArrayDOK, default_getunstoredindex ## , Zero, getindex_zero_function
function getzero(a::AbstractArray{<:Any,N}, I::Vararg{Int,N}) where {N}
return zero(eltype(a))

Check warning on line 2 in src/diagonalarray/diagonalarray.jl

View check run for this annotation

Codecov / codecov/patch

src/diagonalarray/diagonalarray.jl#L1-L2

Added lines #L1 - L2 were not covered by tests
end

struct DiagonalArray{T,N,Diag<:AbstractVector{T},F} <: AbstractDiagonalArray{T,N}
diag::Diag
Expand All @@ -7,15 +9,13 @@
end

function DiagonalArray{T,N}(
diag::AbstractVector{T},
d::Tuple{Vararg{Int,N}},
getunstoredindex=default_getunstoredindex,
diag::AbstractVector{T}, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
) where {T,N}
return DiagonalArray{T,N,typeof(diag),typeof(getunstoredindex)}(diag, d, getunstoredindex)
end

function DiagonalArray{T,N}(
diag::AbstractVector, d::Tuple{Vararg{Int,N}}, getunstoredindex=default_getunstoredindex
diag::AbstractVector, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
) where {T,N}
return DiagonalArray{T,N}(T.(diag), d, getunstoredindex)
end
Expand All @@ -25,7 +25,7 @@
end

function DiagonalArray{T}(
diag::AbstractVector, d::Tuple{Vararg{Int,N}}, getunstoredindex=default_getunstoredindex
diag::AbstractVector, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
) where {T,N}
return DiagonalArray{T,N}(diag, d, getunstoredindex)
end
Expand All @@ -44,7 +44,7 @@

# Infer size from diagonal
function DiagonalArray{T,N}(diag::AbstractVector) where {T,N}
return DiagonalArray{T,N}(diag, default_size(diag, N))
return DiagonalArray{T,N}(diag, ntuple(Returns(length(diag)), N))
end

function DiagonalArray{<:Any,N}(diag::AbstractVector{T}) where {T,N}
Expand All @@ -53,7 +53,7 @@

# undef
function DiagonalArray{T,N}(
::UndefInitializer, d::Tuple{Vararg{Int,N}}, getunstoredindex=default_getunstoredindex
::UndefInitializer, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
) where {T,N}
return DiagonalArray{T,N}(Vector{T}(undef, minimum(d)), d, getunstoredindex)
end
Expand All @@ -63,16 +63,14 @@
end

function DiagonalArray{T}(
::UndefInitializer, d::Tuple{Vararg{Int,N}}, getunstoredindex=default_getunstoredindex
::UndefInitializer, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
) where {T,N}
return DiagonalArray{T,N}(undef, d, getunstoredindex)
end

# Axes version
function DiagonalArray{T}(
::UndefInitializer,
axes::Tuple{Vararg{AbstractUnitRange,N}},
getunstoredindex=default_getunstoredindex,
::UndefInitializer, axes::Tuple{Vararg{AbstractUnitRange,N}}, getunstoredindex=getzero
) where {T,N}
@assert all(isone, first.(axes))
return DiagonalArray{T,N}(undef, length.(axes), getunstoredindex)
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ DiagonalArrays = "0.2"
FillArrays = "1"
LinearAlgebra = "1"
SafeTestsets = "0.1"
SparseArraysBase = "0.3"
SparseArraysBase = "0.4"
Suppressor = "0.2"
Test = "1"
Loading