changing function names

src/faust_linear_operator/CPU/faust_MatDense.hpp

@@ -15,7 +15,7 @@
 #include "faust_constant.h"
 
 #ifdef __GEMM_WITH_OPENBLAS__
-	#include "cblas_algebra.h"
+	#include "faust_cblas_algebra.h"
 #endif
 
 

src/faust_linear_operator/CPU/linear_algebra.hpp

@@ -15,7 +15,7 @@
 
 
 #ifdef __GEMM_WITH_OPENBLAS__
-	#include "cblas_algebra.h"
+	#include "faust_cblas_algebra.h"
 #endif
 
 
@@ -250,7 +250,7 @@ void gemv(const Faust::MatDense<FPP,Cpu> & A,const Faust::Vect<FPP,Cpu> & x,Faus
 	}
 	#else
 
-		cblas_gemv<FPP>(CblasColMajor,transA,A.getNbRow(),A.getNbCol(),alpha,A.getData(),A.getNbRow(),px->getData(),1,beta,y.getData(),1);
+		Faust::cblas_gemv<FPP>(CblasColMajor,transA,A.getNbRow(),A.getNbCol(),alpha,A.getData(),A.getNbRow(),px->getData(),1,beta,y.getData(),1);
 	#endif
 
 
@@ -406,7 +406,7 @@ void gemm_core(const Faust::MatDense<FPP,Cpu> & A,const Faust::MatDense<FPP,Cpu>
 			}
 		#else
 			 FPP beta = 0.0;
-			 cblas_gemm<FPP>(CblasColMajor, transA, transB, (int) C.dim1, (int)  C.dim2, (int) nbColOpA, (FPP) alpha, (FPP*) A.getData(), (int) A.dim1, (FPP*) B.getData(), (int) B.dim1,(FPP) beta, (FPP*) C.getData(),(int) C.dim1);
+			 Faust::cblas_gemm<FPP>(CblasColMajor, transA, transB, (int) C.dim1, (int)  C.dim2, (int) nbColOpA, (FPP) alpha, (FPP*) A.getData(), (int) A.dim1, (FPP*) B.getData(), (int) B.dim1,(FPP) beta, (FPP*) C.getData(),(int) C.dim1);
 
 		#endif
 
@@ -492,7 +492,7 @@ void gemm_core(const Faust::MatDense<FPP,Cpu> & A,const Faust::MatDense<FPP,Cpu>
 					C.mat = alpha * A.mat.transpose() * B.mat.transpose() + beta * C.mat;
 			}
 		#else
-			cblas_gemm<FPP>(CblasColMajor, transA, transB, (int) C.dim1,(int)  C.dim2,(int)  nbColOpA,(FPP) alpha,(FPP*)  A.getData(), (int) A.dim1,(FPP*) B.getData(),(int) B.dim1, (FPP) beta, (FPP*) C.getData(), (int)C.dim1);
+			Faust::cblas_gemm<FPP>(CblasColMajor, transA, transB, (int) C.dim1,(int)  C.dim2,(int)  nbColOpA,(FPP) alpha,(FPP*)  A.getData(), (int) A.dim1,(FPP*) B.getData(),(int) B.dim1, (FPP) beta, (FPP*) C.getData(), (int)C.dim1);
 
 
 

src/faust_linear_operator/cblas_algebra.cpp

-#include "faust_constant.h"
-
-#ifdef __GEMM_WITH_OPENBLAS__
-#include "cblas_algebra.h" 
-
-
-// void cblas_gemm(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa, const CBLAS_TRANSPOSE transb, const int dim1,const int dim2,const int nbColOpA, const T alpha, const T* Adata,const int lda,const T* Bdata,const int ldb, const T beta, T* Cdata, const int ldc);
-template<> void cblas_gemm<float>(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa, const CBLAS_TRANSPOSE transb, const int dim1,const int dim2,const int nbColOpA, const float alpha, const float* Adata,const int lda,const float* Bdata,const int ldb, const float beta, float* Cdata, const int ldc)
-{
-	cblas_sgemm(order,transa,transb,dim1,dim2,nbColOpA,alpha,Adata,lda,Bdata,ldb,beta,Cdata,ldc);
-	#ifdef	FAUST_VERBOSE
-		std::cout<<"*** inside float cblas_gemm"<<std::endl;
-	#endif
-}
-
-template<> void cblas_gemm<double>(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa, const CBLAS_TRANSPOSE transb, const int dim1,const int dim2,const int nbColOpA, const double alpha, const double* Adata,const int lda,const double* Bdata,const int ldb, const double beta, double* Cdata, const int ldc)
-{
-	cblas_dgemm(order,transa,transb,dim1,dim2,nbColOpA,alpha,Adata,lda,Bdata,ldb,beta,Cdata,ldc);
-	#ifdef	FAUST_VERBOSE
-		std::cout<<"*** inside double cblas_gemm"<<std::endl;
-	#endif	
-	
-}
-
-
-template<> void cblas_gemv<float>(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa,const int dim1,const int dim2,const float alpha,const float* Adata,const int lda,const float* Xdata,const int incX,const float beta,float* Ydata,const int incY)
-{
-	cblas_sgemv(order,transa,dim1,dim2,alpha,Adata,lda,Xdata,incX,beta,Ydata,incY);
-	#ifdef	FAUST_VERBOSE	
-		std::cout<<"***inside float cblas_gemv"<<std::endl;
-	#endif	
-}
-
-template<> void cblas_gemv<double>(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa,const int dim1,const int dim2,const double alpha,const double* Adata,const int lda,const double* Xdata,const int incX,const double beta,double* Ydata,const int incY)
-{
-	cblas_dgemv(order,transa,dim1,dim2,alpha,Adata,lda,Xdata,incX,beta,Ydata,incY);
-	#ifdef	FAUST_VERBOSE
-		std::cout<<"***inside double cblas_gemv"<<std::endl;
-	#endif
-}
-
-
-#endif

src/faust_linear_operator/cblas_algebra.h

-#ifdef __GEMM_WITH_OPENBLAS__
-#ifndef CBLAS_ALGEBRA_H
-#define CBLAS_ALGEBRA_H
-
-#include "cblas.h"
-#include <iostream>
-
-/*! \brief cblas_gemm call the function cblas_sgemm or cblas_dgemm, depend to the precision (double or float), from the external library openBLAS    <br> 
-* This function is used to multiply the matrices.
-*/
-template<typename T>
-void cblas_gemm(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa, const CBLAS_TRANSPOSE transb, const int dim1,const int dim2,const int nbColOpA, const T alpha, const T* Adata,const int lda,const T* Bdata,const int ldb, const T beta, T* Cdata, const int ldc);
-
-// cblas_sgemv(CblasColMajor,transA,A.getNbRow(),A.getNbCol(),alpha,A.getData(),A.getNbRow(),px->getData(),1,beta,y.getData(),1);
-
-
-/*! \brief cblas_gemv call the function cblas_sgemv or cblas_dgemv, depend to the precision (double or float), from the external library openBLAS    <br> 
-* This function is used to multiply the matrices.
-*/
-template<typename T>
-void cblas_gemv(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa,const int dim1,const int dim2,const T alpha,const T* Adata,const int lda,const T* Xdata,const int incX,const T beta,T* Ydata,const int incY);
-
-#endif
-#endif
-
-

src/faust_linear_operator/faust_cblas_algebra.cpp

+#include "faust_constant.h"
+
+#ifdef __GEMM_WITH_OPENBLAS__
+#include "faust_cblas_algebra.h"
+
+namespace Faust
+{
+
+    ////  void Faust::cblas_gemm(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa, const CBLAS_TRANSPOSE transb, const int dim1,const int dim2,const int nbColOpA, const T alpha, const T* Adata,const int lda,const T* Bdata,const int ldb, const T beta, T* Cdata, const int ldc);
+    template<> void cblas_gemm<float>(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa, const CBLAS_TRANSPOSE transb, const int dim1,const int dim2,const int nbColOpA, const float alpha, const float* Adata,const int lda,const float* Bdata,const int ldb, const float beta, float* Cdata, const int ldc)
+    {
+        cblas_sgemm(order,transa,transb,dim1,dim2,nbColOpA,alpha,Adata,lda,Bdata,ldb,beta,Cdata,ldc);
+        #ifdef	FAUST_VERBOSE
+            std::cout<<"*** inside float Faust::cblas_gemm"<<std::endl;
+        #endif
+    }
+
+    template<> void cblas_gemm<double>(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa, const CBLAS_TRANSPOSE transb, const int dim1,const int dim2,const int nbColOpA, const double alpha, const double* Adata,const int lda,const double* Bdata,const int ldb, const double beta, double* Cdata, const int ldc)
+    {
+        cblas_dgemm(order,transa,transb,dim1,dim2,nbColOpA,alpha,Adata,lda,Bdata,ldb,beta,Cdata,ldc);
+        #ifdef	FAUST_VERBOSE
+            std::cout<<"*** inside double Faust::cblas_gemm"<<std::endl;
+        #endif
+
+    }
+
+    template<> void cblas_gemv<float>(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa,const int dim1,const int dim2,const float alpha,const float* Adata,const int lda,const float* Xdata,const int incX,const float beta,float* Ydata,const int incY)
+    {
+        cblas_sgemv(order,transa,dim1,dim2,alpha,Adata,lda,Xdata,incX,beta,Ydata,incY);
+        #ifdef	FAUST_VERBOSE
+            std::cout<<"***inside float Faust::cblas_gemv"<<std::endl;
+        #endif
+    }
+
+    template<> void cblas_gemv<double>(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa,const int dim1,const int dim2,const double alpha,const double* Adata,const int lda,const double* Xdata,const int incX,const double beta,double* Ydata,const int incY)
+    {
+        cblas_dgemv(order,transa,dim1,dim2,alpha,Adata,lda,Xdata,incX,beta,Ydata,incY);
+        #ifdef	FAUST_VERBOSE
+            std::cout<<"***inside double Faust::cblas_gemv"<<std::endl;
+        #endif
+    }
+
+}
+
+#endif

src/faust_linear_operator/faust_cblas_algebra.h

+#ifdef __GEMM_WITH_OPENBLAS__
+#ifndef CBLAS_ALGEBRA_H
+#define CBLAS_ALGEBRA_H
+
+#include "cblas.h"
+#include <iostream>
+
+namespace Faust
+{
+
+    /*! \fn Faust::cblas_gemm
+    *   \brief call the function cblas_sgemm or cblas_dgemm, depend to the precision (double or float), from the external library openBLAS    <br>
+    * This function is used to multiply the matrices.
+    */
+    template<typename T>
+    void cblas_gemm(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa, const CBLAS_TRANSPOSE transb, const int dim1,const int dim2,const int nbColOpA, const T alpha, const T* Adata,const int lda,const T* Bdata,const int ldb, const T beta, T* Cdata, const int ldc);
+
+// cblas_sgemv(CblasColMajor,transA,A.getNbRow(),A.getNbCol(),alpha,A.getData(),A.getNbRow(),px->getData(),1,beta,y.getData(),1);
+
+
+    /*! \fn Faust::cblas_gemv
+    *   \brief call the function cblas_sgemv or cblas_dgemv, depend to the precision (double or float), from the external library openBLAS    <br>
+    * This function is used to multiply the matrices.
+    */
+    template<typename T>
+    void cblas_gemv(const CBLAS_ORDER order,const CBLAS_TRANSPOSE transa,const int dim1,const int dim2,const T alpha,const T* Adata,const int lda,const T* Xdata,const int incX,const T beta,T* Ydata,const int incY);
+}
+
+#endif
+#endif
+
+