From d0cb9d8169181f4f68210cb68c16b90642d7b46e Mon Sep 17 00:00:00 2001 From: Sheehan Olver Date: Fri, 13 Nov 2026 11:59:43 +0000 Subject: [PATCH] Disambiguate Diagonal{<:LayoutVector} * OffDiagonal, returning an OffDiagonal with FillArrays#465 Co-Authored-By: Claude Opus 5.5 --- Project.toml | 2 +- src/ArrayLayouts.jl | 10 ++++++++++ test/test_layoutarray.jl | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 7b9bea05..cea885ea 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "ArrayLayouts" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.16" +version = "1.16.1" authors = ["Sheehan Olver "] [deps] diff --git a/src/ArrayLayouts.jl b/src/ArrayLayouts.jl index e6eddf0f..8ca716a9 100644 --- a/src/ArrayLayouts.jl +++ b/src/ArrayLayouts.jl @@ -223,6 +223,16 @@ end *(A::Diagonal{<:Any,<:LayoutVector}, B::Diagonal) = mul(A, B) *(A::Diagonal, B::Diagonal{<:Any,<:LayoutVector}) = mul(A, B) +# FillArrays returns an OffDiagonal for products of a Diagonal and an OffDiagonal (FillArrays.jl#465). +# These methods resolve the ambiguity with the methods above, and fall back to mul for versions of FillArrays without it. +@static if isdefined(FillArrays, :_offdiagonal_mul) + *(A::Diagonal{<:Number,<:LayoutVector}, B::OffDiagonal) = FillArrays._offdiagonal_mul(A, B) + *(A::OffDiagonal, B::Diagonal{<:Number,<:LayoutVector}) = FillArrays._offdiagonal_mul(A, B) +else + *(A::Diagonal{<:Number,<:LayoutVector}, B::OffDiagonal) = mul(A, B) + *(A::OffDiagonal, B::Diagonal{<:Number,<:LayoutVector}) = mul(A, B) +end + for Mod in (:Adjoint, :Transpose, :Symmetric, :Hermitian) @eval begin *(A::Diagonal{<:Any,<:LayoutVector}, B::$Mod{<:Any,<:LayoutMatrix}) = mul(A,B) diff --git a/test/test_layoutarray.jl b/test/test_layoutarray.jl index ad34e708..2e0394c1 100644 --- a/test/test_layoutarray.jl +++ b/test/test_layoutarray.jl @@ -340,6 +340,16 @@ BroadcastStyle(::Type{<:MyVector2{T}}) where {T} = MyBroadcastStyle{1}() @test ArrayLayouts.mul(O, Un) ≈ Om * Un O2 = FillArrays.OffDiagonal(randn(max(0,n-1)), 1, n, n) @test ArrayLayouts.mul(O, O2) ≈ Om * Matrix(O2) + if O isa FillArrays.OffDiagonal + # products with a Diagonal of a LayoutVector are not ambiguous + dm, dn = randn(m), randn(n) + @test Diagonal(MyVector(dm)) * O ≈ Diagonal(dm) * Om + @test O * Diagonal(MyVector(dn)) ≈ Om * Diagonal(dn) + if isdefined(FillArrays, :_offdiagonal_mul) + @test Diagonal(MyVector(dm)) * O isa FillArrays.OffDiagonal + @test O * Diagonal(MyVector(dn)) isa FillArrays.OffDiagonal + end + end end @test_throws DimensionMismatch copyto!(zeros(2,2), ArrayLayouts.Lmul(FillArrays.OffDiagonal(randn(2), 1), randn(3,3))) end