Skip to content

GitLab

"tools/vscode:/vscode.git/clone" did not exist on "724cb5006fa1046c2f6b1eb43d4e9174b96d4cf2"
Commit 6f55c648 authored by Davis King's avatar Davis King
Browse files

Various minor fixes to the LAPACK bindings. 

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403829
parent 0c06fb57
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 17 deletions
dlib/matrix/lapack/gees.h
View file @ 6f55c648
......@@ -226,7 +226,7 @@ namespace dlib
if (jobz == 'V')
vs.set_size(n,n);
else
vs.set_size(1,1);
vs.set_size(NR4?NR4:1, NC4?NC4:1);
// figure out how big the workspace needs to be.
T work_size = 1;
......
dlib/matrix/lapack/geev.h
View file @ 6f55c648
......@@ -189,12 +189,12 @@ namespace dlib
if (jobvl == 'V')
vl.set_size(n,n);
else
vl.set_size(1,1);
vl.set_size(NR4?NR4:1, NC4?NC4:1);
if (jobvr == 'V')
vr.set_size(n,n);
else
vr.set_size(1,1);
vr.set_size(NR5?NR5:1, NC5?NC5:1);
// figure out how big the workspace needs to be.
......
dlib/matrix/lapack/gesdd.h
View file @ 6f55c648
......@@ -228,8 +228,8 @@ namespace dlib
}
else
{
u.set_size(1,1);
vt.set_size(1,1);
u.set_size(NR3?NR3:1, NC3?NC3:1);
vt.set_size(NR4?NR4:1, NC4?NC4:1);
}
// figure out how big the workspace needs to be.
......@@ -272,8 +272,8 @@ namespace dlib
matrix<integer,0,1,MM,row_major_layout> iwork;
// Row major order matrices are transposed from LAPACK's point of view.
matrix<T,NR3,NC3,MM,row_major_layout>& u = vt_;
matrix<T,NR4,NC4,MM,row_major_layout>& vt = u_;
matrix<T,NR4,NC4,MM,row_major_layout>& u = vt_;
matrix<T,NR3,NC3,MM,row_major_layout>& vt = u_;
const long m = a.nc();
......@@ -300,8 +300,8 @@ namespace dlib
}
else
{
u.set_size(1,1);
vt.set_size(1,1);
u.set_size(NR4?NR4:1, NC4?NC4:1);
vt.set_size(NR3?NR3:1, NC3?NC3:1);
}
// figure out how big the workspace needs to be.
......
dlib/matrix/lapack/gesvd.h
View file @ 6f55c648
......@@ -205,14 +205,14 @@ namespace dlib
else if (jobu == 'S')
u.set_size(m, std::min(m,n));
else
u.set_size(1,1);
u.set_size(NR3?NR3:1, NC3?NC3:1);
if (jobvt == 'A')
vt.set_size(n,n);
else if (jobvt == 'S')
vt.set_size(std::min(m,n), n);
else
vt.set_size(1,1);
vt.set_size(NR4?NR4:1, NC4?NC4:1);
if (jobu == 'O' || jobvt == 'O')
......@@ -261,8 +261,8 @@ namespace dlib
matrix<T,0,1,MM,row_major_layout> work;
// Row major order matrices are transposed from LAPACK's point of view.
matrix<T,NR3,NC3,MM,row_major_layout>& u = vt_;
matrix<T,NR4,NC4,MM,row_major_layout>& vt = u_;
matrix<T,NR4,NC4,MM,row_major_layout>& u = vt_;
matrix<T,NR3,NC3,MM,row_major_layout>& vt = u_;
std::swap(jobu, jobvt);
const long m = a.nc();
......@@ -274,14 +274,14 @@ namespace dlib
else if (jobu == 'S')
u.set_size(std::min(m,n), m);
else
u.set_size(1,1);
u.set_size(NR4?NR4:1, NC4?NC4:1);
if (jobvt == 'A')
vt.set_size(n,n);
else if (jobvt == 'S')
vt.set_size(n, std::min(m,n));
else
vt.set_size(1,1);
vt.set_size(NR3?NR3:1, NC3?NC3:1);
if (jobu == 'O' || jobvt == 'O')
{
......
dlib/matrix/lapack/syev.h
View file @ 6f55c648
......@@ -197,6 +197,8 @@ namespace dlib
a = trans(a);
return info;
}
// ------------------------------------------------------------------------------------
......
dlib/matrix/lapack/syevr.h
View file @ 6f55c648
......@@ -326,7 +326,7 @@ namespace dlib
}
else
{
z.set_size(1,1);
z.set_size(NR3?NR3:1, NC3?NC3:1);
}
// figure out how big the workspace needs to be.
......@@ -399,7 +399,7 @@ namespace dlib
}
else
{
z.set_size(1,1);
z.set_size(NR3?NR3:1, NC3?NC3:1);
}
// figure out how big the workspace needs to be.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment