From 08f181ed90d57cbfec89fe15512b0752a3d4f4ea Mon Sep 17 00:00:00 2001
From: "Steven G. Johnson" <stevenj@mit.edu>
Date: Wed, 21 Dec 2016 12:25:05 -0500
Subject: [PATCH 1/2] remove performance workaround using broadcast_elwise_op
 in Diagonal that should be no longer needed

---
 base/linalg/diagonal.jl | 10 +++++-----
 base/linalg/linalg.jl   |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/base/linalg/diagonal.jl b/base/linalg/diagonal.jl
index 08704d1c2265c..af5fb572ffd5b 100644
--- a/base/linalg/diagonal.jl
+++ b/base/linalg/diagonal.jl
@@ -141,8 +141,8 @@ end
 *{T<:Number}(x::T, D::Diagonal) = Diagonal(x * D.diag)
 *{T<:Number}(D::Diagonal, x::T) = Diagonal(D.diag * x)
 /{T<:Number}(D::Diagonal, x::T) = Diagonal(D.diag / x)
-*(Da::Diagonal, Db::Diagonal) = Diagonal(broadcast_elwise_op(*, Da.diag, Db.diag))
-*(D::Diagonal, V::AbstractVector) = broadcast_elwise_op(*, D.diag, V)
+*(Da::Diagonal, Db::Diagonal) = Diagonal(Da.diag .* Db.diag)
+*(D::Diagonal, V::AbstractVector) = D.diag .* V
 
 (*)(A::AbstractTriangular, D::Diagonal) = A_mul_B!(copy(A), D)
 (*)(D::Diagonal, B::AbstractTriangular) = A_mul_B!(D, copy(B))
@@ -223,7 +223,7 @@ A_mul_B!(A::AbstractMatrix,B::Diagonal)  = scale!(A,B.diag)
 A_mul_Bt!(A::AbstractMatrix,B::Diagonal) = scale!(A,B.diag)
 A_mul_Bc!(A::AbstractMatrix,B::Diagonal) = scale!(A,conj(B.diag))
 
-/(Da::Diagonal, Db::Diagonal) = Diagonal(broadcast_elwise_op(/, Da.diag, Db.diag))
+/(Da::Diagonal, Db::Diagonal) = Diagonal(Da.diag ./ Db.diag)
 function A_ldiv_B!{T}(D::Diagonal{T}, v::AbstractVector{T})
     if length(v) != length(D.diag)
         throw(DimensionMismatch("diagonal matrix is $(length(D.diag)) by $(length(D.diag)) but right hand side has $(length(v)) rows"))
@@ -292,8 +292,8 @@ function A_ldiv_B!(D::Diagonal, B::StridedVecOrMat)
     return B
 end
 (\)(D::Diagonal, A::AbstractMatrix) = D.diag .\ A
-(\)(D::Diagonal, b::AbstractVector) = broadcast_elwise_op(\, D.diag, b)
-(\)(Da::Diagonal, Db::Diagonal) = Diagonal(broadcast_elwise_op(\, Da.diag, Db.diag))
+(\)(D::Diagonal, b::AbstractVector) = D.diag, .\ b
+(\)(Da::Diagonal, Db::Diagonal) = Diagonal(Da.diag .\ Db.diag)
 
 function inv{T}(D::Diagonal{T})
     Di = similar(D.diag, typeof(inv(zero(T))))
diff --git a/base/linalg/linalg.jl b/base/linalg/linalg.jl
index 65b1d2249180f..2fc634e64e559 100644
--- a/base/linalg/linalg.jl
+++ b/base/linalg/linalg.jl
@@ -13,7 +13,6 @@ import Base: USE_BLAS64, abs, big, ceil, conj, convert, copy, copy!, copy_transp
 using Base: promote_op, _length, iszero
 # We use `_length` because of non-1 indices; releases after julia 0.5
 # can go back to `length`. `_length(A)` is equivalent to `length(linearindices(A))`.
-using Base.Broadcast: broadcast_elwise_op
 
 export
 # Modules

From f2ebd763859b33ce28e174eb0112bf5781ea13c2 Mon Sep 17 00:00:00 2001
From: "Steven G. Johnson" <stevenj@mit.edu>
Date: Wed, 21 Dec 2016 12:31:25 -0500
Subject: [PATCH 2/2] typo

---
 base/linalg/diagonal.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/linalg/diagonal.jl b/base/linalg/diagonal.jl
index af5fb572ffd5b..cf81a2206a85b 100644
--- a/base/linalg/diagonal.jl
+++ b/base/linalg/diagonal.jl
@@ -292,7 +292,7 @@ function A_ldiv_B!(D::Diagonal, B::StridedVecOrMat)
     return B
 end
 (\)(D::Diagonal, A::AbstractMatrix) = D.diag .\ A
-(\)(D::Diagonal, b::AbstractVector) = D.diag, .\ b
+(\)(D::Diagonal, b::AbstractVector) = D.diag .\ b
 (\)(Da::Diagonal, Db::Diagonal) = Diagonal(Da.diag .\ Db.diag)
 
 function inv{T}(D::Diagonal{T})