diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-06-04 09:15:22 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-06-04 09:15:22 +0200 |
| commit | acc761cf0c81a75b23247d61b7820f5961b1352a (patch) | |
| tree | f6511079aeee1426f8a85f2cd53af82648b1fcda /bench/btl | |
| parent | ea1190486ffd0eecbe11551cb715bc52a023cf35 (diff) | |
| parent | f56d452c7edee82f2d50537dee7a9bb588f94991 (diff) | |
Merged in FlorianGeorge/eigen_blaze_fork_2 (pull request PR-60)
Use trans(X) instead of X.transpose() in Blaze Benchmark
Diffstat (limited to 'bench/btl')
| -rw-r--r-- | bench/btl/libs/blaze/blaze_interface.hh | 8 | ||||
| -rw-r--r-- | bench/btl/libs/blaze/main.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bench/btl/libs/blaze/blaze_interface.hh b/bench/btl/libs/blaze/blaze_interface.hh index ed43ecdd4..ee1523944 100644 --- a/bench/btl/libs/blaze/blaze_interface.hh +++ b/bench/btl/libs/blaze/blaze_interface.hh @@ -85,15 +85,15 @@ public : } static inline void transposed_matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){ - X = A.transpose()*B.transpose(); + X = (trans(A)*trans(B)); } static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N){ - X = (A.transpose()*A); + X = (trans(A)*A); } static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N){ - X = (A*A.transpose()); + X = (A*trans(A)); } static inline void matrix_vector_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){ @@ -101,7 +101,7 @@ public : } static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){ - X = (A.transpose()*B); + X = (trans(A)*B); } static inline void axpy(const real coef, const gene_vector & X, gene_vector & Y, int N){ diff --git a/bench/btl/libs/blaze/main.cpp b/bench/btl/libs/blaze/main.cpp index 582a2956b..80e8f4eaa 100644 --- a/bench/btl/libs/blaze/main.cpp +++ b/bench/btl/libs/blaze/main.cpp @@ -29,7 +29,7 @@ int main() bench<Action_axpby<blaze_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT); bench<Action_matrix_vector_product<blaze_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT); -// bench<Action_atv_product<blaze_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT); + bench<Action_atv_product<blaze_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT); // bench<Action_matrix_matrix_product<blaze_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); // bench<Action_ata_product<blaze_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); // bench<Action_aat_product<blaze_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); |