From 620ceecaed535641032f60fa5f854c1cc84c25c8 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 21 May 2020 00:41:25 +0200 Subject: [PATCH 1/2] Make mul! less likely to cause ambiguity errors --- src/linalg.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/linalg.jl b/src/linalg.jl index f597a01..1c04997 100644 --- a/src/linalg.jl +++ b/src/linalg.jl @@ -260,8 +260,8 @@ function _matmatmul!(C::DMatrix, A::DMatrix, B::AbstractMatrix, α::Number, β:: end LinearAlgebra.mul!(C::DMatrix, A::DMatrix, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, A, B, α, β, 'N') -LinearAlgebra.mul!(C::DMatrix, A::Adjoint{<:Number,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'C') -LinearAlgebra.mul!(C::DMatrix, A::Transpose{<:Number,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'T') +LinearAlgebra.mul!(C::DMatrix, A::Adjoint{<:Any,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'C') +LinearAlgebra.mul!(C::DMatrix, A::Transpose{<:Any,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'T') _matmul_op = (t,s) -> t*s + t*s From 40439bc6cd1e6d13dd8f1e1382353537dc0d1b34 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 21 May 2020 00:43:00 +0200 Subject: [PATCH 2/2] Bump version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index b1f2f4c..3fcc132 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "DistributedArrays" uuid = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94" -version = "0.6.5" +version = "0.6.6" [deps] Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"