diff --git a/Project.toml b/Project.toml index ac3624d..c4a4bde 100644 --- a/Project.toml +++ b/Project.toml @@ -1,14 +1,16 @@ name = "ArrayLayouts" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" authors = ["Sheehan Olver "] -version = "0.4.7" +version = "0.4.8" [deps] +Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [compat] +Compat = "3.16" FillArrays = "0.9.1" julia = "1" diff --git a/src/ArrayLayouts.jl b/src/ArrayLayouts.jl index d569b68..2ba98f1 100644 --- a/src/ArrayLayouts.jl +++ b/src/ArrayLayouts.jl @@ -1,5 +1,5 @@ module ArrayLayouts -using Base, Base.Broadcast, LinearAlgebra, FillArrays, SparseArrays +using Base, Base.Broadcast, LinearAlgebra, FillArrays, SparseArrays, Compat import LinearAlgebra.BLAS import Base: AbstractArray, AbstractMatrix, AbstractVector, @@ -83,10 +83,6 @@ struct ConjPtr{T} ptr::Ptr{T} end -if VERSION < v"1.5-" - unsafe_convert(::Type{Ptr{T}}, A::Adjoint{<:Real}) where T<:Real = unsafe_convert(Ptr{T}, parent(A)) - unsafe_convert(::Type{Ptr{T}}, A::Transpose) where T = unsafe_convert(Ptr{T}, parent(A)) -end # work-around issue with complex conjugation of pointer unsafe_convert(::Type{Ptr{T}}, Ac::Adjoint{<:Complex}) where T<:Complex = unsafe_convert(ConjPtr{T}, parent(Ac)) diff --git a/test/test_muladd.jl b/test/test_muladd.jl index 0421547..4388561 100644 --- a/test/test_muladd.jl +++ b/test/test_muladd.jl @@ -1,8 +1,15 @@ using ArrayLayouts, FillArrays, Random, Test -import ArrayLayouts: DenseColumnMajor, AbstractStridedLayout, AbstractColumnMajor, DiagonalLayout, mul, Mul +import ArrayLayouts: DenseColumnMajor, AbstractStridedLayout, AbstractColumnMajor, DiagonalLayout, mul, Mul, zero! Random.seed!(0) @testset "Multiplication" begin + @testset "zero!" begin + for A in (randn(5,5), [randn(5,5),randn(4,4)]) + zero!(A) + @test iszero(A) + end + end + @testset "Matrix * Vector" begin @testset "eltype" begin v = MulAdd(1,zeros(Int,2,2), zeros(Float64,2),0,zeros(2))