Skip to content

More resizing for truncating return values from LAPACK #1190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Feb 18, 2025
Merged

More resizing for truncating return values from LAPACK #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
da2fb1b
resizings
BioTurboNick Feb 2, 2025
631a3b8
fixes
BioTurboNick Feb 2, 2025
78d1fc8
simplify (~no-op or cheap if same size)
BioTurboNick Feb 2, 2025
ebaa8b2
Test debugging info for CI
BioTurboNick Feb 11, 2025
d12186a
remove debug lines
BioTurboNick Feb 11, 2025
06a05f4
Try taking min
BioTurboNick Feb 11, 2025
e519b44
fix check
BioTurboNick Feb 11, 2025
4bf986b
Also add for `w`.
BioTurboNick Feb 11, 2025
4835a0f
Add debug for CI
BioTurboNick Feb 12, 2025
ff35596
Remove debug again
BioTurboNick Feb 12, 2025
426bff6
Add tests to cover cases where output is truncated
BioTurboNick Feb 12, 2025
f3a923c
try to catch elsewhere?
BioTurboNick Feb 12, 2025
605c2e6
duh
BioTurboNick Feb 18, 2025
5dd14c0
remove try-catch
dkarrasch Feb 18, 2025
ee7ef2d
include missing test case (all evecs, both sides)
dkarrasch Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions src/lapack.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2835,7 +2835,7 @@ for (orglq, orgqr, orgql, orgrq, ormlq, ormqr, ormql, ormrq, gemqrt, elty) in
end
end
if n < size(A,2)
A[:,1:n]
reshape(resize!(vec(A), m * n), m, n)
else
A
end
Expand Down Expand Up @@ -2871,7 +2871,7 @@ for (orglq, orgqr, orgql, orgrq, ormlq, ormqr, ormql, ormrq, gemqrt, elty) in
end
end
if n < size(A,2)
A[:,1:n]
reshape(resize!(vec(A), m * n), m, n)
else
A
end
Expand Down Expand Up @@ -3736,22 +3736,24 @@ for (trcon, trevc, trrfs, elty) in
work, info, 1, 1)
chklapackerror(info[])

VLn = size(VL, 1)
VRn = size(VR, 1)
#Decide what exactly to return
if howmny == 'S' #compute selected eigenvectors
if side == 'L' #left eigenvectors only
return select, VL[:,1:m[]]
return select, reshape(resize!(vec(VL), VLn * m[]), VLn, m[])
elseif side == 'R' #right eigenvectors only
return select, VR[:,1:m[]]
return select, reshape(resize!(vec(VR), VRn * m[]), VRn, m[])
else #side == 'B' #both eigenvectors
return select, VL[:,1:m[]], VR[:,1:m[]]
return select, reshape(resize!(vec(VL), VLn * m[]), VLn, m[]), reshape(resize!(vec(VR), VRn * m[]), VRn, m[])
end
else #compute all eigenvectors
if side == 'L' #left eigenvectors only
return VL[:,1:m[]]
return reshape(resize!(vec(VL), VLn * m[]), VLn, m[])
elseif side == 'R' #right eigenvectors only
return VR[:,1:m[]]
return reshape(resize!(vec(VR), VRn * m[]), VRn, m[])
else #side == 'B' #both eigenvectors
return VL[:,1:m[]], VR[:,1:m[]]
return reshape(resize!(vec(VL), VLn * m[]), VLn, m[]), reshape(resize!(vec(VR), VRn * m[]), VRn, m[])
end
end
end
Expand Down Expand Up @@ -3873,22 +3875,24 @@ for (trcon, trevc, trrfs, elty, relty) in
work, rwork, info, 1, 1)
chklapackerror(info[])

