Skip to content

Commit 15a5aeb

Browse files
authoredNov 23, 2017
Merge pull request #24712 from Sacha0/reparrtlinalg
replace Array{...}(shape...)-like calls in test/linalg
2 parents 66e399b + 62f6978 commit 15a5aeb

File tree

4 files changed

+22
-20
lines changed

4 files changed

+22
-20
lines changed
 

‎test/linalg/generic.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ end
206206
@test scale!(similar(a), [1.; 2.], a) == a.*[1; 2]
207207
@test scale!(similar(a), [1; 2], a) == a.*[1; 2]
208208
@test_throws DimensionMismatch scale!(similar(a), ones(3), a)
209-
@test_throws DimensionMismatch scale!(Array{Float64}(3, 2), a, ones(3))
209+
@test_throws DimensionMismatch scale!(Matrix{Float64}(uninitialized, 3, 2), a, ones(3))
210210

211211
if isa(a, Array)
212212
@test scale!(similar(a), a, [1.; 2.; 3.]) == a.*[1 2 3]

‎test/linalg/matmul.jl

+16-14
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ using Test
1212
@test ones(0,0)*ones(0,4) == zeros(0,4)
1313
@test ones(3,0)*ones(0,0) == zeros(3,0)
1414
@test ones(0,0)*ones(0,0) == zeros(0,0)
15-
@test Array{Float64}(5, 0) |> t -> t't == zeros(0,0)
16-
@test Array{Float64}(5, 0) |> t -> t*t' == zeros(5,5)
17-
@test Array{Complex128}(5, 0) |> t -> t't == zeros(0,0)
18-
@test Array{Complex128}(5, 0) |> t -> t*t' == zeros(5,5)
15+
@test Matrix{Float64}(uninitialized, 5, 0) |> t -> t't == zeros(0,0)
16+
@test Matrix{Float64}(uninitialized, 5, 0) |> t -> t*t' == zeros(5,5)
17+
@test Matrix{Complex128}(uninitialized, 5, 0) |> t -> t't == zeros(0,0)
18+
@test Matrix{Complex128}(uninitialized, 5, 0) |> t -> t*t' == zeros(5,5)
1919
end
2020
@testset "2x2 matmul" begin
2121
AA = [1 2; 3 4]
@@ -89,7 +89,7 @@ end
8989
end
9090
AA = rand(1:20, 5, 5) .- 10
9191
BB = rand(1:20, 5, 5) .- 10
92-
CC = Array{Int}(size(AA, 1), size(BB, 2))
92+
CC = Matrix{Int}(uninitialized, size(AA, 1), size(BB, 2))
9393
for A in (copy(AA), view(AA, 1:5, 1:5)), B in (copy(BB), view(BB, 1:5, 1:5)), C in (copy(CC), view(CC, 1:5, 1:5))
9494
@test At_mul_B(A, B) == A'*B
9595
@test A_mul_Bt(A, B) == A*B'
@@ -105,7 +105,7 @@ end
105105
@test_throws DimensionMismatch Base.LinAlg.Ac_mul_Bt!(C,ones(Int,4,4),B)
106106
end
107107
vv = [1,2]
108-
CC = Array{Int}(2, 2)
108+
CC = Matrix{Int}(uninitialized, 2, 2)
109109
for v in (copy(vv), view(vv, 1:2)), C in (copy(CC), view(CC, 1:2, 1:2))
110110
@test @inferred(A_mul_Bc!(C, v, v)) == [1 2; 2 4]
111111
end
@@ -119,12 +119,12 @@ end
119119
@test_throws DimensionMismatch Base.LinAlg.generic_matvecmul!(B,'N',A,zeros(6))
120120
end
121121
vv = [1,2,3]
122-
CC = Array{Int}(3, 3)
122+
CC = Matrix{Int}(uninitialized, 3, 3)
123123
for v in (copy(vv), view(vv, 1:3)), C in (copy(CC), view(CC, 1:3, 1:3))
124124
@test A_mul_Bt!(C, v, v) == v*v'
125125
end
126126
vvf = map(Float64,vv)
127-
CC = Array{Float64}(3, 3)
127+
CC = Matrix{Float64}(uninitialized, 3, 3)
128128
for vf in (copy(vvf), view(vvf, 1:3)), C in (copy(CC), view(CC, 1:3, 1:3))
129129
@test A_mul_Bt!(C, vf, vf) == vf*vf'
130130
end
@@ -247,12 +247,12 @@ vecdot_(x,y) = invoke(vecdot, Tuple{Any,Any}, x,y)
247247
end
248248

