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
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "SparseArraysBase"
uuid = "0d5efcca-f356-4864-8770-e1ed8d78f208"
authors = ["ITensor developers <support@itensor.org> and contributors"]
version = "0.8.2"
version = "0.8.3"

[deps]
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
Expand Down
7 changes: 7 additions & 0 deletions src/abstractsparsearraystyle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ function FunctionImplementations.Style(
)
return style1
end
# Fix ambiguity error with `Style(::AbstractSparseArrayStyle, ::AbstractArrayStyle)`.
using FunctionImplementations: DefaultArrayStyle
function FunctionImplementations.Style(
style1::AbstractSparseArrayStyle, style2::DefaultArrayStyle
)
return style1
end

to_vec(x) = vec(collect(x))
to_vec(x::AbstractArray) = vec(x)
Expand Down
12 changes: 10 additions & 2 deletions test/test_sparse_style.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using FunctionImplementations: Style, style
using SparseArraysBase: AbstractSparseArrayStyle, SparseArrayStyle, sparse_style, sparsezeros
using FunctionImplementations: DefaultArrayStyle, Style, style
using SparseArraysBase: AbstractSparseArrayStyle, SparseArrayStyle, sparse_style,
sparsezeros
using Test: @test, @testset

module TestSparseStyleUtils
Expand All @@ -23,4 +24,11 @@ end
TestSparseStyleUtils.MySparseArrayStyle()
@test style(sparsezeros(2, 2), TestSparseStyleUtils.MySparseArray{Float64, 2}((2, 2))) ≡
SparseArrayStyle()

# Regression tests for ambiguity caused by combining AbstractSparseArrayStyle with
# DefaultArrayStyle.
@test Style(TestSparseStyleUtils.MySparseArrayStyle(), DefaultArrayStyle()) ≡
TestSparseStyleUtils.MySparseArrayStyle()
@test style(TestSparseStyleUtils.MySparseArray{Float64, 2}((2, 2)), randn(2, 2)) ≡
TestSparseStyleUtils.MySparseArrayStyle()
end
Loading