Olena-patches October 2011

olena-patches@lrde.epita.fr

5 participants
78 discussions

last-svn-commit-558-gcb9bfa4 Simplify `fast_static' and `faster_static' cases in apps/bench/.

by Roland Levillain

* apps/bench/trait.hh (mln_static_qixter, mln_static_qixter_) (mln_static_fwd_qixter, mln_static_fwd_qixter_) (mln_static_bkd_qixter, mln_static_bkd_qixter_): Remove macros. (mln::static_fwd_qixter, mln::static_bkd_qixter): Remove traits. (mln::fwd_qixter< image2d<T>, static_window<D, n> >) (mln::fwd_qixter< const image2d<T>, static_window<D, n> >) (mln::bkd_qixter< image2d<T>, static_window<D, n> >) (mln::bkd_qixter< const image2d<T>, static_window<D, n> >): New traits. * apps/bench/dilation-lena.hh (fast_static::dilation): Delegate to fast::dilation. (faster_static::dilation): Delegate to faster::dilation. --- milena/ChangeLog | 19 ++++++++++++++ milena/apps/bench/dilation-lena.hh | 35 +++---------------------- milena/apps/bench/trait.hh | 49 +++++++++-------------------------- 3 files changed, 36 insertions(+), 67 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 77e5cc3..e3321f2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,22 @@ +2011-01-13 Roland Levillain <roland(a)lrde.epita.fr> + + Simplify `fast_static' and `faster_static' cases in apps/bench/. + + * apps/bench/trait.hh (mln_static_qixter, mln_static_qixter_) + (mln_static_fwd_qixter, mln_static_fwd_qixter_) + (mln_static_bkd_qixter, mln_static_bkd_qixter_): + Remove macros. + (mln::static_fwd_qixter, mln::static_bkd_qixter): + Remove traits. + (mln::fwd_qixter< image2d<T>, static_window<D, n> >) + (mln::fwd_qixter< const image2d<T>, static_window<D, n> >) + (mln::bkd_qixter< image2d<T>, static_window<D, n> >) + (mln::bkd_qixter< const image2d<T>, static_window<D, n> >): + New traits. + * apps/bench/dilation-lena.hh + (fast_static::dilation): Delegate to fast::dilation. + (faster_static::dilation): Delegate to faster::dilation. + 2010-12-10 Roland Levillain <roland(a)lrde.epita.fr> Ensure non implemented reconstructions on sets abort at run time. diff --git a/milena/apps/bench/dilation-lena.hh b/milena/apps/bench/dilation-lena.hh index 47e76dd..888affd 100644 --- a/milena/apps/bench/dilation-lena.hh +++ b/milena/apps/bench/dilation-lena.hh @@ -293,22 +293,8 @@ namespace fast_static template <typename I, typename W> mln_concrete(I) dilation(const I& input, const W& win) { - typedef mln_concrete(I) O; - O output; initialize(output, input); // Initialize output. - - mln_pixter(const I) pi(input); // Iterator on the pixels of `input'. - mln_pixter(O) po(output); // Iterator on the pixels of `output'. - mln_static_qixter(const I, W) q(pi, win); // Iterator on the neighbors of `p' w.r.t. `win'. - - for_all_2(pi, po) - { - // FIXME: Cheat: replace the accu::supremum by a maximum. - mln::accu::stat::max<mln_value(I)> sup; // Accumulator computing the supremum. - for_all(q) - sup.take(q.val()); - po.val() = sup.to_result(); - } - return output; + // `fast_static' has the same implementation as `fast'. + return ::fast::dilation(input, win); } } @@ -319,21 +305,8 @@ namespace faster_static template <typename I, typename W> mln_concrete(I) dilation(const I& input, const W& win) { - typedef mln_concrete(I) O; - O output; initialize(output, input); // Initialize output. - - mln_pixter(const I) p(input); // Iterator on the pixels of `input'. - mln_static_qixter(const I, W) q(p, win); // Iterator on the neighbors of `p' w.r.t. `win'. - - for_all(p) - { - // FIXME: Cheat: replace the accu::supremum by a maximum. - mln::accu::stat::max<mln_value(I)> sup; // Accumulator computing the supremum. - for_all(q) - sup.take(q.val()); - *(output.buffer() + p.offset()) = sup.to_result(); - } - return output; + // `faster_static' has the same implementation as `faster'. + return ::faster::dilation(input, win); } } diff --git a/milena/apps/bench/trait.hh b/milena/apps/bench/trait.hh index e3e5004..dd2d7e5 100644 --- a/milena/apps/bench/trait.hh +++ b/milena/apps/bench/trait.hh @@ -29,20 +29,10 @@ # include <mln/core/image/image2d.hh> # include <mln/metal/none.hh> +# include "apps/bench/static_window.hh" # include "apps/bench/static_dpoints_pixter.hh" -// FIXME: Move this into mln/core/macro.hh. -# define mln_static_fwd_qixter(I, W) typename mln::trait::static_fwd_qixter< I, W >::ret -# define mln_static_fwd_qixter_(I, W) mln::trait::static_fwd_qixter< I, W >::ret - -# define mln_static_bkd_qixter(I, W) typename mln::trait::static_bkd_qixter< I, W >::ret -# define mln_static_bkd_qixter_(I, W) mln::trait::static_bkd_qixter< I, W >::ret - -# define mln_static_qixter(I, W) mln_static_fwd_qixter(I, W) -# define mln_static_qixter_(I, W) mln_static_fwd_qixter_(I, W) - - // FIXME: Move this into mln/trait/ (and mln/core/image/?) namespace mln { @@ -52,41 +42,28 @@ namespace mln // qixter - template <typename I, typename W> - struct static_fwd_qixter - { - typedef metal::none ret; - }; - - template <typename I, typename W> - struct static_bkd_qixter - { - typedef metal::none ret; - }; - - - template <typename T, typename W> - struct static_fwd_qixter< image2d<T>, W > + template <typename T, typename D, unsigned n> + struct fwd_qixter< image2d<T>, static_window<D, n> > { - typedef static_dpoints_fwd_pixter< image2d<T>, W > ret; + typedef static_dpoints_fwd_pixter< image2d<T>, static_window<D, n> > ret; }; - template <typename T, typename W> - struct static_fwd_qixter< const image2d<T>, W > + template <typename T, typename D, unsigned n> + struct fwd_qixter< const image2d<T>, static_window<D, n> > { - typedef static_dpoints_fwd_pixter< const image2d<T>, W > ret; + typedef static_dpoints_fwd_pixter< const image2d<T>, static_window<D, n> > ret; }; - template <typename T, typename W> - struct static_bkd_qixter< image2d<T>, W > + template <typename T, typename D, unsigned n> + struct bkd_qixter< image2d<T>, static_window<D, n> > { - typedef static_dpoints_bkd_pixter< image2d<T>, W > ret; + typedef static_dpoints_bkd_pixter< image2d<T>, static_window<D, n> > ret; }; - template <typename T, typename W> - struct static_bkd_qixter< const image2d<T>, W > + template <typename T, typename D, unsigned n> + struct bkd_qixter< const image2d<T>, static_window<D, n> > { - typedef static_dpoints_bkd_pixter< const image2d<T>, W > ret; + typedef static_dpoints_bkd_pixter< const image2d<T>, static_window<D, n> > ret; }; // FIXME: Also handle mln::image1d<T> and mln::image3d<T>. -- 1.7.2.5

13 years, 2 months

last-svn-commit-557-gefb9eb1 WIP: Aesthetic changes in the output of apps/bench/list2table.

by Roland Levillain

--- milena/apps/bench/list2table | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/milena/apps/bench/list2table b/milena/apps/bench/list2table index 6ac42d0..0ba9dd7 100755 --- a/milena/apps/bench/list2table +++ b/milena/apps/bench/list2table @@ -2,6 +2,9 @@ set -e +# Do not use locales. +export LC_ALL=C + # Like read, but ignores empty values. readval() { @@ -14,7 +17,7 @@ for i in a1 b1 c1 d1 e1 \ a2 b2 c2 d2 e2 \ a3 b3 c3 d3 e3; \ do - eval $i=$(readval) + eval $i=$(printf "%.2f" $(readval)) done cat <<EOF @@ -24,7 +27,7 @@ cat <<EOF \centering \begin{tabular}{lrrr} \hline - Implementation & \multicolumn{3}{c}{Execution times (s)} \\\\ + Implementation & \multicolumn{3}{c}{Time (s) per image (px)} \\\\ & \$512^2\$ & \$1024^2\$ & \$2048^2\$ \\\\ \hline \hline @@ -34,9 +37,9 @@ cat <<EOF \hline Generic (\algref{lst:gen-dilation}) & $c1 & $c2 & $c3 \\\\ \hline - Fast, partially generic (\algref{lst:fast-dilation}) & $d1 & $d2 & $d3 \\\\ + Fast, partly generic (\algref{lst:fast-dilation}) & $d1 & $d2 & $d3 \\\\ \hline - Fast, partially generic with & $e1 & $e2 & $e3 \\\\ + Fast, partly generic with & $e1 & $e2 & $e3 \\\\ static window (\algref{lst:fast-static-dilation}) & & & \\\\ \hline \end{tabular} -- 1.7.2.5

13 years, 2 months

last-svn-commit-556-g876e31d WIP: New (postprocessing) script: apps/bench/list2table.

by Roland Levillain

--- milena/apps/bench/list2table | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) create mode 100755 milena/apps/bench/list2table diff --git a/milena/apps/bench/list2table b/milena/apps/bench/list2table new file mode 100755 index 0000000..6ac42d0 --- /dev/null +++ b/milena/apps/bench/list2table @@ -0,0 +1,48 @@ +#! /bin/sh + +set -e + +# Like read, but ignores empty values. +readval() +{ + val= + while test -z "$val" && read val; do :; done + echo "$val" +} + +for i in a1 b1 c1 d1 e1 \ + a2 b2 c2 d2 e2 \ + a3 b3 c3 d3 e3; \ +do + eval $i=$(readval) +done + +cat <<EOF +% Generated, do not modify. + +\begin{table}[tbp] + \centering + \begin{tabular}{lrrr} + \hline + Implementation & \multicolumn{3}{c}{Execution times (s)} \\\\ + & \$512^2\$ & \$1024^2\$ & \$2048^2\$ \\\\ + \hline + \hline + Non generic (\algref{lst:non-gen-dilation}) & $a1 & $a2 & $a3 \\\\ + \hline + Non generic, pointer-based\footnotemark[1] & $b1 & $b2 & $b3 \\\\ + \hline + Generic (\algref{lst:gen-dilation}) & $c1 & $c2 & $c3 \\\\ + \hline + Fast, partially generic (\algref{lst:fast-dilation}) & $d1 & $d2 & $d3 \\\\ + \hline + Fast, partially generic with & $e1 & $e2 & $e3 \\\\ + static window (\algref{lst:fast-static-dilation}) & & & \\\\ + \hline + \end{tabular} + \caption{Execution times of various dilation implementations.} + \label{tab:results} +\end{table} +\footnotetext[1]{Implementation not shown in this paper for space + reasons.} +EOF -- 1.7.2.5

13 years, 2 months

last-svn-commit-555-gbd3a6c3 WIP: Split apps/bench/dilation-lena-bench.

by Roland Levillain

--- milena/apps/bench/Makefile.am | 31 +++++- .../bench/dilation-lena-bench-fast.cc} | 22 ++-- .../bench/dilation-lena-bench-fast_static.cc} | 50 +++----- .../bench/dilation-lena-bench-gen.cc} | 22 ++-- milena/apps/bench/dilation-lena-bench-macros.hh | 96 +++++++++++++++ .../bench/dilation-lena-bench-nongen.cc} | 22 ++-- .../bench/dilation-lena-bench-nongen_2ptr.cc} | 22 ++-- milena/apps/bench/dilation-lena-bench.cc | 127 -------------------- milena/apps/bench/test-dilation-lena-bench.in | 23 ++++ 9 files changed, 211 insertions(+), 204 deletions(-) copy milena/{sandbox/lazzara/igr/gui/src/main.cc => apps/bench/dilation-lena-bench-fast.cc} (80%) copy milena/{tests/core/site_set/p_transformed.cc => apps/bench/dilation-lena-bench-fast_static.cc} (64%) copy milena/{sandbox/lazzara/igr/gui/src/main.cc => apps/bench/dilation-lena-bench-gen.cc} (80%) create mode 100644 milena/apps/bench/dilation-lena-bench-macros.hh copy milena/{sandbox/lazzara/igr/gui/src/main.cc => apps/bench/dilation-lena-bench-nongen.cc} (79%) copy milena/{sandbox/lazzara/igr/gui/src/main.cc => apps/bench/dilation-lena-bench-nongen_2ptr.cc} (79%) delete mode 100644 milena/apps/bench/dilation-lena-bench.cc create mode 100644 milena/apps/bench/test-dilation-lena-bench.in diff --git a/milena/apps/bench/Makefile.am b/milena/apps/bench/Makefile.am index 64bfc18..d2391c1 100644 --- a/milena/apps/bench/Makefile.am +++ b/milena/apps/bench/Makefile.am @@ -23,7 +23,11 @@ EXTRA_DIST = lena1024.pgm lena2048.pgm noinst_PROGRAMS = \ dilation-lena \ - dilation-lena-bench \ + dilation-lena-bench-nongen \ + dilation-lena-bench-nongen_2ptr \ + dilation-lena-bench-gen \ + dilation-lena-bench-fast \ + dilation-lena-bench-fast_static \ dilation-lena-table \ gradient-lena \ gradient-spe-lena @@ -37,10 +41,14 @@ EXTRA_DIST += \ static_window.hh \ trait.hh -noinst_HEADERS = dilation-lena.hh +noinst_HEADERS = dilation-lena.hh dilation-lena-bench-macros.hh dilation_lena_SOURCES = dilation-lena.cc -dilation_lena_bench_SOURCES = dilation-lena-bench.cc +dilation_lena_bench_nongen_SOURCES = dilation-lena-bench-nongen.cc +dilation_lena_bench_nongen_2ptr_SOURCES = dilation-lena-bench-nongen_2ptr.cc +dilation_lena_bench_gen_SOURCES = dilation-lena-bench-gen.cc +dilation_lena_bench_fast_SOURCES = dilation-lena-bench-fast.cc +dilation_lena_bench_fast_static_SOURCES = dilation-lena-bench-fast_static.cc dilation_lena_table_SOURCES = dilation-lena-table.cc gradient_lena_SOURCES = gradient-lena.cc gradient_spe_lena_SOURCES = gradient-spe-lena.cc @@ -99,3 +107,20 @@ MOSTLYCLEANFILES = \ gradient-spe-lena-out-2.pgm \ gradient-spe-lena-out-3.pgm \ gradient-spe-lena-out-4.pgm + +# Use Make to generate tests instead of `configure', as advised by +# Autoconf's manual (see section ``Installation Directory +# Variables''). +edit = sed -e 's|@top_srcdir[@]|$(top_srcdir)|g' \ + -e 's|@srcdir[@]|$(srcdir)|g' +EXTRA_DIST += test-dilation-lena-bench.in +test-dilation-lena-bench: test-dilation-lena-bench.in Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$< || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$< >>$@.tmp + chmod a-w,a+x $@.tmp + mv $@.tmp $@ +CLEANFILES = test-dilation-lena-bench + +TESTS = test-dilation-lena-bench diff --git a/milena/sandbox/lazzara/igr/gui/src/main.cc b/milena/apps/bench/dilation-lena-bench-fast.cc similarity index 80% copy from milena/sandbox/lazzara/igr/gui/src/main.cc copy to milena/apps/bench/dilation-lena-bench-fast.cc index cbb4ec1..915c0c7 100644 --- a/milena/sandbox/lazzara/igr/gui/src/main.cc +++ b/milena/apps/bench/dilation-lena-bench-fast.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,17 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <QApplication> -#include <QtGui> +#include "apps/bench/dilation-lena-bench-macros.hh" -#include <src/main_window.hh> - -int main(int argc, char *argv[]) +void +usage(const std::string& program) { - QApplication app(argc, argv); - - mln::demo::main_window win; + std::cerr << program << " input.pgm" << std::endl; + std::exit(1); +} - win.show(); - return app.exec(); +int +main(int argc, char* argv[]) +{ + DILATION(fast, win_c4p()); } diff --git a/milena/tests/core/site_set/p_transformed.cc b/milena/apps/bench/dilation-lena-bench-fast_static.cc similarity index 64% copy from milena/tests/core/site_set/p_transformed.cc copy to milena/apps/bench/dilation-lena-bench-fast_static.cc index 6541614..68b3e80 100644 --- a/milena/tests/core/site_set/p_transformed.cc +++ b/milena/apps/bench/dilation-lena-bench-fast_static.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,37 +23,27 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/core/alias/box2d.hh> -#include <mln/core/site_set/p_transformed.hh> -#include <mln/geom/bbox.hh> +#include "apps/bench/dilation-lena-bench-macros.hh" - - - -struct wrap : mln::Function_v2v< wrap > +void +usage(const std::string& program) { - typedef mln::point2d result; - typedef mln::point2d argument; - - result operator()(const result& p) const - { - return result(p.row() + 5, p.col() + 1); - } - - result inverse(const result& p) const - { - return result(p.row() - 5, p.col() - 1); - } -}; - + std::cerr << program << " input.pgm" << std::endl; + std::exit(1); +} -int main() +int +main(int argc, char* argv[]) { - using namespace mln; - - box2d b(2, 2); - p_transformed<box2d,wrap> s(b, wrap()); - box2d b_ = geom::bbox(s); - - mln_assertion(b_.pmin() == point2d(5,1)); + // Static windows and qixters. + const unsigned n = 5; + mln::dpoint2d dps[n] = { mln::dpoint2d( 0, -1), + mln::dpoint2d(-1, 0), + mln::dpoint2d( 0, 0), + mln::dpoint2d(+1, 0), + mln::dpoint2d( 0, +1) }; + mln::util::static_array<mln::dpoint2d, n> sa(dps, dps + n); + mln::static_window<mln::dpoint2d, n> static_win_c4p(sa); + + DILATION(fast_static, static_win_c4p); } diff --git a/milena/sandbox/lazzara/igr/gui/src/main.cc b/milena/apps/bench/dilation-lena-bench-gen.cc similarity index 80% copy from milena/sandbox/lazzara/igr/gui/src/main.cc copy to milena/apps/bench/dilation-lena-bench-gen.cc index cbb4ec1..d477847 100644 --- a/milena/sandbox/lazzara/igr/gui/src/main.cc +++ b/milena/apps/bench/dilation-lena-bench-gen.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,17 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <QApplication> -#include <QtGui> +#include "apps/bench/dilation-lena-bench-macros.hh" -#include <src/main_window.hh> - -int main(int argc, char *argv[]) +void +usage(const std::string& program) { - QApplication app(argc, argv); - - mln::demo::main_window win; + std::cerr << program << " input.pgm" << std::endl; + std::exit(1); +} - win.show(); - return app.exec(); +int +main(int argc, char* argv[]) +{ + DILATION(gen, win_c4p()); } diff --git a/milena/apps/bench/dilation-lena-bench-macros.hh b/milena/apps/bench/dilation-lena-bench-macros.hh new file mode 100644 index 0000000..58deaad --- /dev/null +++ b/milena/apps/bench/dilation-lena-bench-macros.hh @@ -0,0 +1,96 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef APPS_BENCH_DILATION_LENA_MACROS_HH +# define APPS_BENCH_DILATION_LENA_MACROS_HH + +#include <cstdlib> + +#include <iostream> +#include <iomanip> +#include <string> + +#include "apps/bench/dilation-lena.hh" + + +#define DILATION_WITH_BUILTIN_WINDOW(Namespace) \ + do \ + { \ + using namespace mln; \ + using value::int_u8; \ + \ + if (argc != 2) \ + usage(argv[0]); \ + \ + std::string filename = argv[1]; \ + \ + border::thickness = 1; \ + image2d<int_u8> lena; \ + io::pgm::load(lena, filename); \ + util::timer t; \ + \ + image2d<int_u8> d = lena; \ + t.start(); \ + for (unsigned i = 0; i < 10; ++i) \ + d = Namespace::dilation(d); \ + t.stop(); \ + \ + /* Fix the output format for floats. */ \ + std::cout << std::fixed << std::setprecision(4); \ + /* Display the elapsed time. */ \ + std::cout << t.read() << std::endl; \ + } \ + while (0) + +#define DILATION(Namespace, Win) \ + do \ + { \ + using namespace mln; \ + using value::int_u8; \ + \ + if (argc != 2) \ + usage(argv[0]); \ + \ + std::string filename = argv[1]; \ + \ + border::thickness = 1; \ + image2d<int_u8> lena; \ + io::pgm::load(lena, filename); \ + util::timer t; \ + \ + image2d<int_u8> d = lena; \ + t.start(); \ + for (unsigned i = 0; i < 10; ++i) \ + d = Namespace::dilation(d, Win); \ + t.stop(); \ + \ + /* Fix the output format for floats. */ \ + std::cout << std::fixed << std::setprecision(4); \ + /* Display the elapsed time. */ \ + std::cout << t.read() << std::endl; \ + } \ + while (0) + +#endif // ! APPS_BENCH_DILATION_LENA_MACROS_HH diff --git a/milena/sandbox/lazzara/igr/gui/src/main.cc b/milena/apps/bench/dilation-lena-bench-nongen.cc similarity index 79% copy from milena/sandbox/lazzara/igr/gui/src/main.cc copy to milena/apps/bench/dilation-lena-bench-nongen.cc index cbb4ec1..00a0f05 100644 --- a/milena/sandbox/lazzara/igr/gui/src/main.cc +++ b/milena/apps/bench/dilation-lena-bench-nongen.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,17 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <QApplication> -#include <QtGui> +#include "apps/bench/dilation-lena-bench-macros.hh" -#include <src/main_window.hh> - -int main(int argc, char *argv[]) +void +usage(const std::string& program) { - QApplication app(argc, argv); - - mln::demo::main_window win; + std::cerr << program << " input.pgm" << std::endl; + std::exit(1); +} - win.show(); - return app.exec(); +int +main(int argc, char* argv[]) +{ + DILATION_WITH_BUILTIN_WINDOW(nongen); } diff --git a/milena/sandbox/lazzara/igr/gui/src/main.cc b/milena/apps/bench/dilation-lena-bench-nongen_2ptr.cc similarity index 79% copy from milena/sandbox/lazzara/igr/gui/src/main.cc copy to milena/apps/bench/dilation-lena-bench-nongen_2ptr.cc index cbb4ec1..60dbdeb 100644 --- a/milena/sandbox/lazzara/igr/gui/src/main.cc +++ b/milena/apps/bench/dilation-lena-bench-nongen_2ptr.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,17 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <QApplication> -#include <QtGui> +#include "apps/bench/dilation-lena-bench-macros.hh" -#include <src/main_window.hh> - -int main(int argc, char *argv[]) +void +usage(const std::string& program) { - QApplication app(argc, argv); - - mln::demo::main_window win; + std::cerr << program << " input.pgm" << std::endl; + std::exit(1); +} - win.show(); - return app.exec(); +int +main(int argc, char* argv[]) +{ + DILATION_WITH_BUILTIN_WINDOW(nongen_2ptr); } diff --git a/milena/apps/bench/dilation-lena-bench.cc b/milena/apps/bench/dilation-lena-bench.cc deleted file mode 100644 index ce4cee0..0000000 --- a/milena/apps/bench/dilation-lena-bench.cc +++ /dev/null @@ -1,127 +0,0 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <cstdlib> - -#include <iostream> -#include <iomanip> -#include <string> - -#include "apps/bench/dilation-lena.hh" - - -namespace tag -{ - enum dilation - { - nongen = 1, - nongen_2ptr = 2, - gen = 3, - fast = 4, - fast_static = 5 - }; -} - -void -usage(const std::string& program) -{ - std::cerr << program << " implementation input.pgm\n\n" << - " were implementation is\n" - " 1 : nongen\n" - " 2 : nongen_2ptr \n" - " 3 : gen\n" - " 4 : fast\n" - " 5 : fast_static\n"; - std::exit(1); -} - - -#define DILATION_WITH_BUILTIN_WINDOW(Namespace) \ - do \ - { \ - image2d<int_u8> d = lena; \ - t.start(); \ - for (unsigned i = 0; i < 10; ++i) \ - d = Namespace::dilation(d); \ - t.stop(); \ - } \ - while (0) - -#define DILATION(Namespace, Win) \ - do \ - { \ - image2d<int_u8> d = lena; \ - t.start(); \ - for (unsigned i = 0; i < 10; ++i) \ - d = Namespace::dilation(d, Win); \ - t.stop(); \ - } \ - while (0) - - -int -main(int argc, char* argv[]) -{ - using namespace mln; - using value::int_u8; - - if (argc != 3) - usage(argv[0]); - - int method = atoi(argv[1]); - std::string filename = argv[2]; - - border::thickness = 1; - image2d<int_u8> lena; - io::pgm::load(lena, filename); - util::timer t; - - // Static windows and qixters. - const unsigned n = 5; - mln::dpoint2d dps[n] = { mln::dpoint2d( 0, -1), - mln::dpoint2d(-1, 0), - mln::dpoint2d( 0, 0), - mln::dpoint2d(+1, 0), - mln::dpoint2d( 0, +1) }; - mln::util::static_array<mln::dpoint2d, n> sa(dps, dps + n); - mln::static_window<mln::dpoint2d, n> static_win_c4p(sa); - - switch (method) - { - case ::tag::nongen: DILATION_WITH_BUILTIN_WINDOW(nongen); break; - case ::tag::nongen_2ptr: DILATION_WITH_BUILTIN_WINDOW(nongen_2ptr); break; - case ::tag::gen: DILATION(gen, win_c4p()); break; - case ::tag::fast: DILATION(fast, win_c4p()); break; - case ::tag::fast_static: DILATION(fast_static, static_win_c4p); break; - - default: - usage(argv[0]); - } - - // Fix the output format for floats. - std::cout << std::fixed << std::setprecision(4); - // Display the elapsed time. - std::cout << t.read() << std::endl; -} diff --git a/milena/apps/bench/test-dilation-lena-bench.in b/milena/apps/bench/test-dilation-lena-bench.in new file mode 100644 index 0000000..6eec79b --- /dev/null +++ b/milena/apps/bench/test-dilation-lena-bench.in @@ -0,0 +1,23 @@ +#! /bin/sh + +./dilation-lena-bench-nongen @top_srcdir@/milena/img/lena.pgm +./dilation-lena-bench-nongen_2ptr @top_srcdir@/milena/img/lena.pgm +./dilation-lena-bench-gen @top_srcdir@/milena/img/lena.pgm +./dilation-lena-bench-fast @top_srcdir@/milena/img/lena.pgm +./dilation-lena-bench-fast_static @top_srcdir@/milena/img/lena.pgm + +echo + +./dilation-lena-bench-nongen @srcdir@/lena1024.pgm +./dilation-lena-bench-nongen_2ptr @srcdir@/lena1024.pgm +./dilation-lena-bench-gen @srcdir@/lena1024.pgm +./dilation-lena-bench-fast @srcdir@/lena1024.pgm +./dilation-lena-bench-fast_static @srcdir@/lena1024.pgm + +echo + +./dilation-lena-bench-nongen @srcdir@/lena2048.pgm +./dilation-lena-bench-nongen_2ptr @srcdir@/lena2048.pgm +./dilation-lena-bench-gen @srcdir@/lena2048.pgm +./dilation-lena-bench-fast @srcdir@/lena2048.pgm +./dilation-lena-bench-fast_static @srcdir@/lena2048.pgm -- 1.7.2.5

13 years, 2 months

last-svn-commit-554-g51d7fe3 WIP: New experiment: apps/bench/dilation-lena-bench.

by Roland Levillain

--- milena/apps/bench/Makefile.am | 8 ++- milena/apps/bench/dilation-lena-bench.cc | 127 ++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 milena/apps/bench/dilation-lena-bench.cc diff --git a/milena/apps/bench/Makefile.am b/milena/apps/bench/Makefile.am index b5919ce..64bfc18 100644 --- a/milena/apps/bench/Makefile.am +++ b/milena/apps/bench/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = lena1024.pgm lena2048.pgm noinst_PROGRAMS = \ dilation-lena \ + dilation-lena-bench \ dilation-lena-table \ gradient-lena \ gradient-spe-lena @@ -36,8 +37,11 @@ EXTRA_DIST += \ static_window.hh \ trait.hh -dilation_lena_SOURCES = dilation-lena.cc dilation-lena.hh -dilation_lena_table_SOURCES = dilation-lena-table.cc dilation-lena.hh +noinst_HEADERS = dilation-lena.hh + +dilation_lena_SOURCES = dilation-lena.cc +dilation_lena_bench_SOURCES = dilation-lena-bench.cc +dilation_lena_table_SOURCES = dilation-lena-table.cc gradient_lena_SOURCES = gradient-lena.cc gradient_spe_lena_SOURCES = gradient-spe-lena.cc diff --git a/milena/apps/bench/dilation-lena-bench.cc b/milena/apps/bench/dilation-lena-bench.cc new file mode 100644 index 0000000..ce4cee0 --- /dev/null +++ b/milena/apps/bench/dilation-lena-bench.cc @@ -0,0 +1,127 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#include <cstdlib> + +#include <iostream> +#include <iomanip> +#include <string> + +#include "apps/bench/dilation-lena.hh" + + +namespace tag +{ + enum dilation + { + nongen = 1, + nongen_2ptr = 2, + gen = 3, + fast = 4, + fast_static = 5 + }; +} + +void +usage(const std::string& program) +{ + std::cerr << program << " implementation input.pgm\n\n" << + " were implementation is\n" + " 1 : nongen\n" + " 2 : nongen_2ptr \n" + " 3 : gen\n" + " 4 : fast\n" + " 5 : fast_static\n"; + std::exit(1); +} + + +#define DILATION_WITH_BUILTIN_WINDOW(Namespace) \ + do \ + { \ + image2d<int_u8> d = lena; \ + t.start(); \ + for (unsigned i = 0; i < 10; ++i) \ + d = Namespace::dilation(d); \ + t.stop(); \ + } \ + while (0) + +#define DILATION(Namespace, Win) \ + do \ + { \ + image2d<int_u8> d = lena; \ + t.start(); \ + for (unsigned i = 0; i < 10; ++i) \ + d = Namespace::dilation(d, Win); \ + t.stop(); \ + } \ + while (0) + + +int +main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 3) + usage(argv[0]); + + int method = atoi(argv[1]); + std::string filename = argv[2]; + + border::thickness = 1; + image2d<int_u8> lena; + io::pgm::load(lena, filename); + util::timer t; + + // Static windows and qixters. + const unsigned n = 5; + mln::dpoint2d dps[n] = { mln::dpoint2d( 0, -1), + mln::dpoint2d(-1, 0), + mln::dpoint2d( 0, 0), + mln::dpoint2d(+1, 0), + mln::dpoint2d( 0, +1) }; + mln::util::static_array<mln::dpoint2d, n> sa(dps, dps + n); + mln::static_window<mln::dpoint2d, n> static_win_c4p(sa); + + switch (method) + { + case ::tag::nongen: DILATION_WITH_BUILTIN_WINDOW(nongen); break; + case ::tag::nongen_2ptr: DILATION_WITH_BUILTIN_WINDOW(nongen_2ptr); break; + case ::tag::gen: DILATION(gen, win_c4p()); break; + case ::tag::fast: DILATION(fast, win_c4p()); break; + case ::tag::fast_static: DILATION(fast_static, static_win_c4p); break; + + default: + usage(argv[0]); + } + + // Fix the output format for floats. + std::cout << std::fixed << std::setprecision(4); + // Display the elapsed time. + std::cout << t.read() << std::endl; +} -- 1.7.2.5

13 years, 2 months

last-svn-commit-553-g7808a2d WIP: Have apps/bench/dilation-lena-table behave a bit more like apps/bench/dilation-lena.