249249
@testset "Issue 11978" begin
250-
A = Array{Matrix{Float64}}(2, 2)
250+
A = Matrix{Matrix{Float64}}(uninitialized, 2, 2)
251251
A[1,1] = Matrix(1.0I, 3, 3)
252252
A[2,2] = Matrix(1.0I, 2, 2)
253253
A[1,2] = Matrix(1.0I, 3, 2)
254254
A[2,1] = Matrix(1.0I, 2, 3)
255-
b = Array{Vector{Float64}}(2)
255+
b = Vector{Vector{Float64}}(uninitialized, 2)
256256
b[1] = ones(3)
257257
b[2] = ones(2)
258258
@test A*b == Vector{Float64}[[2,2,1], [2,2]]
@@ -266,10 +266,12 @@ end
266266
@test Base.LinAlg.gemv!(ones(elty,0),'N',rand(elty,0,0),rand(elty,0)) == ones(elty,0)
267267
@test Base.LinAlg.gemv!(ones(elty,10), 'N',ones(elty,10,0),ones(elty,0)) == zeros(elty,10)
268268

269-
I10 = Matrix{elty}(I, 10, 10)
270-
@test Base.LinAlg.gemm_wrapper('N','N', I10, I10) == I10
271-
@test_throws DimensionMismatch Base.LinAlg.gemm_wrapper!(I10,'N','N', Matrix{elty}(I, 10, 11), I10)
272-
@test_throws DimensionMismatch Base.LinAlg.gemm_wrapper!(I10,'N','N', Matrix{elty}(0, 0), Matrix{elty}(0, 0))
269+
I0x0 = Matrix{elty}(I, 0, 0)
270+
I10x10 = Matrix{elty}(I, 10, 10)
271+
I10x11 = Matrix{elty}(I, 10, 11)
272+
@test Base.LinAlg.gemm_wrapper('N','N', I10x10, I10x10) == I10x10
273+
@test_throws DimensionMismatch Base.LinAlg.gemm_wrapper!(I10x10,'N','N', I10x11, I10x10)
274+
@test_throws DimensionMismatch Base.LinAlg.gemm_wrapper!(I10x10,'N','N', I0x0, I0x0)
273275

274276
A = rand(elty,3,3)
275277
@test Base.LinAlg.matmul3x3('T','N',A, Matrix{elty}(I, 3, 3)) == A.'

‎test/linalg/pinv.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ using Test
99
srand(12345)
1010

1111
function hilb(T::Type, n::Integer)
12-
a=Array{T}(n,n)
12+
a = Matrix{T}(uninitialized, n, n)
1313
for i=1:n
1414
for j=1:n
1515
a[j,i]=one(T)/(i+j-one(T))
@@ -20,7 +20,7 @@ end
2020
hilb(n::Integer) = hilb(Float64,n)
2121

2222
function hilb(T::Type, m::Integer, n::Integer)
23-
a=Array{T}(m,n)
23+
a = Matrix{T}(uninitialized, m, n)
2424
for i=1:n
2525
for j=1:m
2626
a[j,i]=one(T)/(i+j-one(T))
@@ -67,7 +67,7 @@ tridiag(m::Integer, n::Integer) = tridiag(Float64, m::Integer, n::Integer)
6767

6868
function randn_float64(m::Integer, n::Integer)
6969
a=randn(m,n)
70-
b=Array{Float64}(m,n)
70+
b = Matrix{Float64}(uninitialized, m, n)
7171
for i=1:n
7272
for j=1:m
7373
b[j,i]=convert(Float64,a[j,i])
@@ -78,7 +78,7 @@ end
7878

7979
function randn_float32(m::Integer, n::Integer)
8080
a=randn(m,n)
81-
b=Array{Float32}(m,n)
81+
b = Matrix{Float32}(uninitialized, m, n)
8282
for i=1:n
8383
for j=1:m
8484
b[j,i]=convert(Float32,a[j,i])

‎test/linalg/triangular.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ for elty1 in (Float32, Float64, BigFloat, Complex64, Complex128, Complex{BigFloa
298298
@test A1'A2' Matrix(A1)'Matrix(A2)'
299299
@test A1/A2 Matrix(A1)/Matrix(A2)
300300
@test A1\A2 Matrix(A1)\Matrix(A2)
301-
offsizeA = Matrix{Float64}(n+1, n+1)
301+
offsizeA = Matrix{Float64}(I, n+1, n+1)
302302
@test_throws DimensionMismatch offsizeA / A2
303303
@test_throws DimensionMismatch offsizeA / A2.'
304304
@test_throws DimensionMismatch offsizeA / A2'

0 commit comments

Comments
 (0)
Please sign in to comment.