diff options
| -rw-r--r-- | src/eigenlib.h | 4 | ||||
| -rw-r--r-- | src/fastblas.cpp | 5 | ||||
| -rw-r--r-- | src/fastopenblas.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/eigenlib.h b/src/eigenlib.h index b29fa63..7fb69ad 100644 --- a/src/eigenlib.h +++ b/src/eigenlib.h @@ -19,9 +19,9 @@ #ifndef __EIGENLIB_H__ #define __EIGENLIB_H__ -#include <vector> +// #include <vector> -using namespace std; +// using namespace std; void eigenlib_dgemm(const char *TransA, const char *TransB, const double alpha, const gsl_matrix *A, const gsl_matrix *B, const double beta, diff --git a/src/fastblas.cpp b/src/fastblas.cpp index 94640a5..6180683 100644 --- a/src/fastblas.cpp +++ b/src/fastblas.cpp @@ -17,6 +17,7 @@ */ #include "gsl/gsl_matrix.h" +#include <algorithm> // std::min #include <cmath> #include <iomanip> #include <vector> @@ -79,6 +80,7 @@ void fast_cblas_dgemm(const enum CBLAS_ORDER Order, #ifndef NDEBUG size_t i,j; if (is_debug_mode()) { + #ifdef DISABLED printf (" Top left corner of matrix A: \n"); for (i=0; i<min(M,6); i++) { for (j=0; j<min(K,6); j++) { @@ -102,6 +104,7 @@ void fast_cblas_dgemm(const enum CBLAS_ORDER Order, } printf ("\n"); } + #endif cout << scientific << setprecision(3) << "* RowMajor " << Order << "\t" ; cout << "transA " << TransA << "\t" ; @@ -126,6 +129,7 @@ void fast_cblas_dgemm(const enum CBLAS_ORDER Order, cblas_dgemm(Order,TransA,TransB,M,N,K,alpha,A,lda,B,ldb,beta,C,ldc); #ifndef NDEBUG + #ifdef DISABLED if (is_debug_mode()) { printf (" Top left corner of matrix A (cols=k %i, rows=m %i): \n",K,M); for (i=0; i<min(M,6); i++) { @@ -151,6 +155,7 @@ void fast_cblas_dgemm(const enum CBLAS_ORDER Order, printf ("\n"); } } + #endif #endif // NDEBUG } diff --git a/src/fastopenblas.h b/src/fastopenblas.h index 826fe6e..969a2e0 100644 --- a/src/fastopenblas.h +++ b/src/fastopenblas.h @@ -20,3 +20,5 @@ void fast_cblas_dgemm(const enum CBLAS_ORDER Order, const double beta, double *C, const size_t ldc); + +#endif // __FASTOPENBLAS_H_ |