at-deprecate diagm(A::BitMatrix) diagm(vec(A))

JuliaLang · Aug 22, 2017 · ef8829d · ef8829d
1 parent fa87185
commit ef8829d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -332,6 +332,8 @@ Deprecated or removed
   * `diagm(A::SparseMatrixCSC)` has been deprecated in favor of
     `spdiagm(sparsevec(A))` ([#23341]).
 
+  * `diagm(A::BitMatrix)` has been deprecated, use `diagm(vec(A))` instead ([#23373]).
+
 Command-line option changes
 ---------------------------
 

diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -1708,6 +1708,9 @@ export hex2num
 # PR 23341
 @deprecate diagm(A::SparseMatrixCSC) spdiagm(sparsevec(A))
 
+# PR #23373
+@deprecate diagm(A::BitMatrix) diagm(vec(A))
+
 # END 0.7 deprecations
 
 # BEGIN 1.0 deprecations

diff --git a/base/linalg/bitarray.jl b/base/linalg/bitarray.jl
@@ -86,8 +86,7 @@ function diag(B::BitMatrix)
     v
 end
 
-function diagm(v::Union{BitVector,BitMatrix})
-    isa(v, BitMatrix) && size(v,1)==1 || size(v,2)==1 || throw(DimensionMismatch())
+function diagm(v::BitVector)
     n = length(v)
     a = falses(n, n)
     for i=1:n

diff --git a/test/bitarray.jl b/test/bitarray.jl
@@ -1395,9 +1395,6 @@ timesofar("cat")
     b1 = bitrand(v1)
     @check_bit_operation diagm(b1) BitMatrix
 
-    b1 = bitrand(n1, n2)
-    @test_throws DimensionMismatch diagm(b1)
-
     b1 = bitrand(n1, n1)
     @check_bit_operation diag(b1)
 end