Mentions légales du service

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

Fix Windows Visual C++ issue: it needs fully qualified namespaces for MatDense and MatSparse.

parent df41d438
No related branches found
No related tags found
No related merge requests found
...@@ -197,7 +197,7 @@ void GivensFGFT<FPP,DEVICE,FPP2>::update_fact() ...@@ -197,7 +197,7 @@ void GivensFGFT<FPP,DEVICE,FPP2>::update_fact()
} }
template<typename FPP, Device DEVICE, typename FPP2> template<typename FPP, Device DEVICE, typename FPP2>
void GivensFGFT<FPP,DEVICE,FPP2>::update_L(MatDense<FPP,Cpu> & L) void GivensFGFT<FPP,DEVICE,FPP2>::update_L(Faust::MatDense<FPP,Cpu> & L)
{ {
// L = S'*L*S // L = S'*L*S
#ifdef DEBUG_GIVENS #ifdef DEBUG_GIVENS
...@@ -220,7 +220,7 @@ void GivensFGFT<FPP,DEVICE,FPP2>::update_L(MatDense<FPP,Cpu> & L) ...@@ -220,7 +220,7 @@ void GivensFGFT<FPP,DEVICE,FPP2>::update_L(MatDense<FPP,Cpu> & L)
} }
template<typename FPP, Device DEVICE, typename FPP2> template<typename FPP, Device DEVICE, typename FPP2>
void GivensFGFT<FPP,DEVICE,FPP2>::update_L(MatSparse<FPP,Cpu> & L) void GivensFGFT<FPP,DEVICE,FPP2>::update_L(Faust::MatSparse<FPP,Cpu> & L)
{ {
// L = S'*L*S // L = S'*L*S
facts[ite].multiply(L, 'T'); facts[ite].multiply(L, 'T');
...@@ -236,7 +236,7 @@ void GivensFGFT<FPP,DEVICE,FPP2>::update_L() ...@@ -236,7 +236,7 @@ void GivensFGFT<FPP,DEVICE,FPP2>::update_L()
} }
template<typename FPP, Device DEVICE, typename FPP2> template<typename FPP, Device DEVICE, typename FPP2>
void GivensFGFT<FPP,DEVICE,FPP2>::update_L_first(Faust::Vect<FPP,DEVICE>& L_vec_p, Faust::Vect<FPP,DEVICE>& L_vec_q, const FPP2& c, const FPP2& s, int p, int q, MatDense<FPP,DEVICE> & L) void GivensFGFT<FPP,DEVICE,FPP2>::update_L_first(Faust::Vect<FPP,DEVICE>& L_vec_p, Faust::Vect<FPP,DEVICE>& L_vec_q, const FPP2& c, const FPP2& s, int p, int q, Faust::MatDense<FPP,DEVICE> & L)
{ {
#define copy_vec2Lrow(vec,rowi) \ #define copy_vec2Lrow(vec,rowi) \
for(int i=0;i<L.getNbCol();i++) L.getData()[L.getNbRow()*i+rowi] = tmp[i] for(int i=0;i<L.getNbCol();i++) L.getData()[L.getNbRow()*i+rowi] = tmp[i]
...@@ -262,7 +262,7 @@ void GivensFGFT<FPP,DEVICE,FPP2>::update_L_first(Faust::Vect<FPP,DEVICE>& L_vec_ ...@@ -262,7 +262,7 @@ void GivensFGFT<FPP,DEVICE,FPP2>::update_L_first(Faust::Vect<FPP,DEVICE>& L_vec_
} }
template<typename FPP, Device DEVICE, typename FPP2> template<typename FPP, Device DEVICE, typename FPP2>
void GivensFGFT<FPP,DEVICE,FPP2>::update_L_second(Faust::Vect<FPP,DEVICE>& L_vec_p, Faust::Vect<FPP,DEVICE>& L_vec_q, const FPP2& c, const FPP2& s, int p, int q, MatDense<FPP,DEVICE> & L) void GivensFGFT<FPP,DEVICE,FPP2>::update_L_second(Faust::Vect<FPP,DEVICE>& L_vec_p, Faust::Vect<FPP,DEVICE>& L_vec_q, const FPP2& c, const FPP2& s, int p, int q, Faust::MatDense<FPP,DEVICE> & L)
{ {
Faust::Vect<FPP,DEVICE> tmp, tmp2; Faust::Vect<FPP,DEVICE> tmp, tmp2;
/*========== L *= S */ /*========== L *= S */
......
...@@ -57,8 +57,8 @@ namespace Faust { ...@@ -57,8 +57,8 @@ namespace Faust {
* Computes the coefficients of the last selected rotation matrix to be put later in current iteration factor. * Computes the coefficients of the last selected rotation matrix to be put later in current iteration factor.
*/ */
void update_fact(); void update_fact();
void update_L(MatSparse<FPP,Cpu> &L); void update_L(Faust::MatSparse<FPP,Cpu> &L);
void update_L(MatDense<FPP,Cpu> &L); void update_L(Faust::MatDense<FPP,Cpu> &L);
/** /**
* Constructs the current factor after computing all the coefficients (of rotation matrices) in temporary buffers (see update_fact()). * Constructs the current factor after computing all the coefficients (of rotation matrices) in temporary buffers (see update_fact()).
*/ */
......
...@@ -167,7 +167,7 @@ void GivensFGFTParallel<FPP,DEVICE,FPP2>::update_fact() ...@@ -167,7 +167,7 @@ void GivensFGFTParallel<FPP,DEVICE,FPP2>::update_fact()
} }
template<typename FPP, Device DEVICE, typename FPP2> template<typename FPP, Device DEVICE, typename FPP2>
void GivensFGFTParallel<FPP,DEVICE,FPP2>::update_L(MatDense<FPP,Cpu> & L) void GivensFGFTParallel<FPP,DEVICE,FPP2>::update_L(Faust::MatDense<FPP,Cpu> & L)
{ {
// L = S'*L*S // L = S'*L*S
//#undef OPT_UPDATE_L //#undef OPT_UPDATE_L
...@@ -236,7 +236,7 @@ void GivensFGFTParallel<FPP,DEVICE,FPP2>::update_L(MatDense<FPP,Cpu> & L) ...@@ -236,7 +236,7 @@ void GivensFGFTParallel<FPP,DEVICE,FPP2>::update_L(MatDense<FPP,Cpu> & L)
} }
template<typename FPP, Device DEVICE, typename FPP2> template<typename FPP, Device DEVICE, typename FPP2>
void GivensFGFTParallel<FPP,DEVICE,FPP2>::update_L(MatSparse<FPP,Cpu> & L) void GivensFGFTParallel<FPP,DEVICE,FPP2>::update_L(Faust::MatSparse<FPP,Cpu> & L)
{ {
// L = S'*L*S // L = S'*L*S
this->facts[this->ite].multiply(L, 'T'); this->facts[this->ite].multiply(L, 'T');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment