use _copy_oftype (#256)

* use _copy_oftype

* Drop Julia v1.5 support

* add tests

Author: dlfivefifty

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.5'
+          - '1.6'
           - '1'
           - '^1.8.0-0'          
         os:

Project.toml

@@ -1,6 +1,6 @@
 name = "BandedMatrices"
 uuid = "aae01518-5342-5314-be14-df237901396f"
-version = "0.16.13"
+version = "0.17"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -10,9 +10,9 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-ArrayLayouts = "0.7, 0.8"
-FillArrays = "0.11, 0.12, 0.13"
-julia = "1.5"
+ArrayLayouts = "0.8"
+FillArrays = "0.13"
+julia = "1.6"
 
 [extras]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/BandedMatrices.jl

@@ -3,7 +3,7 @@ using Base, FillArrays, ArrayLayouts, LinearAlgebra, SparseArrays, Random
 using LinearAlgebra.LAPACK
 import Base: axes, axes1, getproperty, iterate, tail
 import LinearAlgebra: BlasInt, BlasReal, BlasFloat, BlasComplex, axpy!,
-                        copy_oftype, checksquare, adjoint, transpose, AdjOrTrans, HermOrSym,
+                        checksquare, adjoint, transpose, AdjOrTrans, HermOrSym,
                         _chol!, rot180, dot
 import LinearAlgebra.BLAS: libblas
 import LinearAlgebra.LAPACK: liblapack, chkuplo, chktrans
@@ -33,7 +33,7 @@ import ArrayLayouts: MemoryLayout, transposelayout, triangulardata,
                     triangularlayout, MatLdivVec, hermitianlayout, hermitiandata,
                     materialize!, BlasMatMulMatAdd, BlasMatMulVecAdd, BlasMatLmulVec, BlasMatLdivVec,
                     colsupport, rowsupport, symmetricuplo, MatMulMatAdd, MatMulVecAdd,
-                    sublayout, sub_materialize, _fill_lmul!,
+                    sublayout, sub_materialize, _fill_lmul!, _copy_oftype,
                     reflector!, reflectorApply!, _copyto!, checkdimensions,
                     _qr!, _qr, _lu!, _lu, _factorize, AbstractTridiagonalLayout, TridiagonalLayout,
                     BidiagonalLayout, bidiagonaluplo, diagonaldata, supdiagonaldata, subdiagonaldata

src/generic/broadcast.jl

@@ -913,13 +913,19 @@ axpy!(α, A::AbstractBandedMatrix, dest::AbstractMatrix) = banded_axpy!(α, A, d
 for op in (:*, :/)
     @eval begin
         broadcasted(::BandedStyle, ::typeof($op), a::Zeros, b::AbstractArray) = _broadcasted_zeros(a, b)
-        broadcasted(::BandedStyle, ::typeof($op), a::Ones{T}, b::AbstractArray{V}) where {T,V} = copy_oftype(b, promote_op(*, T, V))
+        function broadcasted(::BandedStyle, ::typeof($op), a::AbstractArray{T}, b::Ones{V}) where {T,V}
+            Base.Broadcast.combine_axes(a, b) # dimension check
+            _copy_oftype(a, promote_op(*, T, V))
+        end
     end
 end
 
 for op in (:*, :\)
     @eval begin
         broadcasted(::BandedStyle, ::typeof($op), a::AbstractArray, b::Zeros) = _broadcasted_zeros(a, b)
-        broadcasted(::BandedStyle, ::typeof($op), a::AbstractArray{T}, b::Ones{V}) where {T,V} = copy_oftype(a, promote_op(*, T, V))
+        function broadcasted(::BandedStyle, ::typeof($op), a::Ones{T}, b::AbstractArray{V}) where {T,V}
+            Base.Broadcast.combine_axes(a, b) # dimension check
+            _copy_oftype(b, promote_op(*, T, V))
+        end
     end
 end

test/test_broadcasting.jl

@@ -1,4 +1,4 @@
-using BandedMatrices, LinearAlgebra, ArrayLayouts, Test
+using BandedMatrices, LinearAlgebra, ArrayLayouts, FillArrays, Test
 import Base: BroadcastStyle
 import Base.Broadcast: broadcasted
 import BandedMatrices: BandedStyle, BandedRows
@@ -541,4 +541,23 @@ import BandedMatrices: BandedStyle, BandedRows
         @test bandwidths(B) == bandwidths(A)
         @test (A .+ A) .+ A == 3A
     end
+
+    @testset "ones special case" begin
+        A = brand(5,4,2,1)
+        @test Ones(5) .* A == A
+        @test Ones(5,4) .* A == A
+        @test Ones(5) .\ A == A
+        @test Ones(5,4) .\ A == A
+        @test Ones(5) ./ A == inv.(A)
+        @test_throws DimensionMismatch Ones(3) .* A
+        @test_throws DimensionMismatch Ones(3,4) .* A
+
+        @test A .* Ones(5) == A
+        @test A .* Ones(5,4) == A
+        @test A ./ Ones(5) == A
+        @test A ./ Ones(5,4) == A
+        @test A .\ Ones(5) == inv.(A)
+        @test_throws DimensionMismatch A .* Ones(3)
+        @test_throws DimensionMismatch A .* Ones(3,4)
+    end
 end