New copyto! (#163)

* Use _copyto! * v0.15.1 * _qr * Update bandedqr.jl
JuliaLinearAlgebra · Apr 1, 2020 · 31d4e67 · 31d4e67 · dlfivefifty · Apr 1, 2020
1 parent 2faf902
commit 31d4e67
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "BandedMatrices"
 uuid = "aae01518-5342-5314-be14-df237901396f"
-version = "0.15"
+version = "0.15.1"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -10,7 +10,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-ArrayLayouts = "0.2"
+ArrayLayouts = "0.2.1"
 FillArrays = "0.8"
 julia = "1"
 

diff --git a/src/BandedMatrices.jl b/src/BandedMatrices.jl
@@ -34,7 +34,8 @@ import ArrayLayouts: MemoryLayout, transposelayout, triangulardata,
                     materialize!, BlasMatMulMatAdd, BlasMatMulVecAdd, BlasMatLmulVec, BlasMatLdivVec,
                     colsupport, rowsupport, symmetricuplo, MatMulMatAdd, MatMulVecAdd, 
                     sublayout, sub_materialize, _fill_lmul!,
-                    reflector!, reflectorApply!
+                    reflector!, reflectorApply!, _copyto!, 
+                    _qr!, _qr, _lu!, _lu, _factorize
 
 import FillArrays: AbstractFill, getindex_value
 

diff --git a/src/banded/BandedLU.jl b/src/banded/BandedLU.jl
@@ -88,13 +88,10 @@ function lu!(A::BandedMatrix{T}, pivot::Union{Val{false}, Val{true}} = Val(true)
     return BandedLU{T,typeof(A)}(A, ipiv, zero(BlasInt))
 end
 
-lu!(A::AbstractBandedMatrix, pivot::Union{Val{false}, Val{true}} = Val(true); check::Bool = true) =
+_lu!(::AbstractBandedLayout, axes, A, pivot::Union{Val{false}, Val{true}} = Val(true); check::Bool = true) =
     banded_lufact!(A, pivot; check = check)
 
-function lu(A::Union{AbstractBandedMatrix{T}, AbstractBandedMatrix{Complex{T}}, Adjoint{T,<:AbstractBandedMatrix{T}}, Adjoint{Complex{T},<:AbstractBandedMatrix{Complex{T}}},
-                    Transpose{T,<:AbstractBandedMatrix{T}}, Transpose{Complex{T},<:AbstractBandedMatrix{Complex{T}}}},
-    pivot::Union{Val{false}, Val{true}} = Val(true);
-    check::Bool = true) where {T<:Real}
+function _lu(::AbstractBandedLayout, axes, A, pivot::Union{Val{false}, Val{true}} = Val(true); check::Bool = true) where {T<:Real}
     l,u = bandwidths(A)
     lu!(BandedMatrix{float(eltype(A))}(A,(l,l+u)), pivot; check = check)
 end

diff --git a/src/banded/bandedqr.jl b/src/banded/bandedqr.jl
@@ -1,24 +1,22 @@
-qr(A::AbstractBandedMatrix) = banded_qr(A)
-qr(A::BandedSubBandedMatrix) = banded_qr(A)
-
-banded_qr(A) = _banded_qr(axes(A), A)
+_qr(::AbstractBandedLayout, ax, A) = _banded_qr(ax, A)
 _banded_qr(_, A) = qr!(BandedMatrix{float(eltype(A))}(A, (bandwidth(A,1),bandwidth(A,1)+bandwidth(A,2))))
 
-
-
 qr(A::Tridiagonal{T}) where T = qr!(BandedMatrix{float(T)}(A, (1,2)))
-
-qr!(A::BandedMatrix) = banded_qr!(A)
-qr!(A::BandedSubBandedMatrix) = banded_qr!(A)
+_qr!(::AbstractBandedLayout, _, A) = banded_qr!(A)
 
 
 function _banded_qr!(R::AbstractMatrix{T}, τ) where T
+    m,n=size(R)
+    _banded_qr!(R, τ, min(m - 1 + !(T<:Real), n))
+end
+
+function _banded_qr!(R::AbstractMatrix, τ, ncols)
     D = bandeddata(R)
     l,u = bandwidths(R)
     ν = l+u+1
     m,n=size(R)
 
-    for k = 1:min(m - 1 + !(T<:Real), n)
+    for k = 1:ncols
         x = view(D,u+1:min(ν,m-k+u+1), k)
         τk = reflector!(x)
         τ[k] = τk
@@ -79,7 +77,7 @@ function banded_qr_lmul!(adjA::Adjoint, B)
     @inbounds begin
         for j = 1:nB
             cs = colsupport(B,j)
-            for k = max(1,minimum(cs)-l):min(mA,nA,maximum(cs)+l)
+            for k = max(1,minimum(cs)-l):min(mA,nA,maximum(cs)+l,length(A.τ))
                 vBj = B[k,j]
                 for i = k+1:min(k+l,mB)
                     vBj += conj(D[i-k+u+1,k])*B[i,j]

diff --git a/src/banded/linalg.jl b/src/banded/linalg.jl
@@ -71,4 +71,4 @@ end
 \(A::Adjoint{<:Any,<:BandedLU}, B::Adjoint{<:Any,<:AbstractVecOrMat}) = A \ copy(B)
 \(A::Transpose{<:Any,<:BandedLU}, B::Transpose{<:Any,<:AbstractVecOrMat}) = A \ copy(B)
 
-factorize(A::BandedMatrix) = lu(A)
+_factorize(::AbstractBandedLayout, _, A) = lu(A)
diff --git a/src/generic/broadcast.jl b/src/generic/broadcast.jl
@@ -52,7 +52,8 @@ copyto!(dest::AbstractArray, bc::Broadcasted{BandedStyle}) =
 # copyto!
 ##
 
-copyto!(dest::AbstractMatrix, src::AbstractBandedMatrix) =  (dest .= src)
+_copyto!(::AbstractBandedLayout, ::AbstractBandedLayout, dest::AbstractMatrix, src::AbstractMatrix) =
+    (dest .= src)
 
 
 function checkbroadcastband(dest, sizesrc, bndssrc)