Mentions légales du service

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

Fix ctorMatButterfly(const MatSparse<FPP, GPU2> &factor, int level)

it was making dft(1024, diag_opt=True, dev='gpu')@x fail.
parent 61f1e455
Branches
Tags
No related merge requests found
...@@ -45,13 +45,15 @@ namespace Faust ...@@ -45,13 +45,15 @@ namespace Faust
return *this; return *this;
} }
MatButterfly(const MatSparse<FPP, GPU2> &factor, int level) MatButterfly(const MatSparse<FPP, GPU2> &factor, int level) : MatButterfly<FPP, GPU2>(factor.tocpu(), level)
{ {
MatSparse<FPP, Cpu> Scpu; //TODO: do it without passing through CPU mem. and move the def in hpp
// TODO: fix this way of doing the same (reproduce bug with pyfaust.dft(1024, diag_opt=True, dev='gpu') @ x)
/*MatSparse<FPP, Cpu> Scpu(factor.getNbRow(), factor.getNbCol());
factor.tocpu(Scpu); factor.tocpu(Scpu);
MatButterfly<FPP, GPU2> this_(Scpu, level); MatButterfly<FPP, GPU2> this_(Scpu, level);
*this = this_; *this = this_;*/
//TODO: do it without passing through CPU mem. and move the def in hpp
} }
......
...@@ -42,7 +42,7 @@ namespace Faust ...@@ -42,7 +42,7 @@ namespace Faust
template<> template<>
void Vect<FSFG,GPU2>::operator=(const Vect<FSFG,GPU2> & v) void Vect<FSFG,GPU2>::operator=(const Vect<FSFG,GPU2> & v)
{ {
MatDense<FSFG, GPU2>::operator=(v); // TODO: remove it (in fact the function should be redefined because it does nothing more than the parent) MatDense<FSFG, GPU2>::operator=(v); // TODO: remove it (in fact the function shouldn't be redefined because it does nothing more than the parent)
} }
template<> template<>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment