Mentions légales du service

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

Minor changes in misc/test/C++ (comments and outputs).

parent b21c3cab
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
misc/test/src/C++/faust_matdense_conjugate.cpp.in
+ 0
− 5
View file @ c0db9a9f
......@@ -15,11 +15,6 @@ int main(int argc, char* argv[])
faust_unsigned_int dim1 = 3;
faust_unsigned_int dim2 = 4;
/* initilisation of the factors of the Faust */
// factor 1
MatDense<FPP,Cpu>* M;
MatDense<FPP,Cpu> M_copy;
M = MatDense<FPP,Cpu>::randMat(dim1,dim2);
......
misc/test/src/C++/faust_matsparse_index_op.cpp.in
+ 1
− 1
View file @ c0db9a9f
#include "faust_MatSparse.h"
#include <iostream>
/** \brief unitary test for MatDense conjugate
/** \brief unitary test for MatSparse () overload
*/
typedef @TEST_FPP@ FPP;
......
misc/test/src/C++/faust_matsparse_mul.cpp.in
+ 1
− 5
View file @ c0db9a9f
#include "faust_MatSparse.h"
#include <iostream>
/** \brief unitary test for MatDense conjugate
/** \brief unitary test for MatSparse
*/
typedef @TEST_FPP@ FPP;
......@@ -16,10 +16,6 @@ int main(int argc, char* argv[])
faust_unsigned_int dim2 = 5;
/* initilisation of the factors of the Faust */
// factor 1
MatDense<FPP,Cpu> M2, M1;
Faust::MatSparse<FPP,Cpu>* M_sp1, *M_sp2;
M_sp1 = Faust::MatSparse<FPP,Cpu>::randMat(dim1,dim2, .5, false);
......
misc/test/src/C++/faust_multiplication.cpp.in
+ 32
− 33
View file @ c0db9a9f
......@@ -51,13 +51,12 @@
#include <iomanip>
/** \brief Time Measurement between a given matrix and its Faust factorization
* \param MatrixFilename : a dense ma trix is loaded from this file
* \param MatrixFilename : a dense matrix is loaded from this file
* \param transposedMatrix : -value 'N' (default value), the matrix stored in MatrixFilename is factorized
-value 'T' , the transposed matrix is factorized *\param FaustFilename : a .mat (MATLAB file) where a Faust representing the dense matrix (or its transposed cf transposeMatrix)
(you can passed as many FaustFilename as you want
example : faust_multiplication_@TEST_FPP@ matrix.mat N faust1.mat faust2.mat
-value 'T' , the transposed matrix is factorized
* \param FaustFilename : a .mat (MATLAB file) where a Faust representing the dense matrix (or its transposed cf transposeMatrix)
(you can passed as many FaustFilename as you want
example : faust_multiplication_@TEST_FPP@ matrix.mat N faust1.mat faust2.mat
**/
......@@ -78,37 +77,37 @@ int main(int argc, char* argv[])
if (argc <= 2)
{
cerr << "At least 2 input must be given " << endl;
cerr << "At least 2 input arguments must be given " << endl;
cerr << "a .mat file storing a matrix and a parameter (value N or T) " << endl;
exit(EXIT_FAILURE);
exit(EXIT_FAILURE);
}
// initialisation of the dense matrix
std::cout<<"loading dense matrix"<<std::endl;
string matDenseFilename = argv[1];
Faust::MatDense<FPP,Cpu> M;
init_faust_mat_from_matio(M,matDenseFilename.c_str(),"matrix");
char transposedMatrix = argv[2][0];
if ((transposedMatrix != 'N') && (transposedMatrix != 'T'))
{
cerr << "transposedMatrix value is "<<transposedMatrix<< endl;
cerr << "transposedMatrix value is "<<transposedMatrix<< endl;
cerr << "transposedMatrix parameter must be equal to N or T " << endl;
exit(EXIT_FAILURE);
}
// transposed the matrix if needed
if (transposedMatrix == 'T')
M.transpose();
int nbRow=M.getNbRow();
int nbRow=M.getNbRow();
int nbCol=M.getNbCol();
// initialisation of the different Faust
......@@ -123,56 +122,56 @@ int main(int argc, char* argv[])
std::cout<<"loading faust from "<<faustFilename[i].c_str()<<std::endl;
init_faust_core_from_matiofile(listFaust[i],faustFilename[i].c_str(),"facts");
if ((listFaust[i].getNbRow() != nbRow) || (listFaust[i].getNbCol() != nbCol))
{
{
cerr << "imported Faust doesn't have the same size as the Dense matrix it represents" << endl;
exit(EXIT_FAILURE);
}
}
}
/**** MULTIPLICATION ******/
//int nbMultiplication = 10000;
int nbMultiplication = 100;
float percentage = 0;
Faust::Timer t_dense;
std::cout<<std::endl<<" multiplication "<<std::endl;
std::vector<Faust::Timer> t_faust;
t_faust.resize(nbFaust);
for (int i=0;i<nbMultiplication;i++)
{
{
if (float(i)/float(nbMultiplication) > percentage)
{
{
percentage+=0.1;
std::cout<<"%"<<percentage*100<<std::endl;
}
//std::cout<<i+1<<"/"<<nbMultiplication<<std::endl;
//std::cout<<i+1<<"/"<<nbMultiplication<<std::endl;
Faust::Vect<FPP,Cpu> x(nbCol);
Faust::Vect<FPP,Cpu> y;
Faust::Vect<FPP,Cpu> y;
for (int k=0;k<nbCol;k++)
x[k]=k;
t_dense.start();
y=M*x;
t_dense.stop();
for (int l=0;l<nbFaust;l++)
{
t_faust[l].start();
{
t_faust[l].start();
y=listFaust[l]*x;
t_faust[l].stop();
}
}
std::cout<<std::endl<<"DENSE tps : "<<t_dense.get_time()<<std::endl;
std::cout<<std::endl<<"DENSE tps : "<<t_dense.get_time()<<std::endl;
std::cout<<" FAUST : "<<std::endl;
for (int i=0;i<listFaust.size();i++)
......@@ -184,6 +183,6 @@ int main(int argc, char* argv[])
#endif
std::cout<<std::endl<<std::endl;
}
}
misc/test/src/C++/faust_multiplication_gpu.cpp.in
+ 20
− 20
View file @ c0db9a9f
......@@ -78,22 +78,22 @@ int main(int argc, char* argv[])
if (argc <= 1)
{
cerr << "At least one input file (extension \".mat\") storing a dense matrix must be given" << endl;
exit(EXIT_FAILURE);
exit(EXIT_FAILURE);
}
// initialisation of the dense matrix
std::cout<<"loading dense matrix"<<std::endl;
string matDenseFilename = argv[1];
Faust::MatDense<FPP,Gpu> M;
init_faust_mat_from_matio(M,matDenseFilename.c_str(),"X_fixed");
int nbRow=M.getNbRow();
int nbRow=M.getNbRow();
int nbCol=M.getNbCol();
// initialisation of the different Faust
// modif AL
std::vector<Faust::Transform<FPP,Gpu> > listFaust;
//Faust::MatDense<FPP,Gpu> const listFaust;
//Faust::MatDense<FPP,Gpu> const listFaust;
int nbFaust = argc - 2;
std::vector<string> faustFilename(nbFaust);
......@@ -105,10 +105,10 @@ int main(int argc, char* argv[])
std::cout<<"loading faust from "<<faustFilename[i].c_str()<<std::endl;
init_faust_core_from_matiofile(listFaust[i],faustFilename[i].c_str(),"facts");
if ((listFaust[i].getNbRow() != nbRow) || (listFaust[i].getNbCol() != nbCol))
{
{
cerr << "imported Faust doesn't have the same size as the Dense matrix it represents" << endl;
exit(EXIT_FAILURE);
}
}
}
// initialisation CUDA environment
......@@ -123,7 +123,7 @@ int main(int argc, char* argv[])
int nbMultiplication = 10000;
//multiplication
Faust::Timer_gpu t_dense;
std::cout<<std::endl<<" multiplication "<<std::endl;
......@@ -131,24 +131,24 @@ int main(int argc, char* argv[])
t_faust.resize(nbFaust);
for (int i=0;i<nbMultiplication;i++)
{
//std::cout<<i+1<<"/"<<nbMultiplication<<std::endl;
{
//std::cout<<i+1<<"/"<<nbMultiplication<<std::endl;
Faust::Vect<FPP,Gpu> x(nbCol);
Faust::Vect<FPP,Gpu> y;
Faust::Vect<FPP,Gpu> y;
//for (int k=0;k<nbCol;k++)
//x[k]=k;
x.setOnes();
t_dense.start();
//y=M*x;
Faust::gemv(M,x,y,'N',blasHandle);
t_dense.stop();
for (int l=0;l<nbFaust;l++)
{
t_faust[l].start();
{
t_faust[l].start();
//y=listFaust[l]*x;
Faust::gemv(listFaust[l],x,y,'N',blasHandle);
t_faust[l].stop();
......@@ -156,10 +156,10 @@ int main(int argc, char* argv[])
}
std::cout<<std::endl<<"DENSE tps : "<<t_dense.get_time()<<std::endl;
std::cout<<std::endl<<"DENSE tps : "<<t_dense.get_time()<<std::endl;
std::cout<<" FAUST : "<<std::endl;
for (int i=0;i<listFaust.size();i++)
......@@ -171,6 +171,6 @@ int main(int argc, char* argv[])
#endif
std::cout<<std::endl<<std::endl;
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment