Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 7b9606b2 authored by Nicolas Bellot's avatar Nicolas Bellot Committed by hhakim
Browse files

timers ajouté pour la classe Faust::Transform<FPP,Cpu>

parent 0df5a8de
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/faust_linear_operator/CPU/faust_Transform.h
+ 16
− 5
View file @ 7b9606b2
......@@ -104,7 +104,14 @@ namespace Faust
void scalarMultiply(const FPP scalar);
FPP spectralNorm(const int nbr_iter_max, FPP threshold, int &flag) const;
~Transform(){}
Faust::Vect<FPP,Cpu> multiply(const Faust::Vect<FPP,Cpu> x,const char opThis='N') const;
// if measure of time is down Faust::Transform<FPP,Cpu> is no longer constant during multiplication because a measure of time is an attribute to the faust::Transform
#ifdef __COMPILE_TIMERS__
Faust::Vect<FPP,Cpu> multiply(const Faust::Vect<FPP,Cpu> x,const char opThis='N');
#else
Faust::Vect<FPP,Cpu> multiply(const Faust::Vect<FPP,Cpu> x,const char opThis='N') const;
#endif
Faust::MatDense<FPP,Cpu> multiply(const Faust::MatDense<FPP,Cpu> A,const char opThis='N') const;
......@@ -114,8 +121,10 @@ namespace Faust
void operator*=(const Transform<FPP,Cpu>& f){multiply(f);};
/// add the sparse matrix S to this->data
void operator*=(const Faust::MatSparse<FPP,Cpu>& S){push_back(S);totalNonZeros+=S.getNonZeros();}
#ifdef __COMPILE_TIMERS__
void print_timers() const;
#endif
......@@ -124,8 +133,10 @@ namespace Faust
long long int totalNonZeros;
static const char * m_className;
std::vector<Faust::MatSparse<FPP,Cpu> > data;
#ifdef __COMPILE_TIMERS__
std::vector<Faust::Timer> t_multiply_vector;
#endif
......
src/faust_linear_operator/CPU/faust_Transform.hpp
+ 104
− 7
View file @ 7b9606b2
......@@ -117,13 +117,25 @@ template<typename FPP>
Faust::Transform<FPP,Cpu>::Transform() :
data(std::vector<Faust::MatSparse<FPP,Cpu> >()),
totalNonZeros(0)
{}
{
#ifdef __COMPILE_TIMERS__
t_multiply_vector.resize(0);
#endif
}
template<typename FPP>
Faust::Transform<FPP,Cpu>::Transform(const Faust::Transform<FPP,Cpu> & A) :
data(A.data),
totalNonZeros(A.totalNonZeros)
{}
{
#ifdef __COMPILE_TIMERS__
this.t_multiply_vector.resize(data.size());
#endif
}
template<typename FPP>
Faust::Transform<FPP,Cpu>::Transform(const std::vector<Faust::MatSparse<FPP,Cpu> > & facts, const FPP lambda_ /* =1.0 */) :
......@@ -136,6 +148,9 @@ Faust::Transform<FPP,Cpu>::Transform(const std::vector<Faust::MatSparse<FPP,Cpu>
if(lambda_ != 1.0 && data.size()>0)
(data[0]) *= lambda_;
#ifdef __COMPILE_TIMERS__
this.t_multiply_vector.resize(data.size());
#endif
this->check_factors_validity();
}
......@@ -213,6 +228,10 @@ void Faust::Transform<FPP,Cpu>::init_from_file(const char* filename)
}
fscanf(fp,"\n");
updateNonZeros();
#ifdef __COMPILE_TIMERS__
this.t_multiply_vector.resize(data.size());
#endif
}
template<typename FPP>
......@@ -236,6 +255,9 @@ Faust::Transform<FPP,Cpu>::Transform(const std::vector<Faust::MatDense<FPP,Cpu>
data.push_back(spfact);
totalNonZeros += data[i].getNonZeros();
}
#ifdef __COMPILE_TIMERS__
this.t_multiply_vector.resize(data.size());
#endif
}
......@@ -375,6 +397,9 @@ void Faust::Transform<FPP,Cpu>::multiply(const Faust::Transform<FPP,Cpu> & A) //
data.insert(data.end(),A.data.begin(),A.data.end());totalNonZeros+=A.totalNonZeros;
}
}
#ifdef __COMPILE_TIMERS__
this.t_multiply_vector.resize(data.size());
#endif
}
......@@ -433,6 +458,10 @@ void Faust::Transform<FPP,Cpu>::push_back(const Faust::MatSparse<FPP,Cpu>& S)
}
data.push_back(S);
totalNonZeros += S.getNonZeros();
#ifdef __COMPILE_TIMERS__
this->t_multiply_vector.push_back(Faust::Timer());
#endif
}
......@@ -446,6 +475,10 @@ void Faust::Transform<FPP,Cpu>::push_first(const Faust::MatSparse<FPP,Cpu>& S)
}
data.insert(data.begin(),S);
totalNonZeros += S.getNonZeros();
#ifdef __COMPILE_TIMERS__
this->t_multiply_vector.insert(this->t_multiply_vector().begin(),Faust::Timer());
#endif
}
......@@ -457,6 +490,9 @@ void Faust::Transform<FPP,Cpu>::pop_back(Faust::MatSparse<FPP,Cpu>& S)
S = data[size()-1];
data.pop_back();
totalNonZeros -= S.getNonZeros();
#ifdef __COMPILE_TIMERS__
this->t_multiply_vector.pop_back();
#endif
}
handleWarning("Faust::Transform<FPP,Cpu>::pop_back : empty Faust::Transform");
}
......@@ -469,6 +505,9 @@ void Faust::Transform<FPP,Cpu>::pop_first(Faust::MatSparse<FPP,Cpu>& S)
S = data[0];
data.erase(data.begin());
totalNonZeros -= S.getNonZeros();
#ifdef __COMPILE_TIMERS__
this->t_multiply_vector.erase(this->t_multiply_vector.begin());
#endif
}
handleWarning("Faust::Transform<FPP,Cpu>::pop_back : empty Faust::Transform");
}
......@@ -495,12 +534,17 @@ void Faust::Transform<FPP,Cpu>::transpose()
data[i].transpose();
}
}
template<typename FPP>
Faust::Vect<FPP,Cpu> Faust::Transform<FPP,Cpu>::multiply(const Faust::Vect<FPP,Cpu> x,const char opThis) const
#ifdef __COMPILE_TIMERS__
Faust::Vect<FPP,Cpu> Faust::Transform<FPP,Cpu>::multiply(const Faust::Vect<FPP,Cpu> x,const char opThis)
#else
Faust::Vect<FPP,Cpu> Faust::Transform<FPP,Cpu>::multiply(const Faust::Vect<FPP,Cpu> x,const char opThis) const
#endif
{
#ifdef __COMPILE_TIMERS__
if (this->t_multiply_vector.size() != this->data.size())
handleError(m_className,"multiply : invalid t_multiply_vector size to measure time");
#endif
if (size() == 0)
handleWarning("Faust::Transform<FPP,Cpu> : multiply : empty Faust::Transform<FPP,Cpu>");
......@@ -510,13 +554,30 @@ Faust::Vect<FPP,Cpu> Faust::Transform<FPP,Cpu>::multiply(const Faust::Vect<FPP,C
if (opThis == 'N')
{
for (int i=this->size()-1 ; i >= 0 ; i--)
{
#ifdef __COMPILE_TIMERS__
this->t_multiply_vector[i].start();
#endif
vec.multiplyLeft(data[i]);
#ifdef __COMPILE_TIMERS__
this->t_multiply_vector[i].stop();
#endif
}
}else
{
for (int i=0 ; i < this->size() ; i++)
{
#ifdef __COMPILE_TIMERS__
this->t_multiply_vector[i].start();
#endif
vec.multiplyLeft(data[i],opThis);
#ifdef __COMPILE_TIMERS__
this->t_multiply_vector[i].stop();
#endif
}
}
......@@ -608,5 +669,41 @@ void Faust::Transform<FPP,Cpu>::Display()const
cout<<endl;
}
#ifdef __COMPILE_TIMERS__
template<typename FPP>
void Faust::Transform<FPP,Cpu>::print_timers() const
{
std::cout << "timers in Faust::Transform :" << endl;
std::cout << "t_multiply_vector :" << endl;
float sum_tps=0;
for (int i=0;i<t_multiply_vector.size();i++)
sum_tps+=t_multiply_vector[i].get_time();
float current_time;
for (int i=0;i<t_multiply_vector.size();i++)
{
float current_time=t_multiply_vector[i].get_time();
std::cout<<" FACTOR "<<i<<", size "<<data[i].getNbRow()<<"x"<<data[i].getNbCol()<<" ,nnz "<<data[i].getNonZeros()<<std::endl;
std::cout<<" ,tps "<<current_time<<" ,% "<<100*current_time/sum_tps<< " ,nb_calls "<<t_multiply_vector[i].get_nb_call()<<std::endl;
}
std::cout<<" total tps "<<sum_tps<<std::endl;
}
#endif
#endif
src/faust_linear_operator/CPU/faust_Vect.hpp
+ 1
− 1
View file @ 7b9606b2
......@@ -222,7 +222,7 @@ void Faust::Vect<FPP,Cpu>::multiplyLeft(Faust::MatSparse<FPP,Cpu> const& S,cons
vec = S.mat.transpose() * vec;
#ifdef __COMPILE_TIMERS__
t_local_multiplyLeft.stop();
cout <<"0 "<<setprecision(10)<<t_local_multiplyLeft.get_time()<<endl;
//cout <<"0 "<<setprecision(10)<<t_local_multiplyLeft.get_time()<<endl;
t_local_multiplyLeft.reset();
#endif
......
src/faust_linear_operator/CPU/faust_transform_algebra.h
+ 7
− 3
View file @ 7b9606b2
......@@ -15,10 +15,14 @@ namespace Faust
template<typename FPP>
FPP power_iteration(const Faust::Transform<FPP,Cpu> & A, const int nbr_iter_max,FPP threshold, int & flag);
// if measure of time is down Faust::Transform<FPP,Cpu> is no longer constant during multiplication because a measure of time is an attribute to the faust::Transform
template<typename FPP>
Faust::Vect<FPP,Cpu> operator*(const Faust::Transform<FPP,Cpu>& f, const Faust::Vect<FPP,Cpu> & v);
#ifdef __COMPILE_TIMERS__
Faust::Vect<FPP,Cpu> operator*(Faust::Transform<FPP,Cpu>& f, const Faust::Vect<FPP,Cpu> & v);
#else
Faust::Vect<FPP,Cpu> operator*(const Faust::Transform<FPP,Cpu>& f, const Faust::Vect<FPP,Cpu> & v);
#endif
template<typename FPP>
Faust::MatDense<FPP,Cpu> operator*(const Faust::Transform<FPP,Cpu>& f, const Faust::MatDense<FPP,Cpu> & M);
......
src/faust_linear_operator/CPU/faust_transform_algebra.hpp
+ 5
− 3
View file @ 7b9606b2
......@@ -68,10 +68,12 @@ FPP Faust::power_iteration(const Faust::Transform<FPP,Cpu> & A, const int nbr_i
//////////// modif AL AL
template<typename FPP>
Faust::Vect<FPP,Cpu> Faust::operator*(const Faust::Transform<FPP,Cpu>& f, const Faust::Vect<FPP,Cpu>& v)
#ifdef __COMPILE_TIMERS__
Faust::Vect<FPP,Cpu> Faust::operator*(Faust::Transform<FPP,Cpu>& f, const Faust::Vect<FPP,Cpu> & v)
#else
Faust::Vect<FPP,Cpu> Faust::operator*(const Faust::Transform<FPP,Cpu>& f, const Faust::Vect<FPP,Cpu> & v)
#endif
{
return f.multiply(v);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment