Skip to content

Commit ccd35c2

Browse files
github-actions[bot]CompatHelper Juliamtfishman
authored
CompatHelper: bump compat for SparseArraysBase to 0.4, (keep existing compat) (#15)
* CompatHelper: bump compat for SparseArraysBase to 0.4, (keep existing compat) --------- Co-authored-by: CompatHelper Julia <[email protected]> Co-authored-by: mtfishman <[email protected]>
1 parent 3eb3a17 commit ccd35c2

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "DiagonalArrays"
22
uuid = "74fd4be6-21e2-4f6f-823a-4360d37c7a77"
33
authors = ["ITensor developers <[email protected]> and contributors"]
4-
version = "0.2.5"
4+
version = "0.2.6"
55

66
[deps]
77
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -15,5 +15,5 @@ ArrayLayouts = "1.10.4"
1515
DerivableInterfaces = "0.3.7"
1616
FillArrays = "1.13.0"
1717
LinearAlgebra = "1.10.0"
18-
SparseArraysBase = "0.2.1, 0.3"
18+
SparseArraysBase = "0.4"
1919
julia = "1.10"

src/DiagonalArrays.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module DiagonalArrays
22

3-
include("diaginterface/defaults.jl")
43
include("diaginterface/diaginterface.jl")
54
include("diaginterface/diagindex.jl")
65
include("diaginterface/diagindices.jl")

src/diaginterface/defaults.jl

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/diagonalarray/diagonalarray.jl

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using SparseArraysBase: SparseArraysBase, SparseArrayDOK, default_getunstoredindex ## , Zero, getindex_zero_function
1+
function getzero(a::AbstractArray{<:Any,N}, I::Vararg{Int,N}) where {N}
2+
return zero(eltype(a))
3+
end
24

35
struct DiagonalArray{T,N,Diag<:AbstractVector{T},F} <: AbstractDiagonalArray{T,N}
46
diag::Diag
@@ -7,15 +9,13 @@ struct DiagonalArray{T,N,Diag<:AbstractVector{T},F} <: AbstractDiagonalArray{T,N
79
end
810

911
function DiagonalArray{T,N}(
10-
diag::AbstractVector{T},
11-
d::Tuple{Vararg{Int,N}},
12-
getunstoredindex=default_getunstoredindex,
12+
diag::AbstractVector{T}, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
1313
) where {T,N}
1414
return DiagonalArray{T,N,typeof(diag),typeof(getunstoredindex)}(diag, d, getunstoredindex)
1515
end
1616

1717
function DiagonalArray{T,N}(
18-
diag::AbstractVector, d::Tuple{Vararg{Int,N}}, getunstoredindex=default_getunstoredindex
18+
diag::AbstractVector, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
1919
) where {T,N}
2020
return DiagonalArray{T,N}(T.(diag), d, getunstoredindex)
2121
end
@@ -25,7 +25,7 @@ function DiagonalArray{T,N}(diag::AbstractVector, d::Vararg{Int,N}) where {T,N}
2525
end
2626

2727
function DiagonalArray{T}(
28-
diag::AbstractVector, d::Tuple{Vararg{Int,N}}, getunstoredindex=default_getunstoredindex
28+
diag::AbstractVector, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
2929
) where {T,N}
3030
return DiagonalArray{T,N}(diag, d, getunstoredindex)
3131
end
@@ -44,7 +44,7 @@ end
4444

4545
# Infer size from diagonal
4646
function DiagonalArray{T,N}(diag::AbstractVector) where {T,N}
47-
return DiagonalArray{T,N}(diag, default_size(diag, N))
47+
return DiagonalArray{T,N}(diag, ntuple(Returns(length(diag)), N))
4848
end
4949

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

5454
# undef
5555
function DiagonalArray{T,N}(
56-
::UndefInitializer, d::Tuple{Vararg{Int,N}}, getunstoredindex=default_getunstoredindex
56+
::UndefInitializer, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
5757
) where {T,N}
5858
return DiagonalArray{T,N}(Vector{T}(undef, minimum(d)), d, getunstoredindex)
5959
end
@@ -63,16 +63,14 @@ function DiagonalArray{T,N}(::UndefInitializer, d::Vararg{Int,N}) where {T,N}
6363
end
6464

6565
function DiagonalArray{T}(
66-
::UndefInitializer, d::Tuple{Vararg{Int,N}}, getunstoredindex=default_getunstoredindex
66+
::UndefInitializer, d::Tuple{Vararg{Int,N}}, getunstoredindex=getzero
6767
) where {T,N}
6868
return DiagonalArray{T,N}(undef, d, getunstoredindex)
6969
end
7070

7171
# Axes version
7272
function DiagonalArray{T}(
73-
::UndefInitializer,
74-
axes::Tuple{Vararg{AbstractUnitRange,N}},
75-
getunstoredindex=default_getunstoredindex,
73+
::UndefInitializer, axes::Tuple{Vararg{AbstractUnitRange,N}}, getunstoredindex=getzero
7674
) where {T,N}
7775
@assert all(isone, first.(axes))
7876
return DiagonalArray{T,N}(undef, length.(axes), getunstoredindex)

test/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ DiagonalArrays = "0.2"
1414
FillArrays = "1"
1515
LinearAlgebra = "1"
1616
SafeTestsets = "0.1"
17-
SparseArraysBase = "0.3"
17+
SparseArraysBase = "0.4"
1818
Suppressor = "0.2"
1919
Test = "1"

0 commit comments

Comments
 (0)