VLn = size(VL, 1)
VRn = size(VR, 1)
#Decide what exactly to return
if howmny == 'S' #compute selected eigenvectors
if side == 'L' #left eigenvectors only
return select, VL[:,1:m[]]
return select, reshape(resize!(vec(VL), VLn * m[]), VLn, m[])
elseif side == 'R' #right eigenvectors only
return select, VR[:,1:m[]]
else #side=='B' #both eigenvectors
return select, VL[:,1:m[]], VR[:,1:m[]]
return select, reshape(resize!(vec(VR), VRn * m[]), VRn, m[])
else #side == 'B' #both eigenvectors
return select, reshape(resize!(vec(VL), VLn * m[]), VLn, m[]), reshape(resize!(vec(VR), VRn * m[]), VRn, m[])
end
else #compute all eigenvectors
if side == 'L' #left eigenvectors only
return VL[:,1:m[]]
return reshape(resize!(vec(VL), VLn * m[]), VLn, m[])
elseif side == 'R' #right eigenvectors only
return VR[:,1:m[]]
else #side=='B' #both eigenvectors
return VL[:,1:m[]], VR[:,1:m[]]
return reshape(resize!(vec(VR), VRn * m[]), VRn, m[])
else #side == 'B' #both eigenvectors
return reshape(resize!(vec(VL), VLn * m[]), VLn, m[]), reshape(resize!(vec(VR), VRn * m[]), VRn, m[])
end
end
end
Expand Down Expand Up @@ -4033,7 +4037,7 @@ for (stev, stebz, stegr, stein, elty) in
w, iblock, isplit, work,
iwork, info, 1, 1)
chklapackerror(info[])
w[1:m[]], iblock[1:m[]], isplit[1:nsplit[1]]
resize!(w, m[]), resize!(iblock, m[]), resize!(isplit, nsplit[1])
end

function stegr!(jobz::AbstractChar, range::AbstractChar, dv::AbstractVector{$elty}, ev::AbstractVector{$elty}, vl::Real, vu::Real, il::Integer, iu::Integer)
Expand All @@ -4056,8 +4060,9 @@ for (stev, stebz, stegr, stein, elty) in
m = Ref{BlasInt}()
w = similar(dv, $elty, n)
ldz = jobz == 'N' ? 1 : n
Z = similar(dv, $elty, ldz, range == 'I' ? iu-il+1 : n)
isuppz = similar(dv, BlasInt, 2*size(Z, 2))
Zn = range == 'I' ? iu-il+1 : n
Z = similar(dv, $elty, ldz * Zn)
isuppz = similar(dv, BlasInt, 2 * Zn)
work = Vector{$elty}(undef, 1)
lwork = BlasInt(-1)
iwork = Vector{BlasInt}(undef, 1)
Expand Down Expand Up @@ -4085,7 +4090,7 @@ for (stev, stebz, stegr, stein, elty) in
resize!(iwork, liwork)
end
end
m[] == length(w) ? w : w[1:m[]], m[] == size(Z, 2) ? Z : Z[:,1:m[]]
return resize!(w, m[]), reshape(resize!(Z, ldz * m[]), ldz, m[])
end

function stein!(dv::AbstractVector{$elty}, ev_in::AbstractVector{$elty}, w_in::AbstractVector{$elty}, iblock_in::AbstractVector{BlasInt}, isplit_in::AbstractVector{BlasInt})
Expand Down
15 changes: 15 additions & 0 deletions test/lapack.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,11 @@ end
@test_throws DimensionMismatch LAPACK.ormqr!('L','N',A,temp,B)
@test_throws ArgumentError LAPACK.ormqr!('X','N',A,temp,B)
@test_throws ArgumentError LAPACK.ormqr!('L','X',A,temp,B)

A = rand(elty,10,11)
A,tau = LAPACK.geqrf!(A)
B = copy(A)
@test LAPACK.orgqr!(B,tau) ≈ LAPACK.ormqr!('R','N',A,tau,Matrix{elty}(I, 10, 10))

A = rand(elty,10,10)
A,tau = LAPACK.geqlf!(A)
Expand All @@ -372,6 +377,11 @@ end
@test_throws ArgumentError LAPACK.ormql!('X','N',A,temp,B)
@test_throws ArgumentError LAPACK.ormql!('L','X',A,temp,B)

A = rand(elty,10,11)
A,tau = LAPACK.geqlf!(A)
B = copy(A)
@test LAPACK.orgql!(B,tau) ≈ LAPACK.ormql!('R','N',A,tau,Matrix{elty}(I, 10, 10))

A = rand(elty,10,10)
A,tau = LAPACK.gerqf!(A)
@test_throws DimensionMismatch LAPACK.orgrq!(A,tau,11)
Expand Down Expand Up @@ -738,6 +748,11 @@ end
select,Vln,Vrn = LAPACK.trevc!('B','S',select,copy(T))
@test Vrn ≈ v
@test Vln ≈ Vl
Vl = LAPACK.trevc!('L','A',select,copy(T))
Vr = LAPACK.trevc!('R','A',select,copy(T))
Vla, Vra = LAPACK.trevc!('B','A',select,copy(T))
@test Vr ≈ Vra
@test Vl ≈ Vla
@test_throws ArgumentError LAPACK.trevc!('V','S',select,T)
@test_throws ArgumentError LAPACK.trevc!('R','X',select,T)
temp1010 = rand(elty,10,10)
Expand Down