From cff5e3ce9c1e09553125bce464b9c80f8bc2eb76 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Mon, 31 Mar 2008 16:20:06 +0000 Subject: Make use of the LazyBit, introduce .lazy(), remove lazyProduct. --- bench/basicbenchmark.h | 4 ++-- bench/benchmark_suite | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'bench') diff --git a/bench/basicbenchmark.h b/bench/basicbenchmark.h index c37d05ad4..3a6695e2f 100644 --- a/bench/basicbenchmark.h +++ b/bench/basicbenchmark.h @@ -13,13 +13,13 @@ void benchBasic_loop(const MatrixType& I, MatrixType& m, int iterations) { asm("#begin_bench_loop LazyEval"); if (MatrixType::SizeAtCompileTime!=Eigen::Dynamic) asm("#fixedsize"); - m = (I + 0.00005 * (m + m.lazyProduct(m))).eval(); + m = (I + 0.00005 * (m + m.lazy() * m)).eval(); } else if (Mode==OmpEval) { asm("#begin_bench_loop OmpEval"); if (MatrixType::SizeAtCompileTime!=Eigen::Dynamic) asm("#fixedsize"); - m = (I + 0.00005 * (m + m.lazyProduct(m))).evalOMP(); + m = (I + 0.00005 * (m + m.lazy() * m)).evalOMP(); } else { diff --git a/bench/benchmark_suite b/bench/benchmark_suite index 9ddfccbf6..a8fc6dced 100755 --- a/bench/benchmark_suite +++ b/bench/benchmark_suite @@ -1,17 +1,17 @@ #!/bin/bash -echo "Fixed size 3x3, ColumnMajor, -DNDEBUG" +echo "Fixed size 3x3, column-major, -DNDEBUG" $CXX -O3 -I .. -DNDEBUG benchmark.cpp -o benchmark && time ./benchmark >/dev/null -echo "Fixed size 3x3, ColumnMajor, with asserts" +echo "Fixed size 3x3, column-major, with asserts" $CXX -O3 -I .. benchmark.cpp -o benchmark && time ./benchmark >/dev/null -echo "Fixed size 3x3, RowMajor, -DNDEBUG" +echo "Fixed size 3x3, row-major, -DNDEBUG" $CXX -O3 -I .. -DEIGEN_DEFAULT_TO_ROW_MAJOR -DNDEBUG benchmark.cpp -o benchmark && time ./benchmark >/dev/null -echo "Fixed size 3x3, RowMajor, with asserts" +echo "Fixed size 3x3, row-major, with asserts" $CXX -O3 -I .. -DEIGEN_DEFAULT_TO_ROW_MAJOR benchmark.cpp -o benchmark && time ./benchmark >/dev/null -echo "Dynamic size 20x20, ColumnMajor, -DNDEBUG" +echo "Dynamic size 20x20, column-major, -DNDEBUG" $CXX -O3 -I .. -DNDEBUG benchmarkX.cpp -o benchmarkX && time ./benchmarkX >/dev/null -echo "Dynamic size 20x20, ColumnMajor, with asserts" +echo "Dynamic size 20x20, column-major, with asserts" $CXX -O3 -I .. benchmarkX.cpp -o benchmarkX && time ./benchmarkX >/dev/null -echo "Dynamic size 20x20, RowMajor, -DNDEBUG" +echo "Dynamic size 20x20, row-major, -DNDEBUG" $CXX -O3 -I .. -DEIGEN_DEFAULT_TO_ROW_MAJOR -DNDEBUG benchmarkX.cpp -o benchmarkX && time ./benchmarkX >/dev/null -echo "Dynamic size 20x20, RowMajor, with asserts" +echo "Dynamic size 20x20, row-major, with asserts" $CXX -O3 -I .. -DEIGEN_DEFAULT_TO_ROW_MAJOR benchmarkX.cpp -o benchmarkX && time ./benchmarkX >/dev/null -- cgit v1.2.3