Olena August 2003

olena@lrde.epita.fr

6 participants
8 discussions

by Nicolas Burrus

Il existe un projet prcs nommé "olena", qui contient des choses relatives à Olena : burrus_n@ouagadougou ~/work/lrde/olena/prcs-olena$ ls doc/ lab/ odk/ oldemo1/ olena.prj Le dernier checkin date d'il y a presque 4 ans, et je n'ai pas trop compris le rôle de tous les répertoires. Je me disais que ca pourrait être cool de le dépoussiérer pour y mettre des trucs genre : - la config pour générer le package debian - le script de check pour vampire - Les sources des slides des olena-days ? Bref, tout ce qui concerne autre chose que le coeur d'Olena et donc n'a pas sa place dans oln/ directement. Vous en pensez quoi ?

20 years, 7 months

debian

by Geoffroy Fouquier

Le repository du labo contient deux paquets debian pour olena, la 0.9 dans la section stable et la 10.11 dans la section unstable. http://proj.lrde.epita.fr/DebianRepository J'ai egalement écris une page qui indique comment upgrader, d'une manière rapide mais crade, un paquet debian. http://www.lrde.epita.fr/Know/HowToUpgradeDebianPackage Cette méthode est utilisable si il n'y a pas de gros changement. Mais si quelqu'un a des doutes, qu'il me demande. -- Geoffroy Fouquier Geoffroy.Fouquier(a)lrde.epita.fr

20 years, 7 months

[Raphaël Poss] oln 10.10

by Raphaël Poss

Index: ChangeLog From Raphaël Poss <raph(a)lrde.epita.fr> * configure.ac: Comment out dysfunctional stuff. Index: olena/ChangeLog From Raphaël Poss <raph(a)lrde.epita.fr> * conf/README: Add. * Makefile.am: Comment out dysfunctional stuff. Index: configure.ac --- configure.ac Mon, 04 Aug 2003 16:52:22 +0200 burrus_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.8 640) +++ configure.ac Mon, 25 Aug 2003 12:28:41 +0200 raph (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.8 640) @@ -85,15 +85,19 @@ AM_CONDITIONAL([REGEN_MANPAGES], [test "x$oln_cv_regen_manpages" != xno]) -### Compiler-specific auto-configuration - AC_CACHE_CHECK([whether to enable auto-configuration for multiple compilers], - [oln_cv_enable_config_sh], - [oln_cv_enable_config_sh=yes - AC_ARG_WITH([config-sh], - [AC_HELP_STRING([--without-config-sh], - [disable generation of oln-config-xxx.sh])], - [oln_cv_enable_config_sh=$withval])]) - AM_CONDITIONAL([OLN_CONFIG_SH], [test "x$oln_cv_enable_config_sh" != xno]) +### +### Experimental stuff. Read olena/conf/README +### + +dnl ### Compiler-specific auto-configuration +dnl AC_CACHE_CHECK([whether to enable auto-configuration for multiple compilers], +dnl [oln_cv_enable_config_sh], +dnl [oln_cv_enable_config_sh=yes +dnl AC_ARG_WITH([config-sh], +dnl [AC_HELP_STRING([--without-config-sh], +dnl [disable generation of oln-config-xxx.sh])], +dnl [oln_cv_enable_config_sh=$withval])]) +dnl AM_CONDITIONAL([OLN_CONFIG_SH], [test "x$oln_cv_enable_config_sh" != xno]) ### The testsuite is a component. Index: olena/Makefile.am --- olena/Makefile.am Tue, 13 May 2003 22:29:01 +0200 burrus_n (oln/2_Makefile.a 1.30.1.1.1.2.1.9 640) +++ olena/Makefile.am Mon, 25 Aug 2003 12:27:57 +0200 raph (oln/2_Makefile.a 1.30.1.1.1.2.1.9 640) @@ -23,7 +23,12 @@ dist_pkgdata_DATA = conf/configure conf/oln-config.shin -if OLN_CONFIG_SH +### +### Experimental stuff: read olena/conf/README +### + +#if OLN_CONFIG_SH + # FIXME: when the two following rules are enabled, they are # always run, resulting in errors if aclocal and/or autoconf # are not available. @@ -34,22 +39,27 @@ # $(srcdir)/conf/configure: $(srcdir)/conf/configure.ac $(srcdir)/conf/aclocal.m4 # cd $(srcdir)/conf && $(AUTOCONF) -install-data-hook: $(srcdir)/conf/configure $(srcdir)/conf/gen-scripts.sh $(srcdir)/conf/compilers.def - mkdir -p conf && $(SHELL) $(srcdir)/conf/gen-scripts.sh $(DESTDIR)$(includedir) $(srcdir)/conf ./conf - $(mkinstalldirs) $(DESTDIR)$(bindir) - @ for p in conf/oln-config-*.sh; do \ - if test -f $$p; then \ - f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ - else :; fi; \ - done - -uninstall-hook: - @ for p in conf/oln-config-*.sh; do \ - f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ - done +# +# FIXME: this section is ugly and exists because no good substitute +# has been found yet. Please improve. +# + +#install-data-hook: $(srcdir)/conf/configure $(srcdir)/conf/gen-scripts.sh $(srcdir)/conf/compilers.def +# mkdir -p conf && $(SHELL) $(srcdir)/conf/gen-scripts.sh $(DESTDIR)$(includedir) $(srcdir)/conf ./conf +# $(mkinstalldirs) $(DESTDIR)$(bindir) +# @ for p in conf/oln-config-*.sh; do \ +# if test -f $$p; then \ +# f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ +# echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ +# $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ +# else :; fi; \ +# done + +#uninstall-hook: +# @ for p in conf/oln-config-*.sh; do \ +# f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ +# echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ +# rm -f $(DESTDIR)$(bindir)/$$f; \ +# done -endif +#endif Index: olena/conf/README --- olena/conf/README Mon, 25 Aug 2003 13:50:16 +0200 raph () +++ olena/conf/README Mon, 25 Aug 2003 13:48:40 +0200 raph (oln/v/14_README 644) @@ -0,0 +1,77 @@ + +Environment-specific configuration +================================== + + This directory contains programs, scripts and definitions intended + to provide the user who installs Olena with precomputed + configuration files (config.hh). + +Generalities +------------ + + The idea behind this is that Olena is not totally independent from + the compiler, standard library and architecture and needs some + form of configuration before being used. On the other hand, + nothing but details prevent a single installation from being used + with different compilers, standard libraries and architectures. + + These "details" are actually the combination of preprocessor + macros, or 'flags', that can be defined to enable optional + features or workarounds. There they are : + + * OLN_EXCEPTIONS, set to throw exceptions on error instead of + abort traps + + * USE_C_LIMITS, set if the C++ standard library does not provide + appropriate std::numeric_limits + + * _ISOC99_SOURCE, set to 1 to force the declaration of C99 + functions in the GNU C standard library + + * NEED_SQRTF, NEED_FLOORF, NEED_ROUND, NEED_ROUNDF, set if any of + these functions are not present in the math library and need to + be substituted by local definitions in Olena + + * HAVE_FFTW, set to 1 if the fftw library is available + + * HAVE_ZLIB, set to 1 if the zlib is available + + + + Because these flags are not numerous, it is simple for an Olena + user to provide them manually on the compilation command + line. + + However, it is traditional to provide them in a config.hh file + instead, that can contain definitions for other parts of the + user's project. Olena can then be told to use this file by + providing only the standard HAVE_CONFIG_H preprocessor macro + definition on the command line. + +Aim of the provided tools +------------------------- + + Because the process of actually chosing the right combination of + flags is a simple but potentially tedious operation, some efforts + have been made in order to provide tools to automatically generate + scripts specific to all available compiler configurations. + + Actually, the gen-scripts.sh program actually tests each known + compiler configuration XXX (as specified in compilers.def), and + generates a script program called 'oln-config-XXX.sh'. + + These scripts are in turn able to provide the necessary + compilation flags for Olena, in a manner similar to other GNU + -config files (such as gtk-config, kde-config and the like). + + For example, if Intel's C++ compiler (icc) is found to be + available and useable with Olena, gen-scripts.sh generates the + script 'oln-config-icc.sh' which itself can be used as such: + + oln-config-icc.sh --cxxflags # prints needed compiler flags + + oln-config-icc.sh --cxx # prints "icc" + + oln-config-icc.sh --help # displays available options + + -- . Raphaël Poss . . _ - --------\ : EPITA CSI 2003 ICQ 1757157 | | EpX -- ACU -- Activ' GnuPG fp bda2eb602866390c7a7d : \------ - _ . . a13ad7c86dd33b72e72b '

20 years, 8 months

oln 10.9 : has_impl() devient publique

by Nicolas Burrus

Je recommence à poster les diffs, puisque les quakes et autres séries de diff de 5000 lignes sont terminées :) has_impl() sur une image dit si l'image possède une implémentation, autrement dit si elle est prête à être interrogée par l'opérateur []. C'est pratique notamment quand l'image a été construite par un load, pour savoir si le load a raté (genre si le fichier existe pas). D'autre solution sont envisageables pour ce genre de cas, genre lancer une exception, on pourra en discuter 2min à la prochaine réunion Olena. Index: doc/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * demo/convol-gaussian.cc: Check i/o failures. Index: olena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * oln/core/abstract/image.hh: Make the has_impl() method public. * oln/utils/copy.hh: Adjust consequently. * oln/core/abstract/image_with_impl.hh: Likewise. * oln/core/abstract/image_with_impl.hh: Minor fix. Index: olena/oln/utils/copy.hh --- olena/oln/utils/copy.hh Thu, 07 Aug 2003 02:37:23 +0200 burrus_n (oln/i/29_copy.hh 1.6 640) +++ olena/oln/utils/copy.hh Mon, 25 Aug 2003 11:41:32 +0200 burrus_n (oln/i/29_copy.hh 1.6 640) @@ -42,7 +42,7 @@ # define OLENA_UTILS_IMAGE_DEEP_COPY \ mlc_init_static_hierarchy(Exact); \ - if (rhs.has_impl_()) \ + if (rhs.has_impl()) \ *this = rhs.clone() # ifdef OLENA_CORE_IMAGE1D_HH Index: doc/demo/convol-gaussian.cc --- doc/demo/convol-gaussian.cc Fri, 02 May 2003 23:12:39 +0200 burrus_n (oln/p/14_morpholena 1.5 640) +++ doc/demo/convol-gaussian.cc Mon, 25 Aug 2003 11:37:07 +0200 burrus_n (oln/p/14_morpholena 1.5 640) @@ -7,12 +7,13 @@ int main(void) { image2d<int_u8> lena = load(IMGDIR "/lena.pgm"); + assert(lena.has_impl()); - save(convol::fast::gaussian(lena, float_d(0.50f)), - "lena-gau.pgm"); - save(convol::fast::gaussian_derivative(lena, float_d(0.50f)), - "lena-gd1.pgm"); - save(convol::fast::gaussian_second_derivative(lena, float_d(0.50f)), - "lena-gd2.pgm"); + assert( save(convol::fast::gaussian(lena, float_d(0.50f)), + "lena-gau.pgm") ); + assert( save(convol::fast::gaussian_derivative(lena, float_d(0.50f)), + "lena-gd1.pgm") ); + assert( save(convol::fast::gaussian_second_derivative(lena, float_d(0.50f)), + "lena-gd2.pgm") ); } Index: olena/oln/core/abstract/image.hh --- olena/oln/core/abstract/image.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/t/25_image.hh 1.17 640) +++ olena/oln/core/abstract/image.hh Mon, 25 Aug 2003 11:36:46 +0200 burrus_n (oln/t/25_image.hh 1.17 640) @@ -86,6 +86,12 @@ return this->exact().at(p.exact()); } + bool + has_impl() const + { + return this->exact().impl() != 0; + } + exact_type clone() const { @@ -95,14 +101,14 @@ bool hold(const abstract::point<point_type>& p) const { - assertion(has_impl_()); + assertion(has_impl()); return this->exact().impl()->hold(p.exact()); } const size_type& size() const { - assertion(has_impl_()); + assertion(has_impl()); return this->exact().impl()->size(); } @@ -138,7 +144,7 @@ border_set_width(coord new_border, bool copy_border = false) const { precondition(new_border >= 0); - precondition(has_impl_()); + precondition(has_impl()); if (border() == new_border) return; // Nothing to do. @@ -184,11 +190,6 @@ {} //image(self_type& rhs) {} - bool - has_impl_() const - { - return this->exact().impl() != 0; - } }; } // end of namespace abstract Index: olena/oln/core/abstract/image_with_impl.hh --- olena/oln/core/abstract/image_with_impl.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/t/27_image_with 1.14.1.7 640) +++ olena/oln/core/abstract/image_with_impl.hh Mon, 25 Aug 2003 11:41:24 +0200 burrus_n (oln/t/27_image_with 1.14.1.7 640) @@ -52,7 +52,7 @@ template<class Impl, class Exact> class image_with_impl: - public abstract::image_with_type_with_dim_switch<Exact>::ret + public image_with_type_with_dim_switch<Exact>::ret { public: typedef typename image_traits<Exact>::point_type point_type; @@ -65,17 +65,17 @@ typedef image_with_impl<Impl, Exact> self_type; typedef Exact exact_type; - typedef image_with_type<typename image_id<Exact>::value_type, Exact> super_type; + typedef typename image_with_type_with_dim_switch<Exact>::ret super_type; friend class image<exact_type>; friend class image_with_dim<image_id<Exact>::dim, exact_type>; - friend class super_type; + friend class image_with_type<typename image_id<Exact>::value_type, Exact>; // shallow copy image_with_impl(self_type& rhs) : super_type(rhs) { - assertion(rhs.has_impl_()); + assertion(rhs.has_impl()); impl_ = rhs.impl(); impl_->ref(); } @@ -156,7 +156,7 @@ clear(); } - image_with_impl() : super_type(), impl_(0) + image_with_impl() : impl_(0) {} image_with_impl(impl_type* impl) :

20 years, 8 months

[Stratego-dev] license and copyright faq

by Akim Demaille

20 years, 8 months

Olena 0.9 released

by hogur

Olena is a library for image processing whose main characteristic is its genericity. In Olena an algorithm is written once and can apply on any kind of image (grey scale, color, 1D, 2D, 3D, ...). We do our image processing research using this library, but most importantly we have gathered (and still do) generic programming expertise from the library development. Description ----------- The Olena project aims at building a scientific computation platform oriented towards image processing, image recognition, and artificial vision. This environment is composed of a high performance generic library, a set of tools for shell scripts, together with, in the more distant future, an interpreter (a la Octave, MatLab etc.) and a visual programming environment. Each step includes its own difficulties and requires the invention of new solutions. For instance, the library --the low level service set on top of which is built the whole project-- shall be both fast and generic. These objectives are quite antagonist in programming. Fortunately, the scientific computation field recently realized that genericity, as found in object oriented languages, is no longer a tool useful to implement auxiliary classes, but constitutes a new programming paradigm in its own right. Contrary to the usual oject oriented modelizations with inheritance and dynamic polymorphism, (static) genericity enables the generation of performant and reusable code. The Olena library is written using this paradigm. We have already found effective solutions to delicate problems, such as the wide variety of data types and data structures expected to be offered by such as library. In addition, we have generalized these solutions as design patterns to be reused in similar conditions. Olena is also effective for us to perform research on image processing. More information about Olena is available here: http://www.lrde.epita.fr/cgi-bin/twiki/view/Projects/Olena Changes between 0.8 and 0.9 --------------------------- * New static hierarchy paradigm - Complete rewrite of the image hierarchy. - The new hierarchy benefits from multiple inheritance and diamond constructs. - Objects' abstract interfaces made available, leading to safer and easier algorithm writing. - Label images such as binary_image or vectorial_image added. * Partial rewrite of images I/O - Support for 1d, 3d images and windows. - Better handling of built-in types. * Color conversions fixed and improved. * Cleanup and coding style conformance. * Many bug fixes. * Improved test-suite. Availability ------------ Olena is free software. It is released under the conditions of the GNU General Public License version 2. Olena 0.9 is available here: http://www.lrde.epita.fr/cgi-bin/twiki/view/Projects/OlenaReleases Thanks ------ Merci a tous ceux dont les efforts et la bonne humeur ont permis cette release. En vrac: - Astrid pour la participation aux efforts de guerre du cleanup. - Mandor pour ses tests. Merci d'avance pour la prochaine release et le merge avec le travail de theo ;). - Sylvain pour le clean de topo, les tests, son implication generale dans les debats qui ont fait rage. Merci de nous avoir file plein de zolis bouts de code a remettre au coding style :). - Giovanni pour morpho, et plus globalement pour son efficacite immediate. Un super bapteme de l'air. Merci de m'avoir supporte :). - Niels pour ses conseils, son implication lors des debats olenagineux. - Youssef pour les differentes discussions sur la hierarchie et le paradigme. - Raph pour son aide precieuse lors des phases de debug et de reflexion globale sur la prog et les hierarchies statiques. - Theo pour la ligne directrice, ses conseils et son aide pour la resolution de diverses questions existentielles: comment on fait pour que ca marche ? Ou est le pastis ? - Reda pour les conversions et autres levages de lievres. Merci aussi pour la bonne humeur et les checkin qui cassent tout. - Akim pour la motivation: "bon, en resume, la release c'est pour quand ?". Et bien sur, merci a Nes, pour quasiment tout, comme d'hab. -- Hogur, pret a partir en vacances

20 years, 8 months

oln 9.25: fix make clean all doc/ref

by Nicolas Burrus

Il n'y a pas de raison de supprimer le dvi vu qu'il est distribué. Index: doc/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * ref/Makefile.am (CLEANFILES): Don't remove dvi files. Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Mon, 28 Jul 2003 17:56:05 +0200 burrus_n (oln/d/51_Makefile.a 1.27.1.7 640) +++ doc/ref/Makefile.am Mon, 11 Aug 2003 15:35:58 +0200 burrus_n (oln/d/51_Makefile.a 1.27.1.8 640) @@ -96,7 +96,7 @@ $(srcdir)/html/* $(srcdir)/bin/* \ $(srcdir)/filelists.make -CLEANFILES = = *.tmp *.aux *.bbl *blg *.dvi *.lot *.log *.out *.toc +CLEANFILES = = *.tmp *.aux *.bbl *blg *.lot *.log *.out *.toc ### ### What gets installed.

20 years, 8 months

Olena: release en approche

by hogur

La phase de stabilisation est atteinte (jusqu'a preuve du contraire) sur la brance 2003paradigm. Nous mergeons demain (nous faisons une passe coding-style ce soir avec Nes). La release de 0.9 est donc prevue pour Vendredi. Que les personnes ayant des remarques parlent maintenant ou se taisent a jamais. -- hogur

20 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

Olena August 2003