by Roland Levillain

--- milena/apps/bench/Makefile.am | 18 ++++++++++++++++-- milena/apps/bench/dilation-lena-table.cc | 18 ++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/milena/apps/bench/Makefile.am b/milena/apps/bench/Makefile.am index 18e0a38..b5919ce 100644 --- a/milena/apps/bench/Makefile.am +++ b/milena/apps/bench/Makefile.am @@ -52,7 +52,6 @@ MOSTLYCLEANFILES = \ dilation-lena-out-512-faster_noaccu.pgm \ dilation-lena-out-512-fast_static.pgm \ dilation-lena-out-512-faster_static.pgm \ - \ dilation-lena-out-1024-nongen.pgm \ dilation-lena-out-1024-nongen_2ptr.pgm \ dilation-lena-out-1024-nongen_1ptr.pgm \ @@ -63,7 +62,6 @@ MOSTLYCLEANFILES = \ dilation-lena-out-1024-faster_noaccu.pgm \ dilation-lena-out-1024-fast_static.pgm \ dilation-lena-out-1024-faster_static.pgm \ - \ dilation-lena-out-2048-nongen.pgm \ dilation-lena-out-2048-nongen_2ptr.pgm \ dilation-lena-out-2048-nongen_1ptr.pgm \ @@ -75,6 +73,22 @@ MOSTLYCLEANFILES = \ dilation-lena-out-2048-fast_static.pgm \ dilation-lena-out-2048-faster_static.pgm \ \ + dilation-lena-table-out-512-nongen.pgm \ + dilation-lena-table-out-512-nongen_2ptr.pgm \ + dilation-lena-table-out-512-gen.pgm \ + dilation-lena-table-out-512-fast.pgm \ + dilation-lena-table-out-512-fast_static.pgm \ + dilation-lena-table-out-1024-nongen.pgm \ + dilation-lena-table-out-1024-nongen_2ptr.pgm \ + dilation-lena-table-out-1024-gen.pgm \ + dilation-lena-table-out-1024-fast.pgm \ + dilation-lena-table-out-1024-fast_static.pgm \ + dilation-lena-table-out-2048-nongen.pgm \ + dilation-lena-table-out-2048-nongen_2ptr.pgm \ + dilation-lena-table-out-2048-gen.pgm \ + dilation-lena-table-out-2048-fast.pgm \ + dilation-lena-table-out-2048-fast_static.pgm \ + \ gradient-lena-out.pgm \ gradient-spe-lena-out-0.pgm \ gradient-spe-lena-out-1.pgm \ diff --git a/milena/apps/bench/dilation-lena-table.cc b/milena/apps/bench/dilation-lena-table.cc index cff1a2b..ca21758 100644 --- a/milena/apps/bench/dilation-lena-table.cc +++ b/milena/apps/bench/dilation-lena-table.cc @@ -40,6 +40,8 @@ for (unsigned i = 0; i < niters; ++i) \ d = Namespace::dilation(d); \ t.stop(); \ + std::cerr << Headline << t.read() << " s" << std::endl; \ + io::pgm::save(d, prefix + '-' + length + '-' + Suffix + ".pgm"); \ times.push_back(t.read()); \ } \ while (0) @@ -52,13 +54,15 @@ for (unsigned i = 0; i < niters; ++i) \ d = Namespace::dilation(d, Win); \ t.stop(); \ + std::cerr << Headline << t.read() << " s" << std::endl; \ + io::pgm::save(d, prefix + '-' + length + '-' + Suffix + ".pgm"); \ times.push_back(t.read()); \ } \ while (0) std::vector<float> -run(const std::string& filename, unsigned niters) +run(const std::string& filename, const std::string& length, unsigned niters) { using namespace mln; using value::int_u8; @@ -69,6 +73,10 @@ run(const std::string& filename, unsigned niters) image2d<int_u8> d; util::timer t; + + std::string prefix = "dilation-lena-table-out"; + std::cerr << "== " << filename << std::endl; + std::vector<float> times; times.reserve(5); @@ -106,6 +114,8 @@ run(const std::string& filename, unsigned niters) DILATION(faster_static, static_win_c4p, "faster_static", "faster_static\t"); #endif + std::cerr << std::endl; + return times; } @@ -116,9 +126,9 @@ main (int /* argc */, char* argv[]) typedef std::vector<float> times_t; // Compute times. - times_t times_512 = run(MLN_IMG_DIR "/lena.pgm", niters); - times_t times_1024 = run(MLN_APPS_DIR "/bench/lena1024.pgm", niters); - times_t times_2048 = run(MLN_APPS_DIR "/bench/lena2048.pgm", niters); + times_t times_512 = run(MLN_IMG_DIR "/lena.pgm", "512", niters); + times_t times_1024 = run(MLN_APPS_DIR "/bench/lena1024.pgm", "1024", niters); + times_t times_2048 = run(MLN_APPS_DIR "/bench/lena2048.pgm", "2048", niters); // Display times. times_t::const_iterator i_512 = times_512.begin(); -- 1.7.2.5

13 years, 2 months

last-svn-commit-552-gc061b74 WIP: Misc. changes in apps/bench/.

by Roland Levillain

--- milena/apps/bench/Makefile.am | 3 +-- milena/apps/bench/dilation-lena-table.cc | 11 ++++++++++- milena/apps/bench/dilation-lena.cc | 2 ++ milena/apps/bench/dilation-lena.hh | 4 ---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/milena/apps/bench/Makefile.am b/milena/apps/bench/Makefile.am index e27be3c..18e0a38 100644 --- a/milena/apps/bench/Makefile.am +++ b/milena/apps/bench/Makefile.am @@ -17,8 +17,7 @@ # Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Produce fast code. -APPS_CXXFLAGS = @APPS_CXXFLAGS@ -AM_CXXFLAGS = $(APPS_CXXFLAGS) +AM_CXXFLAGS = $(APPS_CXXFLAGS_NODEBUG) EXTRA_DIST = lena1024.pgm lena2048.pgm diff --git a/milena/apps/bench/dilation-lena-table.cc b/milena/apps/bench/dilation-lena-table.cc index 3057ce3..cff1a2b 100644 --- a/milena/apps/bench/dilation-lena-table.cc +++ b/milena/apps/bench/dilation-lena-table.cc @@ -23,6 +23,9 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <iostream> +#include <iomanip> + #include "apps/bench/dilation-lena.hh" #include "apps/data.hh" @@ -67,6 +70,7 @@ run(const std::string& filename, unsigned niters) image2d<int_u8> d; util::timer t; std::vector<float> times; + times.reserve(5); DILATION_WITH_BUILTIN_WINDOW(nongen, "nongen", "nongen\t\t"); DILATION_WITH_BUILTIN_WINDOW(nongen_2ptr, "nongen_2ptr", "nongen_2ptr\t"); @@ -106,7 +110,7 @@ run(const std::string& filename, unsigned niters) } int -main () +main (int /* argc */, char* argv[]) { unsigned niters = 10; typedef std::vector<float> times_t; @@ -121,6 +125,8 @@ main () times_t::const_iterator i_1024 = times_1024.begin(); times_t::const_iterator i_2048 = times_2048.begin(); std::cout << + "% Generated by `" << argv[0] << "', do not modify.\n" + "\n" "\\begin{table}[tbp]\n" " \\centering\n" " \\begin{tabular}{lrrr}\n" @@ -130,6 +136,9 @@ main () " \\hline\n" " \\hline\n"; + // Fix the output format for floats. + std::cout << std::fixed << std::setprecision(4); + /* Increment each iterator only once in each output statement to avoid non-determinism due to the successive uses of operator++ on a given iterator. */ diff --git a/milena/apps/bench/dilation-lena.cc b/milena/apps/bench/dilation-lena.cc index 82b4497..0754cab 100644 --- a/milena/apps/bench/dilation-lena.cc +++ b/milena/apps/bench/dilation-lena.cc @@ -23,6 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <iostream> + #include "apps/bench/dilation-lena.hh" #include "apps/data.hh" diff --git a/milena/apps/bench/dilation-lena.hh b/milena/apps/bench/dilation-lena.hh index c89eb4e..47e76dd 100644 --- a/milena/apps/bench/dilation-lena.hh +++ b/milena/apps/bench/dilation-lena.hh @@ -29,10 +29,6 @@ /// \file /// \brief Dilation benchmark cases. -#include <cstddef> - -#include <iostream> - #include <mln/core/image/image2d.hh> #include <mln/core/alias/window2d.hh> -- 1.7.2.5

13 years, 2 months

last-svn-commit-551-gb2a8ff2 WIP: configure.ac (APPS_CXXFLAGS_NODEBUG): New precious variable.

by Roland Levillain

--- configure.ac | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index a64f80d..9fd70ce 100644 --- a/configure.ac +++ b/configure.ac @@ -569,6 +569,13 @@ if test -z "$APPS_CXXFLAGS"; then APPS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS" fi fi +# Likewise, without debugging information. +AC_ARG_VAR([APPS_CXXFLAGS_NODEBUG], + [C++ compiler flags for applications w/o debug symbols]) +if test -z "$APPS_CXXFLAGS_NODEBUG" && test "$GXX" = yes; then + APPS_CXXFLAGS_NODEBUG="-O3 -DNDEBUG $WARNINGS_CXXFLAGS" +fi + ## ------- ## ## Tools. ## -- 1.7.2.5

13 years, 2 months

last-svn-commit-550-gfcea0a4 WIP: Generate a LaTeX table from some results of apps/bench/dilation-lena.

by Roland Levillain

--- milena/apps/bench/Makefile.am | 2 + .../{dilation-lena.cc => dilation-lena-table.cc} | 91 +++++++++++++++++--- 2 files changed, 80 insertions(+), 13 deletions(-) copy milena/apps/bench/{dilation-lena.cc => dilation-lena-table.cc} (56%) diff --git a/milena/apps/bench/Makefile.am b/milena/apps/bench/Makefile.am index 40f0147..e27be3c 100644 --- a/milena/apps/bench/Makefile.am +++ b/milena/apps/bench/Makefile.am @@ -24,6 +24,7 @@ EXTRA_DIST = lena1024.pgm lena2048.pgm noinst_PROGRAMS = \ dilation-lena \ + dilation-lena-table \ gradient-lena \ gradient-spe-lena @@ -37,6 +38,7 @@ EXTRA_DIST += \ trait.hh dilation_lena_SOURCES = dilation-lena.cc dilation-lena.hh +dilation_lena_table_SOURCES = dilation-lena-table.cc dilation-lena.hh gradient_lena_SOURCES = gradient-lena.cc gradient_spe_lena_SOURCES = gradient-spe-lena.cc diff --git a/milena/apps/bench/dilation-lena.cc b/milena/apps/bench/dilation-lena-table.cc similarity index 56% copy from milena/apps/bench/dilation-lena.cc copy to milena/apps/bench/dilation-lena-table.cc index 82b4497..3057ce3 100644 --- a/milena/apps/bench/dilation-lena.cc +++ b/milena/apps/bench/dilation-lena-table.cc @@ -37,8 +37,7 @@ for (unsigned i = 0; i < niters; ++i) \ d = Namespace::dilation(d); \ t.stop(); \ - std::cout << Headline << t.read() << " s" << std::endl; \ - io::pgm::save(d, prefix + '-' + length + '-' + Suffix + ".pgm"); \ + times.push_back(t.read()); \ } \ while (0) @@ -50,14 +49,13 @@ for (unsigned i = 0; i < niters; ++i) \ d = Namespace::dilation(d, Win); \ t.stop(); \ - std::cout << Headline << t.read() << " s" << std::endl; \ - io::pgm::save(d, prefix + '-' + length + '-' + Suffix + ".pgm"); \ + times.push_back(t.read()); \ } \ while (0) -void -run(const std::string& filename, const std::string& length, unsigned niters) +std::vector<float> +run(const std::string& filename, unsigned niters) { using namespace mln; using value::int_u8; @@ -68,21 +66,25 @@ run(const std::string& filename, const std::string& length, unsigned niters) image2d<int_u8> d; util::timer t; - - std::string prefix = "dilation-lena-out"; - std::cout << "== " << filename << std::endl; + std::vector<float> times; DILATION_WITH_BUILTIN_WINDOW(nongen, "nongen", "nongen\t\t"); DILATION_WITH_BUILTIN_WINDOW(nongen_2ptr, "nongen_2ptr", "nongen_2ptr\t"); +# if 0 + // Disabled, not used in the paper's table. DILATION_WITH_BUILTIN_WINDOW(nongen_1ptr, "nongen_1ptr", "nongen_1ptr\t"); +#endif DILATION(gen, win_c4p(), "gen", "gen\t\t"); // FIXME: Introduce a new test case, gen_static, using a static window // and static_qiters. DILATION(fast, win_c4p(), "fast", "fast\t\t"); +# if 0 + // Disabled, not used in the paper's table. DILATION(fast_noaccu, win_c4p(), "fast_noaccu", "fast_noaccu\t"); DILATION(faster, win_c4p(), "faster", "faster\t\t"); DILATION(faster_noaccu, win_c4p(), "faster_noaccu", "faster_noaccu\t"); +#endif // Static windows and qixters. const unsigned n = 5; @@ -95,16 +97,79 @@ run(const std::string& filename, const std::string& length, unsigned niters) mln::static_window<mln::dpoint2d, n> static_win_c4p (sa); DILATION(fast_static, static_win_c4p, "fast_static", "fast_static\t"); +# if 0 + // Disabled, not used in the paper's table. DILATION(faster_static, static_win_c4p, "faster_static", "faster_static\t"); +#endif - std::cout << std::endl; + return times; } int main () { unsigned niters = 10; - run(MLN_IMG_DIR "/lena.pgm", "512", niters); - run(MLN_APPS_DIR "/bench/lena1024.pgm", "1024", niters); - run(MLN_APPS_DIR "/bench/lena2048.pgm", "2048", niters); + typedef std::vector<float> times_t; + + // Compute times. + times_t times_512 = run(MLN_IMG_DIR "/lena.pgm", niters); + times_t times_1024 = run(MLN_APPS_DIR "/bench/lena1024.pgm", niters); + times_t times_2048 = run(MLN_APPS_DIR "/bench/lena2048.pgm", niters); + + // Display times. + times_t::const_iterator i_512 = times_512.begin(); + times_t::const_iterator i_1024 = times_1024.begin(); + times_t::const_iterator i_2048 = times_2048.begin(); + std::cout << + "\\begin{table}[tbp]\n" + " \\centering\n" + " \\begin{tabular}{lrrr}\n" + " \\hline\n" + " Implementation & \\multicolumn{3}{c}{Execution times (s)} \\\\\n" + " & $512^2$ & $1024^2$ & $2048^2$ \\\\\n" + " \\hline\n" + " \\hline\n"; + + /* Increment each iterator only once in each output statement to + avoid non-determinism due to the successive uses of operator++ on + a given iterator. */ + + // nongen. + std::cout << + " Non generic (\\algref{lst:non-gen-dilation}) & " << + *i_512++ << " & " << *i_1024++ << " & " << *i_2048++ << " \\\\\n" + " \\hline\n"; + + // nongen_2ptr. + std::cout << + " Non generic, pointer-based\\footnotemark[1] & " << + *i_512++ << " & " << *i_1024++ << " & " << *i_2048++ << " \\\\\n" + " \\hline\n"; + + // gen. + std::cout << + " Generic (\\algref{lst:gen-dilation}) & " << + *i_512++ << " & " << *i_1024++ << " & " << *i_2048++ << " \\\\\n" + " \\hline\n"; + + // fast. + std::cout << + " Fast, partly generic (\\algref{lst:fast-dilation}) & " << + *i_512++ << " & " << *i_1024++ << " & " << *i_2048++ << " \\\\\n" + " \\hline\n"; + + // fast_static. + std::cout << + " Fast, partly generic with & " << + *i_512++ << " & " << *i_1024++ << " & " << *i_2048++ << " \\\\\n" + " static window (\\algref{lst:fast-static-dilation}) & & & \\\\\n" + " \\hline\n"; + + std::cout << + " \\end{tabular}\n" + " \\caption{Execution times of various dilation implementations.}\n" + " \\label{tab:results}\n" + "\\end{table}\n" + "\\footnotetext[1]{Implementation not shown in this paper for space\n" + " reasons.}\n" << std::flush; } -- 1.7.2.5

13 years, 2 months

last-svn-commit-549-ga657c01 WIP: Split apps/bench/dilation-lena.

by Roland Levillain

* apps/bench/dilation-lena.cc (nongen::dilation) (nongen_2ptr::dilation) (nongen_1ptr::dilation) (gen::dilation) (fast::dilation) (fast_noaccu::dilation) (faster::dilation) (faster_noaccu::dilation) (fast_static::dilation) (faster_static::dilation): Move functions... * apps/bench/dilation-lena.hh: ...here (new file). --- milena/apps/bench/Makefile.am | 2 +- milena/apps/bench/dilation-lena.cc | 314 +------------------- .../bench/{dilation-lena.cc => dilation-lena.hh} | 92 +------ 3 files changed, 9 insertions(+), 399 deletions(-) copy milena/apps/bench/{dilation-lena.cc => dilation-lena.hh} (79%) diff --git a/milena/apps/bench/Makefile.am b/milena/apps/bench/Makefile.am index 266b71b..40f0147 100644 --- a/milena/apps/bench/Makefile.am +++ b/milena/apps/bench/Makefile.am @@ -36,7 +36,7 @@ EXTRA_DIST += \ static_window.hh \ trait.hh -dilation_lena_SOURCES = dilation-lena.cc +dilation_lena_SOURCES = dilation-lena.cc dilation-lena.hh gradient_lena_SOURCES = gradient-lena.cc gradient_spe_lena_SOURCES = gradient-spe-lena.cc diff --git a/milena/apps/bench/dilation-lena.cc b/milena/apps/bench/dilation-lena.cc index e4996fb..82b4497 100644 --- a/milena/apps/bench/dilation-lena.cc +++ b/milena/apps/bench/dilation-lena.cc @@ -23,322 +23,10 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <cstddef> - -#include <iostream> - -#include <mln/core/image/image2d.hh> -#include <mln/core/alias/window2d.hh> - -#include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> - -#include <mln/value/int_u8.hh> - -#include <mln/accu/stat/max.hh> - -#include <mln/util/timer.hh> - -#include "apps/bench/static_window.hh" -#include "apps/bench/static_dpoints_pixter.hh" -#include "apps/bench/trait.hh" - +#include "apps/bench/dilation-lena.hh" #include "apps/data.hh" - -namespace nongen -{ - typedef mln::image2d<mln::value::int_u8> image; - - image dilation(const image& input) - { - image output (input.nrows(), input.ncols()); // Initialize an output image. - for (unsigned int r = 0; r < input.nrows(); ++r) // Iterate on rows. - for (unsigned int c = 0; c < input.ncols(); ++c) - { // Iterate on columns. - unsigned char sup = input.at_(r, c); - if (r != 0 && input.at_(r-1, c) > sup) sup = input.at_(r-1, c); - if (r != input.nrows() - 1 && input.at_(r+1, c) > sup) sup = input.at_(r+1, c); - if (c != 0 && input.at_(r, c-1) > sup) sup = input.at_(r, c-1); - if (c != input.ncols() - 1 && input.at_(r, c+1) > sup) sup = input.at_(r, c+1); - output.at_(r, c) = sup; - } - return output; - } -} - -namespace nongen_2ptr -{ - typedef mln::image2d<mln::value::int_u8> image; - - image dilation(const image& input) - { - typedef mln::value::int_u8 val_t; - // Offsets corresponding to a 4-c window on INPUT. - ptrdiff_t win_offset[4] = { &input.at_(-1, 0) - &input.at_(0, 0), - &input.at_(+1, 0) - &input.at_(0, 0), - &input.at_( 0, -1) - &input.at_(0, 0), - &input.at_( 0, +1) - &input.at_(0, 0) }; - - image output (input.nrows(), input.ncols()); // Initialize an output image. - for (unsigned int r = 0; r < input.nrows(); ++r) // Iterate on rows. - { - const val_t* pi = &input.at_(r, 0); - val_t* po = &output.at_(r, 0); - for (; pi < &input.at_(r, 0) + input.ncols(); ++pi, ++po) - { - unsigned char sup = *pi; - // (-1, 0) neighbor. - if (r != 0 - && *(pi + win_offset[0]) > sup) - sup = *(pi + win_offset[0]); - // (+1, 0) neighbor. - if (r != input.nrows() - 1 - && *(pi + win_offset[1]) > sup) - sup = *(pi + win_offset[1]); - // (0, -1) neighbor. - if (pi != &input.at_(r, 0) - && *(pi + win_offset[2]) > sup) - sup = *(pi + win_offset[2]); - // (0, +1) neighbor. - if (pi != &input.at_(r, 0) + input.ncols() - 1 - && *(pi + win_offset[3]) > sup) - sup = *(pi + win_offset[3]); - *po = sup; - } - } - return output; - } -} - -namespace nongen_1ptr -{ - typedef mln::image2d<mln::value::int_u8> image; - - image dilation(const image& input) - { - typedef mln::value::int_u8 val_t; - // Offsets corresponding to a 4-c window on INPUT. - ptrdiff_t win_offset[4] = { &input.at_(-1, 0) - &input.at_(0, 0), - &input.at_(+1, 0) - &input.at_(0, 0), - &input.at_( 0, -1) - &input.at_(0, 0), - &input.at_( 0, +1) - &input.at_(0, 0) }; - - image output; - initialize(output, input); - // Offset between a the pixel located at the same position in - // INPUT and OUTPUT. - ptrdiff_t output_offset = &output.at_(0, 0) - &input.at_(0, 0); - - for (unsigned int r = 0; r < input.nrows(); ++r) // Iterate on rows. - { - for (const val_t* pi = &input.at_(r, 0); - pi < &input.at_(r, 0) + input.ncols(); - ++pi) - { - unsigned char sup = *pi; - // (-1, 0) neighbor. - if (r != 0 - && *(pi + win_offset[0]) > sup) - sup = *(pi + win_offset[0]); - // (+1, 0) neighbor. - if (r != input.nrows() - 1 - && *(pi + win_offset[1]) > sup) - sup = *(pi + win_offset[1]); - // (0, -1) neighbor. - if (pi != &input.at_(r, 0) - && *(pi + win_offset[2]) > sup) - sup = *(pi + win_offset[2]); - // (0, +1) neighbor. - if (pi != &input.at_(r, 0) + input.ncols() - 1 - && *(pi + win_offset[3]) > sup) - sup = *(pi + win_offset[3]); - const_cast<val_t&>(*(pi + output_offset)) = sup; - } - } - return output; - } -} - -namespace gen -{ - using namespace mln; - - template <typename I, typename W> - mln_concrete(I) dilation(const I& input, const W& win) - { - mln_concrete(I) output; initialize(output, input); // Initialize output. - mln_piter(I) p(input.domain()); // Iterator on sites of the domain of `input'. - mln_qiter(W) q(win, p); // Iterator on the neighbors of `p' w.r.t. `win'. - for_all(p) - { - // FIXME: Cheat: replace the accu::supremum by a maximum. - mln::accu::stat::max<mln_value(I)> sup; // Accumulator computing the supremum. - for_all(q) if (input.has(q)) - sup.take(input(q)); - output(p) = sup.to_result(); - } - return output; - } -} - -namespace fast -{ - using namespace mln; - - template <typename I, typename W> - mln_concrete(I) dilation(const I& input, const W& win) - { - typedef mln_concrete(I) O; - O output; initialize(output, input); // Initialize output. - - mln_pixter(const I) pi(input); // Iterator on the pixels of `input'. - mln_pixter(O) po(output); // Iterator on the pixels of `output'. - - mln_qixter(const I, W) q(pi, win); // Iterator on the neighbors of `p' w.r.t. `win'. - for_all_2(pi, po) - { - // FIXME: Cheat: replace the accu::supremum by a maximum. - mln::accu::stat::max<mln_value(I)> sup; // Accumulator computing the supremum. - for_all(q) - sup.take(q.val()); - po.val() = sup.to_result(); - } - return output; - } -} - -namespace fast_noaccu -{ - using namespace mln; - - template <typename I, typename W> - mln_concrete(I) dilation(const I& input, const W& win) - { - typedef mln_concrete(I) O; - O output; initialize(output, input); // Initialize output. - - mln_pixter(const I) pi(input); // Iterator on the pixels of `input'. - mln_pixter(O) po(output); // Iterator on the pixels of `output'. - - mln_qixter(const I, W) q(pi, win); // Iterator on the neighbors of `p' w.r.t. `win'. - for_all_2(pi, po) - { - // FIXME: Cheat: replace the accu::supremum by a maximum. - mln_value(I) sup = mln_min(mln_value(I)); - for_all(q) - if (q.val() > sup) - sup = q.val(); - po.val() = sup; - } - return output; - } -} - -namespace faster -{ - using namespace mln; - - template <typename I, typename W> - mln_concrete(I) dilation(const I& input, const W& win) - { - typedef mln_concrete(I) O; - O output; initialize(output, input); // Initialize output. - - mln_pixter(const I) p(input); // Iterator on the pixels of `input'. - - mln_qixter(const I, W) q(p, win); // Iterator on the neighbors of `p' w.r.t. `win'. - for_all(p) - { - // FIXME: Cheat: replace the accu::supremum by a maximum. - mln::accu::stat::max<mln_value(I)> sup; // Accumulator computing the supremum. - for_all(q) - sup.take(q.val()); - *(output.buffer() + p.offset()) = sup.to_result(); - } - return output; - } -} - -namespace faster_noaccu -{ - using namespace mln; - - template <typename I, typename W> - mln_concrete(I) dilation(const I& input, const W& win) - { - typedef mln_concrete(I) O; - O output; initialize(output, input); // Initialize output. - - mln_pixter(const I) p(input); // Iterator on the pixels of `input'. - - mln_qixter(const I, W) q(p, win); // Iterator on the neighbors of `p' w.r.t. `win'. - for_all(p) - { - // FIXME: Cheat: replace the accu::supremum by a maximum. - mln_value(I) sup = mln_min(mln_value(I)); - for_all(q) - if (q.val() > sup) - sup = q.val(); - *(output.buffer() + p.offset()) = sup; - } - return output; - } -} - -namespace fast_static -{ - using namespace mln; - - template <typename I, typename W> - mln_concrete(I) dilation(const I& input, const W& win) - { - typedef mln_concrete(I) O; - O output; initialize(output, input); // Initialize output. - - mln_pixter(const I) pi(input); // Iterator on the pixels of `input'. - mln_pixter(O) po(output); // Iterator on the pixels of `output'. - mln_static_qixter(const I, W) q(pi, win); // Iterator on the neighbors of `p' w.r.t. `win'. - - for_all_2(pi, po) - { - // FIXME: Cheat: replace the accu::supremum by a maximum. - mln::accu::stat::max<mln_value(I)> sup; // Accumulator computing the supremum. - for_all(q) - sup.take(q.val()); - po.val() = sup.to_result(); - } - return output; - } -} - -namespace faster_static -{ - using namespace mln; - - template <typename I, typename W> - mln_concrete(I) dilation(const I& input, const W& win) - { - typedef mln_concrete(I) O; - O output; initialize(output, input); // Initialize output. - - mln_pixter(const I) p(input); // Iterator on the pixels of `input'. - mln_static_qixter(const I, W) q(p, win); // Iterator on the neighbors of `p' w.r.t. `win'. - - for_all(p) - { - // FIXME: Cheat: replace the accu::supremum by a maximum. - mln::accu::stat::max<mln_value(I)> sup; // Accumulator computing the supremum. - for_all(q) - sup.take(q.val()); - *(output.buffer() + p.offset()) = sup.to_result(); - } - return output; - } -} - - // Shortcut macros for run. #define DILATION_WITH_BUILTIN_WINDOW(Namespace, Suffix, Headline) \ diff --git a/milena/apps/bench/dilation-lena.cc b/milena/apps/bench/dilation-lena.hh similarity index 79% copy from milena/apps/bench/dilation-lena.cc copy to milena/apps/bench/dilation-lena.hh index e4996fb..c89eb4e 100644 --- a/milena/apps/bench/dilation-lena.cc +++ b/milena/apps/bench/dilation-lena.hh @@ -23,6 +23,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#ifndef APPS_BENCH_DILATION_LENA_HH +#define APPS_BENCH_DILATION_LENA_HH + +/// \file +/// \brief Dilation benchmark cases. + #include <cstddef> #include <iostream> @@ -43,9 +49,6 @@ #include "apps/bench/static_dpoints_pixter.hh" #include "apps/bench/trait.hh" -#include "apps/data.hh" - - namespace nongen { @@ -338,85 +341,4 @@ namespace faster_static } } - -// Shortcut macros for run. - -#define DILATION_WITH_BUILTIN_WINDOW(Namespace, Suffix, Headline) \ - do \ - { \ - d = lena; \ - t.start(); \ - for (unsigned i = 0; i < niters; ++i) \ - d = Namespace::dilation(d); \ - t.stop(); \ - std::cout << Headline << t.read() << " s" << std::endl; \ - io::pgm::save(d, prefix + '-' + length + '-' + Suffix + ".pgm"); \ - } \ - while (0) - -#define DILATION(Namespace, Win, Suffix, Headline) \ - do \ - { \ - d = lena; \ - t.start(); \ - for (unsigned i = 0; i < niters; ++i) \ - d = Namespace::dilation(d, Win); \ - t.stop(); \ - std::cout << Headline << t.read() << " s" << std::endl; \ - io::pgm::save(d, prefix + '-' + length + '-' + Suffix + ".pgm"); \ - } \ - while (0) - - -void -run(const std::string& filename, const std::string& length, unsigned niters) -{ - using namespace mln; - using value::int_u8; - - border::thickness = 1; - image2d<int_u8> lena; - io::pgm::load(lena, filename); - - image2d<int_u8> d; - util::timer t; - - std::string prefix = "dilation-lena-out"; - std::cout << "== " << filename << std::endl; - - DILATION_WITH_BUILTIN_WINDOW(nongen, "nongen", "nongen\t\t"); - DILATION_WITH_BUILTIN_WINDOW(nongen_2ptr, "nongen_2ptr", "nongen_2ptr\t"); - DILATION_WITH_BUILTIN_WINDOW(nongen_1ptr, "nongen_1ptr", "nongen_1ptr\t"); - - DILATION(gen, win_c4p(), "gen", "gen\t\t"); - // FIXME: Introduce a new test case, gen_static, using a static window - // and static_qiters. - DILATION(fast, win_c4p(), "fast", "fast\t\t"); - DILATION(fast_noaccu, win_c4p(), "fast_noaccu", "fast_noaccu\t"); - DILATION(faster, win_c4p(), "faster", "faster\t\t"); - DILATION(faster_noaccu, win_c4p(), "faster_noaccu", "faster_noaccu\t"); - - // Static windows and qixters. - const unsigned n = 5; - mln::dpoint2d dps[n] = { mln::dpoint2d( 0, -1), - mln::dpoint2d(-1, 0), - mln::dpoint2d( 0, 0), - mln::dpoint2d(+1, 0), - mln::dpoint2d( 0, +1) }; - mln::util::static_array<mln::dpoint2d, n> sa(dps, dps + n); - mln::static_window<mln::dpoint2d, n> static_win_c4p (sa); - - DILATION(fast_static, static_win_c4p, "fast_static", "fast_static\t"); - DILATION(faster_static, static_win_c4p, "faster_static", "faster_static\t"); - - std::cout << std::endl; -} - -int -main () -{ - unsigned niters = 10; - run(MLN_IMG_DIR "/lena.pgm", "512", niters); - run(MLN_APPS_DIR "/bench/lena1024.pgm", "1024", niters); - run(MLN_APPS_DIR "/bench/lena2048.pgm", "2048", niters); -} +#endif // ! APPS_BENCH_DILATION_LENA_HH -- 1.7.2.5

13 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches October 2011