Mentions légales du service

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

Fix memcpy error in mex code faust_optimize_time.hpp for dense matrices.

Fix for FaustTest.testProdOpt unit test segfault.
parent 01d18e46
Branches
No related tags found
No related merge requests found
...@@ -52,9 +52,9 @@ void faust_optimize_time_prod(const mxArray **prhs, const int nrhs, mxArray **pl ...@@ -52,9 +52,9 @@ void faust_optimize_time_prod(const mxArray **prhs, const int nrhs, mxArray **pl
SCALAR* ptr_data = nullptr; SCALAR* ptr_data = nullptr;
mxArray2Ptr(mat, ptr_data); mxArray2Ptr(mat, ptr_data);
const size_t mat_nrows = mxGetM(mat); const size_t mat_nrows = mxGetM(mat);
const size_t mat_ncols = mxGetN(mat); const size_t mat_ncols = mxGetN(mat);
ds_mat.resize(mat_nrows, mat_ncols); ds_mat.resize(mat_nrows, mat_ncols);
memcpy(ds_mat.getData(), ptr_data, mat_ncols*mat_ncols*sizeof(SCALAR)); memcpy(ds_mat.getData(), ptr_data, mat_nrows*mat_ncols*sizeof(SCALAR));
delete [] ptr_data; delete [] ptr_data;
if(DEV == Cpu) if(DEV == Cpu)
matGen = (Faust::MatDense<SCALAR, DEV>*) &ds_mat; // cast to avoid compil error but the bad case (DEV == GPU2) will never occur matGen = (Faust::MatDense<SCALAR, DEV>*) &ds_mat; // cast to avoid compil error but the bad case (DEV == GPU2) will never occur
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment