- Olena-patches

last-svn-commit-555-gbd3a6c3 WIP: Split apps/bench/dilation-lena-bench.
by Roland Levillain 14 Oct '11

14 Oct '11

--- 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

1 0

last-svn-commit-556-g876e31d WIP: New (postprocessing) script: apps/bench/list2table.
by Roland Levillain 14 Oct '11

14 Oct '11

--- 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

1 0

last-svn-commit-557-gefb9eb1 WIP: Aesthetic changes in the output of apps/bench/list2table.
by Roland Levillain 14 Oct '11

14 Oct '11

--- 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

1 0

last-svn-commit-558-gcb9bfa4 Simplify `fast_static' and `faster_static' cases in apps/bench/.
by Roland Levillain 14 Oct '11

14 Oct '11

* 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

1 0

last-svn-commit-559-g6f5a436 apps/bench/list2table: Generate a shorter table.
by Roland Levillain 14 Oct '11

14 Oct '11

--- milena/ChangeLog | 4 ++++ milena/apps/bench/list2table | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e3321f2..31ce482 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2011-01-17 Roland Levillain <roland(a)lrde.epita.fr> + + * apps/bench/list2table: Generate a shorter table. + 2011-01-13 Roland Levillain <roland(a)lrde.epita.fr> Simplify `fast_static' and `faster_static' cases in apps/bench/. diff --git a/milena/apps/bench/list2table b/milena/apps/bench/list2table index 0ba9dd7..3f7ce3f 100755 --- a/milena/apps/bench/list2table +++ b/milena/apps/bench/list2table @@ -39,8 +39,7 @@ cat <<EOF \hline Fast, partly generic (\algref{lst:fast-dilation}) & $d1 & $d2 & $d3 \\\\ \hline - Fast, partly generic with & $e1 & $e2 & $e3 \\\\ - static window (\algref{lst:fast-static-dilation}) & & & \\\\ + \algref{lst:fast-dilation} with a static window & $e1 & $e2 & $e3 \\\\ \hline \end{tabular} \caption{Execution times of various dilation implementations.} -- 1.7.2.5

1 0

last-svn-commit-539-g155bb1c WIP: Test/bench gradient on lena.pgm.
by Roland Levillain 14 Oct '11

14 Oct '11

--- .../Makefile.am | 12 +++++----- .../linear/lap.cc => apps/bench/gradient-lena.cc} | 24 +++++++++++++------ 2 files changed, 22 insertions(+), 14 deletions(-) copy milena/apps/{constrained-connectivity => bench}/Makefile.am (72%) copy milena/{tests/linear/lap.cc => apps/bench/gradient-lena.cc} (82%) diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/bench/Makefile.am similarity index 72% copy from milena/apps/constrained-connectivity/Makefile.am copy to milena/apps/bench/Makefile.am index 84a6ed2..707f457 100644 --- a/milena/apps/constrained-connectivity/Makefile.am +++ b/milena/apps/bench/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -20,10 +20,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) -noinst_PROGRAMS = constrained-connectivity -constrained_connectivity_SOURCES = constrained-connectivity.cc +noinst_PROGRAMS = \ + gradient-lena -TESTS = test-constrained-connectivity +gradient_lena_SOURCES = gradient-lena.cc -# The sample image form Pierre Soille's PAMI 2008 article. -EXTRA_DIST = soille.pgm +MOSTLYCLEANFILES = \ + gradient-lena-out.pgm diff --git a/milena/tests/linear/lap.cc b/milena/apps/bench/gradient-lena.cc similarity index 82% copy from milena/tests/linear/lap.cc copy to milena/apps/bench/gradient-lena.cc index 2c0a2c7..f3f5d62 100644 --- a/milena/tests/linear/lap.cc +++ b/milena/apps/bench/gradient-lena.cc @@ -24,16 +24,20 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <iostream> + #include <mln/core/image/image2d.hh> -#include <mln/value/int_u8.hh> +#include <mln/core/alias/window2d.hh> + #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/border/thickness.hh> -#include <mln/linear/lap.hh> -#include <mln/data/stretch.hh> +#include <mln/value/int_u8.hh> +#include <mln/morpho/gradient.hh> -#include "tests/data.hh" +#include <mln/util/timer.hh> + +#include "apps/data.hh" int main() @@ -42,10 +46,14 @@ int main() using value::int_u8; border::thickness = 1; - image2d<int_u8> lena; io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); - io::pgm::save(data::stretch(int_u8(), linear::lap_4(lena)), - "lap-out.pgm"); + util::timer t; + t.start(); + image2d<int_u8> g = morpho::gradient(lena, win_c4p()); + t.stop(); + std::cout << t.read() << std::endl; + + io::pgm::save(g, "gradient-lena-out.pgm"); } -- 1.7.2.5

1 0

last-svn-commit-540-g72256ba WIP: Configure milena/apps/bench/Makefile.am.
by Roland Levillain 14 Oct '11

14 Oct '11

--- configure.ac | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 1febf2c..a64f80d 100644 --- a/configure.ac +++ b/configure.ac @@ -532,6 +532,7 @@ AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"]) # Ask for the creation of applications' Makefiles. AC_CONFIG_FILES([ milena/apps/Makefile + milena/apps/bench/Makefile milena/apps/constrained-connectivity/Makefile milena/apps/graph-morpho/Makefile milena/apps/mesh-segm-skel/Makefile -- 1.7.2.5

1 0

last-svn-commit-541-g80a95bd WIP: apps/Makefile.am (SUBDIRS): Add bench.
by Roland Levillain 14 Oct '11

14 Oct '11

--- milena/apps/Makefile.am | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/milena/apps/Makefile.am b/milena/apps/Makefile.am index c42ffd7..a6730db 100644 --- a/milena/apps/Makefile.am +++ b/milena/apps/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -13,10 +14,12 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# # Applied examples of Milena. SUBDIRS = mesh-segm-skel graph-morpho constrained-connectivity +# Benchmarks. +SUBDIRS += bench + # Examples from papers. SUBDIRS += papers -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-10-g0461de7
by lazzara＠lrde.epita.fr 14 Oct '11

14 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 0461de7a9a2d473326a09fa6d09fda03df9b6fd9 (commit) via ad194b5f069f035d7624f748b6063baf2525cbde (commit) via fc1b111887113926a038df4cc292561bf1d5f31e (commit) via 674e43ac4187e2adf6a4826c9bc77c886d0cec89 (commit) via 699326af505c203e1eeb4a2d67d2a0d85d5cd6d1 (commit) via f31589e55f08e02a6b3f450015c892600024ec15 (commit) via e097687e1c7cc778f217a1fcdc2d043af0f1ad41 (commit) via 9c87359f0ff1e90b1ae40f1a17724cb5d137e86f (commit) via 60f7a0fff74419b5e395925f46cc9258116b5823 (commit) via 151bbf7fb689fc86abcfe85877770df87ceeaba0 (commit) from dd67b61c24dfbce6a081a8831ac9d15e6d46fdce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 0461de7 Add a new tool for global thresholding. ad194b5 tests/binarization/global_threshold.cc: Fix test. fc1b111 Add Otsu's binarization implementation. 674e43a Invert threshold function test. 699326a Add new crop routines. f31589e mln/value/builtin/floatings.hh: Fix string name for builtin double type. ----------------------------------------------------------------------- Summary of changes: ANNOUNCE-2.0 | 69 +++++++++++++ ChangeLog | 4 + NEWS | 3 + configure.ac | 2 +- milena/ChangeLog | 24 ++++- milena/mln/fun/v2b/threshold.hh | 8 +- milena/mln/geom/crop.hh | 73 +++++++++++++ milena/mln/geom/crop_without_localization.hh | 80 ++++++++++++++ milena/mln/value/builtin/floatings.hh | 5 +- scribo/ChangeLog | 37 +++++++- scribo/demo/viewer/Makefile.am | 2 +- scribo/demo/viewer/demodir.hh.in | 4 +- scribo/demo/viewer/runner.cc | 4 +- scribo/scribo/binarization/otsu.hh | 137 +++++++++++++++++++++++++ scribo/src/binarization/Makefile.am | 19 +++- scribo/src/binarization/global_threshold.cc | 104 +++++++++++++++++++ scribo/src/binarization/otsu.cc | 99 ++++++++++++++++++ scribo/tests/binarization/Makefile.am | 5 +- scribo/tests/binarization/global_threshold.cc | 7 +- scribo/tests/binarization/otsu.cc | 52 ++++++++++ scribo/tests/binarization/otsu.ref.pbm | Bin 0 -> 32884 bytes 21 files changed, 718 insertions(+), 20 deletions(-) create mode 100644 ANNOUNCE-2.0 create mode 100644 milena/mln/geom/crop.hh create mode 100644 milena/mln/geom/crop_without_localization.hh create mode 100644 scribo/scribo/binarization/otsu.hh create mode 100644 scribo/src/binarization/global_threshold.cc create mode 100644 scribo/src/binarization/otsu.cc create mode 100644 scribo/tests/binarization/otsu.cc create mode 100644 scribo/tests/binarization/otsu.ref.pbm hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch stable/scribo updated: olena-2.0-4-ge097687
by lazzara＠lrde.epita.fr 14 Oct '11

14 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch stable/scribo has been updated via e097687e1c7cc778f217a1fcdc2d043af0f1ad41 (commit) via 9c87359f0ff1e90b1ae40f1a17724cb5d137e86f (commit) via 60f7a0fff74419b5e395925f46cc9258116b5823 (commit) via 151bbf7fb689fc86abcfe85877770df87ceeaba0 (commit) from dd67b61c24dfbce6a081a8831ac9d15e6d46fdce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ANNOUNCE-2.0 | 69 ++++++++++++++++++++++++++++++++++++++ ChangeLog | 4 ++ NEWS | 3 ++ configure.ac | 2 +- milena/ChangeLog | 6 ++-- scribo/ChangeLog | 12 ++++++- scribo/demo/viewer/Makefile.am | 2 +- scribo/demo/viewer/demodir.hh.in | 4 +- scribo/demo/viewer/runner.cc | 4 +- 9 files changed, 96 insertions(+), 10 deletions(-) create mode 100644 ANNOUNCE-2.0 hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0