Mentions légales du service

Skip to content
Snippets Groups Projects
Commit df3c91dc authored by hhakim's avatar hhakim
Browse files

Implement enable_large_Faust for matfaust.fact.svdtj (by using the C++ backend).

parent 6916bba8
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
wrapper/matlab/+matfaust/+fact/svdtj.m
+ 8
− 1
View file @ df3c91dc
...@@ -86,6 +86,7 @@ function [U,S,V] = svdtj(M, varargin) ...@@ -86,6 +86,7 @@ function [U,S,V] = svdtj(M, varargin)
relerr = true; relerr = true;
verbosity = 0; verbosity = 0;
argc = length(varargin); argc = length(varargin);
enable_large_Faust = false;
order = -1; % descending order order = -1; % descending order
if(argc > 0) if(argc > 0)
for i=1:argc for i=1:argc
...@@ -133,6 +134,12 @@ function [U,S,V] = svdtj(M, varargin) ...@@ -133,6 +134,12 @@ function [U,S,V] = svdtj(M, varargin)
order = 0 order = 0
end end
end end
case 'enable_large_Faust'
if(argc == i || ~ islogical(varargin{i+1}))
error('enable_large_Faust keyword argument is not followed by a logical')
else
enable_large_Faust = varargin{i+1};
end
otherwise otherwise
if(isstr(varargin{i}) && (~ strcmp(varargin{i}, 'ascend') && ~ strcmp(varargin{i}, 'descend') && ~ strcmp(varargin{i}, 'undef')) ) if(isstr(varargin{i}) && (~ strcmp(varargin{i}, 'ascend') && ~ strcmp(varargin{i}, 'descend') && ~ strcmp(varargin{i}, 'undef')) )
error([ varargin{i} ' unrecognized argument']) error([ varargin{i} ' unrecognized argument'])
...@@ -146,7 +153,7 @@ function [U,S,V] = svdtj(M, varargin) ...@@ -146,7 +153,7 @@ function [U,S,V] = svdtj(M, varargin)
if(nGivens > 0) if(nGivens > 0)
nGivens_per_fac = min(nGivens_per_fac, nGivens); nGivens_per_fac = min(nGivens_per_fac, nGivens);
end end
[core_obj1, S, core_obj2] = mexsvdtjReal(M, nGivens, nGivens_per_fac, verbosity, tol, relerr, order); [core_obj1, S, core_obj2] = mexsvdtjReal(M, nGivens, nGivens_per_fac, verbosity, tol, relerr, order, enable_large_Faust);
S = sparse(diag(real(S))); S = sparse(diag(real(S)));
U = Faust(core_obj1, isreal(M)); U = Faust(core_obj1, isreal(M));
V = Faust(core_obj2, isreal(M)); V = Faust(core_obj2, isreal(M));
......
wrapper/matlab/src/mexsvdtj.cpp.in
+ 30
− 18
View file @ df3c91dc
...@@ -55,9 +55,9 @@ typedef @FACT_FPP@ FPP2; ...@@ -55,9 +55,9 @@ typedef @FACT_FPP@ FPP2;
using namespace Faust; using namespace Faust;
//void svdtj_cplx(const mxArray* matlab_matrix, int J, int t, double tol, unsigned int verbosity, bool relErr, int order, mxArray **plhs); //void svdtj_cplx(const mxArray* matlab_matrix, int J, int t, double tol, unsigned int verbosity, bool relErr, int order, const bool enable_large_Faust mxArray **plhs);
void svdtj(const mxArray* matlab_matrix, int J, int t, double tol, unsigned int verbosity, bool relErr, int order, mxArray **plhs); void svdtj(const mxArray* matlab_matrix, int J, int t, double tol, unsigned int verbosity, bool relErr, int order, const bool enable_large_Faust, mxArray **plhs);
void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
{ {
...@@ -67,10 +67,11 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) ...@@ -67,10 +67,11 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
unsigned int verbosity = 0; //default verbosity (no info. displayed) unsigned int verbosity = 0; //default verbosity (no info. displayed)
double tol = 0; double tol = 0;
bool relErr = true; bool relErr = true;
int order; int order = -1;
bool enable_large_Faust = false;
if(nrhs < 2 || nrhs > 7) if(nrhs < 2 || nrhs > 8)
mexErrMsgTxt("Bad Number of inputs arguments"); mexErrMsgTxt("Bad Number of input arguments");
J = (int) mxGetScalar(prhs[1]); J = (int) mxGetScalar(prhs[1]);
if(nrhs >= 3) if(nrhs >= 3)
...@@ -83,6 +84,8 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) ...@@ -83,6 +84,8 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
relErr = (bool) mxGetScalar(prhs[5]); relErr = (bool) mxGetScalar(prhs[5]);
if(nrhs >= 7) if(nrhs >= 7)
order = (int) mxGetScalar(prhs[6]); //eigenvalues order order = (int) mxGetScalar(prhs[6]); //eigenvalues order
if(nrhs >= 8)
enable_large_Faust = (bool) mxGetScalar(prhs[7]);
tol *= tol; // C++ backend works with squared norm error tol *= tol; // C++ backend works with squared norm error
const mxArray* matlab_matrix = prhs[0]; // Laplacian const mxArray* matlab_matrix = prhs[0]; // Laplacian
...@@ -90,19 +93,19 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) ...@@ -90,19 +93,19 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
// if(mxIsComplex(matlab_matrix)) // if(mxIsComplex(matlab_matrix))
// svdtj_cplx(matlab_matrix, J, t, tol, verbosity, relErr, order, plhs); // svdtj_cplx(matlab_matrix, J, t, tol, verbosity, relErr, order, plhs);
// else // else
svdtj(matlab_matrix, J, t, tol, verbosity, relErr, order, plhs); svdtj(matlab_matrix, J, t, tol, verbosity, relErr, order, enable_large_Faust, plhs);
} }
void svdtj(const mxArray* matlab_matrix, int J, int t, double tol, unsigned int verbosity, bool relErr, int order, mxArray **plhs) void svdtj(const mxArray* matlab_matrix, int J, int t, double tol, unsigned int verbosity, bool relErr, int order, const bool enable_large_Faust, mxArray **plhs)
{ {
Faust::MatDense<SCALAR,Cpu> dM; Faust::MatDense<SCALAR,Cpu> dM;
Faust::MatSparse<SCALAR,Cpu> sM; Faust::MatSparse<SCALAR,Cpu> sM;
TransformHelper<SCALAR,Cpu> *U, *V; TransformHelper<SCALAR,Cpu> *U = nullptr, *V = nullptr;
Faust::Vect<SCALAR,Cpu>* S; Faust::Vect<SCALAR,Cpu>* S;
Faust::MatDense<complex<SCALAR>,Cpu> dM_cplx; Faust::MatDense<complex<SCALAR>,Cpu> dM_cplx;
Faust::MatSparse<complex<SCALAR>,Cpu> sM_cplx; Faust::MatSparse<complex<SCALAR>,Cpu> sM_cplx;
TransformHelper<complex<SCALAR>,Cpu> *U_cplx, *V_cplx; TransformHelper<complex<SCALAR>,Cpu> *U_cplx = nullptr, *V_cplx = nullptr;
Faust::Vect<complex<SCALAR>,Cpu>* S_cplx; Faust::Vect<complex<SCALAR>,Cpu>* S_cplx;
Faust::BlasHandle<Cpu> blas_handle; Faust::BlasHandle<Cpu> blas_handle;
...@@ -117,36 +120,45 @@ void svdtj(const mxArray* matlab_matrix, int J, int t, double tol, unsigned int ...@@ -117,36 +120,45 @@ void svdtj(const mxArray* matlab_matrix, int J, int t, double tol, unsigned int
if (mxIsSparse(matlab_matrix)) if (mxIsSparse(matlab_matrix))
{ {
mxArray2FaustspMat(matlab_matrix,sM_cplx); mxArray2FaustspMat(matlab_matrix,sM_cplx);
svdtj_cplx<complex<SCALAR>,Cpu,FPP2>(sM_cplx, J, t, tol, verbosity, relErr, order, &U_cplx, &V_cplx, &S_cplx); svdtj_cplx<complex<SCALAR>,Cpu,FPP2>(sM_cplx, J, t, tol, verbosity, relErr, order, enable_large_Faust, &U_cplx, &V_cplx, &S_cplx);
}else }else
{ {
mxArray2FaustMat(matlab_matrix, dM_cplx); mxArray2FaustMat(matlab_matrix, dM_cplx);
svdtj_cplx<complex<SCALAR>,Cpu,FPP2>(dM_cplx, J, t, tol, verbosity, relErr, order, &U_cplx, &V_cplx, &S_cplx); svdtj_cplx<complex<SCALAR>,Cpu,FPP2>(dM_cplx, J, t, tol, verbosity, relErr, order, enable_large_Faust, &U_cplx, &V_cplx, &S_cplx);
}
if(U_cplx != nullptr)
{
plhs[0] = convertPtr2Mat<Faust::TransformHelper<complex<SCALAR>, Cpu>>(U_cplx);
plhs[1] = FaustVec2mxArray(*S_cplx);
plhs[2] = convertPtr2Mat<Faust::TransformHelper<complex<SCALAR>, Cpu>>(V_cplx);
delete S_cplx; //allocated internally by Faust::svdtj
} }
plhs[0] = convertPtr2Mat<Faust::TransformHelper<complex<SCALAR>, Cpu>>(U_cplx);
plhs[1] = FaustVec2mxArray(*S_cplx);
plhs[2] = convertPtr2Mat<Faust::TransformHelper<complex<SCALAR>, Cpu>>(V_cplx);
delete S_cplx;
} }
else else
{ {
if (mxIsSparse(matlab_matrix)) if (mxIsSparse(matlab_matrix))
{ {
mxArray2FaustspMat(matlab_matrix,sM); mxArray2FaustspMat(matlab_matrix,sM);
svdtj(sM, J, t, tol, verbosity, relErr, order, &U, &V, &S); svdtj(sM, J, t, tol, verbosity, relErr, order, enable_large_Faust, &U, &V, &S);
}else }else
{ {
mxArray2FaustMat(matlab_matrix, dM); mxArray2FaustMat(matlab_matrix, dM);
svdtj(dM, J, t, tol, verbosity, relErr, order, &U, &V, &S); svdtj(dM, J, t, tol, verbosity, relErr, order, enable_large_Faust, &U, &V, &S);
} }
if(U != nullptr)
{
plhs[0] = convertPtr2Mat<Faust::TransformHelper<SCALAR, Cpu>>(U); plhs[0] = convertPtr2Mat<Faust::TransformHelper<SCALAR, Cpu>>(U);
plhs[1] = FaustVec2mxArray(*S); plhs[1] = FaustVec2mxArray(*S);
plhs[2] = convertPtr2Mat<Faust::TransformHelper<SCALAR, Cpu>>(V); plhs[2] = convertPtr2Mat<Faust::TransformHelper<SCALAR, Cpu>>(V);
delete S; //allocated internally by Faust::svdtj delete S; //allocated internally by Faust::svdtj
}
} }
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
mexErrMsgTxt(e.what()); mexErrMsgTxt(e.what());
} }
if(U_cplx == nullptr && U == nullptr)
mexErrMsgTxt("Empty transform (nGivens is too big ? Set enable_large_Faust to true to force the computation).");
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment