From 0b5f3cb080349b519787bce192da2fbee6070245 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 18 May 2020 13:00:12 +0200 Subject: [PATCH 1/3] Use mul! from LinearAlgebra instead of a local definition --- src/DistributedArrays.jl | 2 +- src/linalg.jl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DistributedArrays.jl b/src/DistributedArrays.jl index e26e6f5..916cce4 100644 --- a/src/DistributedArrays.jl +++ b/src/DistributedArrays.jl @@ -9,7 +9,7 @@ using Statistics import Base: +, -, *, div, mod, rem, &, |, xor import Base.Callable -import LinearAlgebra: axpy!, dot, norm +import LinearAlgebra: axpy!, dot, norm, mul! import Primes import Primes: factor diff --git a/src/linalg.jl b/src/linalg.jl index 4498aed..f597a01 100644 --- a/src/linalg.jl +++ b/src/linalg.jl @@ -80,7 +80,7 @@ function add!(dest, src, scale = one(dest[1])) return dest end -function mul!(y::DVector, A::DMatrix, x::AbstractVector, α::Number = 1, β::Number = 0) +function LinearAlgebra.mul!(y::DVector, A::DMatrix, x::AbstractVector, α::Number = 1, β::Number = 0) # error checks if size(A, 2) != length(x) @@ -127,7 +127,7 @@ function mul!(y::DVector, A::DMatrix, x::AbstractVector, α::Number = 1, β::Num return y end -function mul!(y::DVector, adjA::Adjoint{<:Number,<:DMatrix}, x::AbstractVector, α::Number = 1, β::Number = 0) +function LinearAlgebra.mul!(y::DVector, adjA::Adjoint{<:Number,<:DMatrix}, x::AbstractVector, α::Number = 1, β::Number = 0) A = parent(adjA) @@ -259,9 +259,9 @@ function _matmatmul!(C::DMatrix, A::DMatrix, B::AbstractMatrix, α::Number, β:: return C end -mul!(C::DMatrix, A::DMatrix, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, A, B, α, β, 'N') -mul!(C::DMatrix, A::Adjoint{<:Number,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'C') -mul!(C::DMatrix, A::Transpose{<:Number,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'T') +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') _matmul_op = (t,s) -> t*s + t*s From 4933784363479ef327fdf45501683dfd680c7ba8 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 18 May 2020 13:38:06 +0200 Subject: [PATCH 2/3] test on latest stable julia --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9d870f7..b54fbf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ julia: - 1.1 - 1.2 - 1.3 + - 1 - nightly matrix: From fde323195bba11f21fb6793d3d86a83d26068541 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 18 May 2020 14:33:35 +0200 Subject: [PATCH 3/3] Bump version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index dc4dd33..37f7e5e 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "DistributedArrays" uuid = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94" -version = "0.6.4" +version = "0.6.5" [deps] Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"