July 2006 - Olena-patches

oln-0.10 10.230: Work around a bug in SWIG 1.3.29
by Roland Levillain 13 Oct '06

13 Oct '06

I haven't checked whether this bug has been fixed in SWIG's Subversion repository yet (but it wasn't present in SWIG 1.3.28). 2006-07-04 Roland Levillain <roland(a)lrde.epita.fr> Work around a bug in SWIG 1.3.29. * generate_arith_instantiations.py (write_algorithms) * generate_morpho_instantiations.py (write_algorithms): Work around a bug in SWIG 1.3.29 in the generation of C++ wrappers. Index: 10.229/tools/swilena/generate_morpho_instantiations.py --- 10.229/tools/swilena/generate_morpho_instantiations.py Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/v/24_generate_m 1.8.1.1 700) +++ 10.229(w)/tools/swilena/generate_morpho_instantiations.py Mon, 03 Jul 2006 12:23:42 +0200 levill_r (oln/v/24_generate_m 1.8.1.1 700) @@ -57,7 +57,13 @@ "ntg_int_u8", "ntg_int_u32", "ntg_int_s8", "ntg_int_s32", "ntg_float" ]: - img_type = "::oln::image%(dim)sd< %(type)s >" % vars() + # FIXME: SWIG 1.3.29 Bug. We used to refer to `oln::image' from + # the global (top-level) namespace, i.e. `::oln::image', + # but it makes swig 1.3.29 generate invalid C++ code when + # used ad a template argument: the space between `<' and + # `::' is eaten by swig, and `<:' is understood as a + # trigraph (for `[') by the C++ compiler. + img_type = "oln::image%(dim)sd< %(type)s >" % vars() win_type = "::oln::window%(dim)sd" % vars() neighb_type = "::oln::neighborhood%(dim)sd" % vars() @@ -135,10 +141,12 @@ instantiate(idx, "top_hat_contrast_op", img_type, img_type, win_type) instantiate(idx, "fast_top_hat_contrast_op", img_type, img_type, win_type) # Watershed - img_ret_type = "::oln::image%(dim)sd< ntg_int_u32 >" % vars() + # FIXME: SWIG 1.3.29 Bug (same as above). + img_ret_type = "oln::image%(dim)sd< ntg_int_u32 >" % vars() instantiate(idx, "watershed_seg", img_ret_type, img_type, neighb_type) instantiate(idx, "watershed_con", img_ret_type, img_type, neighb_type) - bin_img_type = "::oln::image%(dim)sd< ntg_bin >" % vars() + # FIXME: SWIG 1.3.29 Bug (same as above). + bin_img_type = "oln::image%(dim)sd< ntg_bin >" % vars() instantiate(idx, "sure_minima_imposition", img_type, img_type, bin_img_type, neighb_type) instantiate(idx, "sequential_minima_imposition", img_type, img_type, bin_img_type, neighb_type) instantiate(idx, "hybrid_minima_imposition", img_type, img_type, bin_img_type, neighb_type) Index: 10.229/tools/swilena/generate_arith_instantiations.py --- 10.229/tools/swilena/generate_arith_instantiations.py Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/v/51_generate_a 1.1.1.1 700) +++ 10.229(w)/tools/swilena/generate_arith_instantiations.py Mon, 03 Jul 2006 11:44:33 +0200 levill_r (oln/v/51_generate_a 1.1.1.1 700) @@ -59,13 +59,19 @@ "ntg_int_u8", "ntg_int_u32", "ntg_int_s8", "ntg_int_s32", "ntg_float" ]: - img_type = "::oln::image%(dim)sd< %(type)s >" % vars() + # FIXME: SWIG 1.3.29 Bug. We used to refer to `oln::image' from + # the global (top-level) namespace, i.e. `::oln::image', + # but it makes swig 1.3.29 generate invalid C++ code when + # used ad a template argument: the space between `<' and + # `::' is eaten by swig, and `<:' is understood as a + # trigraph (for `[') by the C++ compiler. + img_type = "oln::image%(dim)sd< %(type)s >" % vars() bigger_type = get_bigger_type(type) - return_img_type = "::oln::image%(dim)sd< %(bigger_type)s >" % vars() + return_img_type = "oln::image%(dim)sd< %(bigger_type)s >" % vars() # FIXME: these algorithms do not work with bin if type != "ntg_bin": - for algo in [ "plus", "minus", "times", "div" ]: + for algo in [ "plus", "minus", "times", "div" ]: instantiate(dim, algo, return_img_type, img_type, img_type) instantiate(dim, "min", return_img_type, img_type, img_type)

1 2

oln-0.10 10.244 ruby/ltrequire.rb: Add copyright header
by Roland Levillain 13 Jul '06

13 Jul '06

2006-07-13 Roland Levillain <roland(a)lrde.epita.fr> * ruby/ltrequire.rb: Add copyright header. --- 10.243/tools/swilena/ruby/ltrequire.rb Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/42_ltrequire. 1.1 644) +++ 10.244/tools/swilena/ruby/ltrequire.rb Thu, 13 Jul 2006 16:20:10 +0200 levill_r (oln/w/42_ltrequire. 1.2 644) @@ -1,3 +1,20 @@ +# Copyright (C) 2006 EPITA Research and Development Laboratory. +# +# This file is part of the Olena Library. This library is free +# software; you can redistribute it and/or modify it under the terms +# of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# This library 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 this library; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. + # Extension of the Kernel.require method understanding Libtool libraries. # Inspired by ltihooks.py.

1 0

oln-0.10 10.243: Add missing SWIG interfaces to the distribution
by Roland Levillain 12 Jul '06

12 Jul '06

2006-07-12 Roland Levillain <roland(a)lrde.epita.fr> Add missing SWIG interfaces to the distribution. * expand.sh (EXTRA_DIST_MODULES): New. Add modules basics1d, basics2d and basics3d. Include them in the distribution. --- 10.242/tools/swilena/expand.sh Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/s/25_expand.sh 1.20 700) +++ 10.243/tools/swilena/expand.sh Wed, 12 Jul 2006 12:39:41 +0200 levill_r (oln/s/25_expand.sh 1.21 700) @@ -10,6 +10,7 @@ mkdir -p "$SWILENA/ruby" MODULES="$MODULES ntg" +EXTRA_DIST_MODULES= for dim in 1 2 3; do ## C++ header inclusions for basic types. @@ -19,6 +20,9 @@ %include swilena_basics.i decl_basics($dim) EOF + # Have Automake include these modules in the distribution, but + # don't create SWIG wrappers for them. + EXTRA_DIST_MODULES="$EXTRA_DIST_MODULES basics${dim}d" ## {1d,2d,3d} families for mod in point structelt w_win imagesize image; do @@ -277,7 +281,7 @@ dump_src() { echo -n "EXTRA_DIST =" ilist=0 - for mod in $MODULES; do + for mod in $MODULES $EXTRA_DIST_MODULES; do if [ -r "$SWILENA/src/swilena_${mod}.i" ]; then if [ `expr $ilist % 4` = 0 ]; then echo " \\"

1 0

oln-0.10 10.242: Complete Rblena test suite
by Roland Levillain 11 Jul '06

11 Jul '06

Rblena is now as usable as Pylena is. I don't know why the watershed transform doesn't work (neither in Pylena nor in Rblena), but this shouldn't be hard to fix. By the way, if you want to take part in the lifting of Olena 0.10, you're welcome! Tell us, and we'll create some tickets on Olena's Trac. 2006-07-11 Roland Levillain <roland(a)lrde.epita.fr> Complete Rblena test suite. * ruby/tests/arith.rb, ruby/tests/conversions.rb, * ruby/tests/morpho.rb: New tests * ruby/tests/Makefile.am (dist_noinst_DATA): Add arith.rb, conversions.rb and morpho.rb. * python/tests/conversions.py, python/tests/morpho.py: * python/tests/simple1.py: Reduce the number of imported modules. * python/tests/Makefile.am, python/tests/arith.py, * python/tests/sanity.py, ruby/tests/conversions.rb, * ruby/tests/simple1.rb: Aesthetic changes. --- 10.241/tools/swilena/python/tests/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/15_Makefile.a 1.8 644) +++ 10.242/tools/swilena/python/tests/Makefile.am Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/15_Makefile.a 1.9 644) @@ -3,10 +3,10 @@ ## Makefile.am for swilena/python/tests ## -dist_noinst_DATA = sanity.py arith.py conversions.py simple1.py morpho.py - TESTS_ENVIRONMENT = \ PYTHONPATH="..:$(srcdir)/..:$(PYTHONPATH):" \ IMGDIR="$(top_srcdir)/olena/img" +dist_noinst_DATA = sanity.py arith.py conversions.py morpho.py simple1.py + TESTS = $(dist_noinst_DATA) --- 10.241/tools/swilena/python/tests/simple1.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/16_simple1.py 1.5 744) +++ 10.242/tools/swilena/python/tests/simple1.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/16_simple1.py 1.6 744) @@ -1,10 +1,9 @@ -#!/usr/bin/env python +#! /usr/bin/env python import os import sys import ltihooks from swilena_image2d import * -from swilena_ntg import * imgdir = os.environ['IMGDIR'] --- 10.241/tools/swilena/ruby/tests/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/18_Makefile.a 1.7 644) +++ 10.242/tools/swilena/ruby/tests/Makefile.am Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/18_Makefile.a 1.8 644) @@ -7,6 +7,6 @@ SWILENA_PATH="$(srcdir)/..:..:../.libs" \ IMGDIR="$(top_srcdir)/olena/img" -dist_noinst_DATA = sanity.rb simple1.rb +dist_noinst_DATA = sanity.rb arith.rb conversions.rb morpho.rb simple1.rb TESTS = $(dist_noinst_DATA) --- 10.241/tools/swilena/ruby/tests/simple1.rb Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/19_simple1.rb 1.5 755) +++ 10.242/tools/swilena/ruby/tests/simple1.rb Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/19_simple1.rb 1.6 755) @@ -1,6 +1,6 @@ -#!/usr/bin/env ruby +#! /usr/bin/env ruby -# Set swilena_path to the location where swilena ruby modules are +# Set swilena_path to the location where swilena ruby modules are. if ENV.has_key? "SWILENA_PATH" $:.concat ENV["SWILENA_PATH"].split(":") end --- 10.241/tools/swilena/python/tests/morpho.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/47_morpho.py 1.3 744) +++ 10.242/tools/swilena/python/tests/morpho.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/47_morpho.py 1.4 744) @@ -1,13 +1,28 @@ -#!/usr/bin/env python +#! /usr/bin/env python import os import sys import ltihooks -from swilena_all2d import * + +from swilena_image2d import * +from swilena_conversions2d import * + +from swilena_structelt2d import * +import swilena_morpho2d_ntg_int_s32 as morpho_s32 +import swilena_morpho2d_ntg_int_u8 as morpho_u8 imgdir = os.environ['IMGDIR'] lena = image2d_u8(load(imgdir + "/lena.pgm")) -lenas32 = cast_to_int_s32(lena) -closing(lenas32, win_c4p()) -#watershed_seg(lena, neighb_c4()) +lena_s32 = cast_to_int_s32(lena) +morpho_s32.closing(lena_s32, win_c4p()) + +# FIXME: The watershed transform fails with this error: +# +# Traceback (most recent call last): +# File "../../../../../tools/swilena/python/tests/morpho.py", line 21, in ? +# morpho_u8.watershed_seg(lena, neighb_c4()) +# RuntimeError: ../../../../integre/ntg/real/behavior.hh:238: +# Assertion `ntg::to_ntg(p) <= ntg::type_traits< T >::max()' failed. + +#morpho_u8.watershed_seg(lena, neighb_c4()) --- 10.241/tools/swilena/python/tests/arith.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/0_arith.py 1.3 744) +++ 10.242/tools/swilena/python/tests/arith.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/w/0_arith.py 1.4 744) @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env python import os import sys --- 10.241/tools/swilena/python/tests/conversions.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/1_conversion 1.2 744) +++ 10.242/tools/swilena/python/tests/conversions.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/w/1_conversion 1.3 744) @@ -1,9 +1,10 @@ -#!/usr/bin/env python +#! /usr/bin/env python import os import sys import ltihooks -from swilena_all2d import * +from swilena_image2d import * +from swilena_conversions2d import * imgdir = os.environ['IMGDIR'] --- 10.241/tools/swilena/ruby/tests/sanity.rb Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/38_sanity.rb 1.2 755) +++ 10.242/tools/swilena/ruby/tests/sanity.rb Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/w/38_sanity.rb 1.3 755) @@ -2,7 +2,6 @@ # Sanity check: include all Ruby modules, but do nothing. - # Set swilena_path to the location where swilena ruby modules are. if ENV.has_key? "SWILENA_PATH" $:.concat ENV["SWILENA_PATH"].split(":") --- 10.241/tools/swilena/python/tests/sanity.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/39_sanity.py 1.2 744) +++ 10.242/tools/swilena/python/tests/sanity.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/w/39_sanity.py 1.3 744) @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env python # Sanity check: include all Python modules, but do nothing.

1 0

oln-0.10 10.241: Adjust Swilena to Libtool.
by Roland Levillain 11 Jul '06

11 Jul '06

2006-07-11 Roland Levillain <roland(a)lrde.epita.fr> Adjust Swilena to Libtool. * expand.sh (INCLUDES): Merge with... (AM_CPPFLAGS): ...this. Add -I\$(srcdir)/../meta. (AM_LDFLAGS): Remove $(SHARED_LDFLAGS). Add -avoid-version -module -shared (for Libtool). (AM_SWIG_FLAGS): New. Adjust the generation of the SWIG wrapper. Create wrappers with extension `.cc' instead of `.cxx'. Build `.la' modules instead of `.so'. (pyexec_PROGRAMS): Rename as... (pyexec_LTLIBRARIES): ...this. (python_PYTHON): Rename as... (nodist_python_PYTHON): ...this. (CLEANFILES): Clean `.pyc' files and Rblena wrappers. (ruby_PROGRAMS): Rename as... (ruby_LTLIBRARIES): ...this. (ruby_DATA): New. * python/ltihooks.py: New file. * python/Makefile.am (EXTRA_DIST): Add ltihooks.py. ($(srcdir)/makefile.swig): New target. * python/tests/arith.py, python/tests/conversions.py, * python/tests/morpho.py, python/tests/sanity.py, * python/tests/simple1.py: Import ltihooks. * python/tests/Makefile.am (TESTS_ENVIRONMENT): Adjust PYTHONPATH. * ruby/ltrequire.rb: New file. * ruby/Makefile.am (EXTRA_DIST): Add ltrequire.rb. ($(srcdir)/makefile.swig): New target. * ruby/tests/sanity.rb, ruby/tests/simple1.rb: Adjust `$:' Require ltrequire. * ruby/tests/Makefile.am (TESTS_ENVIRONMENT): Adjust SWILENA_PATH. --- 10.240/tools/swilena/expand.sh Fri, 07 Jul 2006 18:29:56 +0200 levill_r (oln/s/25_expand.sh 1.19 700) +++ 10.241/tools/swilena/expand.sh Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/s/25_expand.sh 1.20 700) @@ -85,26 +85,28 @@ ## NOTE: this file was generated automatically by expand.sh ## -INCLUDES = \$(PYTHON_CPPFLAGS) -I\$(srcdir)/../src -AM_CPPFLAGS = -DOLN_EXCEPTIONS +AM_CPPFLAGS = -DOLN_EXCEPTIONS \$(PYTHON_CPPFLAGS) \\ + -I\$(srcdir)/../src -I\$(srcdir)/../meta AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) +## We build modules, not plain libs. +AM_LDFLAGS = -avoid-version -module -shared \$(ZLIB_LDFLAGS) +AM_SWIG_FLAGS = -c++ -python \$(AM_CPPFLAGS) EOF } dump_python() { - echo -n "pyexec_PROGRAMS =" + echo -n "pyexec_LTLIBRARIES =" ilist=0 for mod in $MODULES; do if [ `expr $ilist % 4` = 0 ]; then echo " \\"; echo -ne "\t" fi - echo -n " _swilena_$mod.so" + echo -n " _swilena_$mod.la" ilist=`expr $ilist + 1` done echo; echo - echo -n "python_PYTHON +=" + echo -n "nodist_python_PYTHON =" ilist=0 for mod in $MODULES; do if [ `expr $ilist % 4` = 0 ]; then @@ -115,19 +117,21 @@ done echo; echo for mod in $MODULES; do - echo "_swilena_${mod}_so_SOURCES = swilena_${mod}_wrap.cxx" + echo "nodist__swilena_${mod}_la_SOURCES = swilena_${mod}_wrap.cc" done echo; echo echo -ne "CLEANFILES= " - echo -e " swilena_all1d_wrap.cxx \\" - echo -e " swilena_all2d_wrap.cxx \\" - echo -e " swilena_all3d_wrap.cxx \\" - echo -ne " swilena_display_wrap.cxx" + echo -e " swilena_all1d_wrap.cc \\" + echo -e " swilena_all2d_wrap.cc \\" + echo -e " swilena_all3d_wrap.cc \\" + echo -ne " swilena_display_wrap.cc" for mod in $MODULES; do echo -e "\\" echo -ne "\t swilena_$mod.py" echo -e "\\" - echo -ne "\t swilena_${mod}_wrap.cxx" + echo -ne "\t swilena_$mod.pyc" + echo -e "\\" + echo -ne "\t swilena_${mod}_wrap.cc" done echo; echo @@ -147,10 +151,10 @@ # here. base="swilena_${mod}" src="\$(srcdir)/../$sdir/$base.i" - dest="${base}_wrap.cxx" + dest="${base}_wrap.cc" cat <<EOF $dest: $src - if \$(SWIG) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc -c++ -python -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o $dest $src; \\ + if \$(SWIG) \$(AM_SWIG_FLAGS) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc \$(CPPFLAGS) -o \$@ \$<; \\ then \\ mv -f "\$(DEPDIR)/${base}_wrap.Tcc" "\$(DEPDIR)/${base}_wrap.Pcc"; \\ else \\ @@ -177,30 +181,45 @@ ## NOTE: this file was generated automatically by expand.sh ## -INCLUDES = \$(RUBY_CPPFLAGS) -I\$(srcdir)/../src -AM_CPPFLAGS = -DOLN_EXCEPTIONS +AM_CPPFLAGS = -DOLN_EXCEPTIONS \$(RUBY_CPPFLAGS) \\ + -I\$(srcdir)/../src -I\$(srcdir)/../meta AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) - +## We build modules, not plain libs. +AM_LDFLAGS = -avoid-version -module -shared \$(ZLIB_LDFLAGS) +AM_SWIG_FLAGS = -c++ -ruby \$(AM_CPPFLAGS) EOF } dump_ruby() { - echo -n "ruby_PROGRAMS =" + echo -n "ruby_LTLIBRARIES =" ilist=0 for mod in $MODULES; do if [ `expr $ilist % 4` = 0 ]; then echo " \\"; echo -ne "\t" fi - echo -n " swilena_$mod.so" + echo -n " swilena_$mod.la" ilist=`expr $ilist + 1` done echo; echo for mod in $MODULES; do - echo "swilena_${mod}_so_SOURCES = swilena_${mod}_wrap.cxx" + echo "nodist_swilena_${mod}_la_SOURCES = swilena_${mod}_wrap.cc" done echo + echo -ne "CLEANFILES= " + echo -e " swilena_all1d_wrap.cc \\" + echo -e " swilena_all2d_wrap.cc \\" + echo -e " swilena_all3d_wrap.cc \\" + echo -ne " swilena_display_wrap.cc" + for mod in $MODULES; do + echo -e "\\" + echo -ne "\t swilena_${mod}_wrap.cc" + done + echo; echo + + echo "ruby_DATA =" + echo + ilist=0 for mod in $MODULES; do if [ -r "$SWILENA/src/swilena_${mod}.i" ]; then @@ -212,10 +231,10 @@ # interface. base="swilena_${mod}" src="\$(srcdir)/../$sdir/$base.i" - dest="${base}_wrap.cxx" + dest="${base}_wrap.cc" cat <<EOF $dest: $src - if \$(SWIG) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc -c++ -ruby -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o $dest $src; \\ + if \$(SWIG) \$(AM_SWIG_FLAGS) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc \$(CPPFLAGS) -o \$@ \$<; \\ then \\ mv -f "\$(DEPDIR)/${base}_wrap.Tcc" "\$(DEPDIR)/${base}_wrap.Pcc"; \\ else \\ @@ -225,7 +244,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./\$(DEPDIR)/${base}_wrap.Pcc@am__quote@ EOF + +# Work around an issue between Libtool and Ruby on Mac OS X. +# Libtool generates dynamic modules ending in `.so', but the Ruby +# interpreter accepts only files ending in `.bundle' (and obviously +# `.rb') as arguments of the `require' method. Hence we create +# aliases for the .so files to make them appear as .bundle's +# to ruby. + cat <<EOF +ruby_DATA+ = .libs/$base.bundle +.libs/$base.bundle: .libs/$base.so $base.la + cd .libs && \$(LN_S) -f $base.so $base.bundle + +EOF done + + echo -n "CLEANFILES += \$(ruby_DATA)" } ############ Generic stuff ########### --- 10.240/tools/swilena/python/tests/Makefile.am Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/v/15_Makefile.a 1.7 644) +++ 10.241/tools/swilena/python/tests/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/15_Makefile.a 1.8 644) @@ -6,7 +6,7 @@ dist_noinst_DATA = sanity.py arith.py conversions.py simple1.py morpho.py TESTS_ENVIRONMENT = \ - PYTHONPATH="$(PYTHONPATH):..:$(srcdir)/.." \ + PYTHONPATH="..:$(srcdir)/..:$(PYTHONPATH):" \ IMGDIR="$(top_srcdir)/olena/img" TESTS = $(dist_noinst_DATA) --- 10.240/tools/swilena/python/tests/simple1.py Thu, 09 Oct 2003 16:21:55 +0200 burrus_n (oln/v/16_simple1.py 1.4 744) +++ 10.241/tools/swilena/python/tests/simple1.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/16_simple1.py 1.5 744) @@ -2,6 +2,7 @@ import os import sys +import ltihooks from swilena_image2d import * from swilena_ntg import * --- 10.240/tools/swilena/ruby/Makefile.am Wed, 28 Apr 2004 14:20:16 +0200 van-vl_n (oln/v/17_Makefile.a 1.7 600) +++ 10.241/tools/swilena/ruby/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/17_Makefile.a 1.8 600) @@ -7,6 +7,9 @@ rubydir = $(libdir)/ruby -include makefile.swig +# ltrequire.rb: Extension of the `require' understanding Libtool libraries. +EXTRA_DIST = ltrequire.rb -CLEANFILES = *.cxx +$(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh + top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/ +include $(srcdir)/makefile.swig --- 10.240/tools/swilena/ruby/tests/Makefile.am Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/v/18_Makefile.a 1.6 644) +++ 10.241/tools/swilena/ruby/tests/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/18_Makefile.a 1.7 644) @@ -4,7 +4,7 @@ ## TESTS_ENVIRONMENT = \ - SWILENA_PATH=".." \ + SWILENA_PATH="$(srcdir)/..:..:../.libs" \ IMGDIR="$(top_srcdir)/olena/img" dist_noinst_DATA = sanity.rb simple1.rb --- 10.240/tools/swilena/ruby/tests/simple1.rb Thu, 09 Oct 2003 16:21:55 +0200 burrus_n (oln/v/19_simple1.rb 1.4 755) +++ 10.241/tools/swilena/ruby/tests/simple1.rb Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/19_simple1.rb 1.5 755) @@ -1,8 +1,11 @@ #!/usr/bin/env ruby # Set swilena_path to the location where swilena ruby modules are -$: << ENV["SWILENA_PATH"] if ENV.has_key? "SWILENA_PATH" +if ENV.has_key? "SWILENA_PATH" + $:.concat ENV["SWILENA_PATH"].split(":") +end +require "ltrequire" require "swilena_image2d" require "swilena_ntg" --- 10.240/tools/swilena/python/tests/morpho.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/47_morpho.py 1.2 744) +++ 10.241/tools/swilena/python/tests/morpho.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/47_morpho.py 1.3 744) @@ -2,6 +2,7 @@ import os import sys +import ltihooks from swilena_all2d import * imgdir = os.environ['IMGDIR'] --- 10.240/tools/swilena/python/tests/arith.py Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/w/0_arith.py 1.2 744) +++ 10.241/tools/swilena/python/tests/arith.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/0_arith.py 1.3 744) @@ -2,6 +2,7 @@ import os import sys +import ltihooks from swilena_image2d import * from swilena_arith2d import * --- 10.240/tools/swilena/python/tests/conversions.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/w/1_conversion 1.1 744) +++ 10.241/tools/swilena/python/tests/conversions.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/1_conversion 1.2 744) @@ -2,6 +2,7 @@ import os import sys +import ltihooks from swilena_all2d import * imgdir = os.environ['IMGDIR'] --- 10.240/tools/swilena/python/Makefile.am Tue, 20 Apr 2004 18:09:05 +0200 van-vl_n (oln/w/2_Makefile.a 1.7 600) +++ 10.241/tools/swilena/python/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/2_Makefile.a 1.8 600) @@ -5,7 +5,13 @@ SUBDIRS = . tests -python_PYTHON = swilena_display.py swilena_all1d.py swilena_all2d.py swilena_all3d.py +# ltihooks.py: Python import hooks understanding Libtool libraries. +EXTRA_DIST = ltihooks.py -include makefile.swig +python_PYTHON = \ + swilena_display.py \ + swilena_all1d.py swilena_all2d.py swilena_all3d.py +$(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh + top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/ +include $(srcdir)/makefile.swig --- 10.240/tools/swilena/ruby/tests/sanity.rb Fri, 30 Jun 2006 17:48:53 +0200 levill_r (oln/w/38_sanity.rb 1.1 755) +++ 10.241/tools/swilena/ruby/tests/sanity.rb Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/38_sanity.rb 1.2 755) @@ -4,8 +4,11 @@ # Set swilena_path to the location where swilena ruby modules are. -$: << ENV["SWILENA_PATH"] if ENV.has_key? "SWILENA_PATH" +if ENV.has_key? "SWILENA_PATH" + $:.concat ENV["SWILENA_PATH"].split(":") +end +require "ltrequire" # Integre types. require "swilena_ntg" --- 10.240/tools/swilena/python/tests/sanity.py Fri, 30 Jun 2006 17:48:53 +0200 levill_r (oln/w/39_sanity.py 1.1 744) +++ 10.241/tools/swilena/python/tests/sanity.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/39_sanity.py 1.2 744) @@ -2,6 +2,7 @@ # Sanity check: include all Python modules, but do nothing. +import ltihooks # Integre types. import swilena_ntg

1 0

oln-0.10 10.240: Use Libtool
by Roland Levillain 11 Jul '06

11 Jul '06

2006-07-11 Roland Levillain <roland(a)lrde.epita.fr> Use Libtool. * config/oln.m4 (AC_SHARED_LDFLAGS): Remove. * configure.ac: No longer use AC_SHARED_LDFLAGS. Use AC_PROG_LIBTOOL. Index: 10.239/configure.ac --- 10.239/configure.ac Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.8 600) +++ 10.240/configure.ac Tue, 11 Jul 2006 15:25:21 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.9 600) @@ -23,6 +23,9 @@ AC_PROG_RANLIB AC_PROG_CC +# Use Libtool to build Swilena's dynamic modules. +AC_PROG_LIBTOOL + # If available, use these. AC_WITH_CXX_ZLIB AC_WITH_CXX_FFTW @@ -388,8 +391,6 @@ AC_CHECK_SWIG_FLAGS - AC_SHARED_LDFLAGS - AC_ARG_VAR([DVIPS], [program to make Postscript from TeX DVI files]) AC_CHECK_PROGS([DVIPS], [dvips], [$am_aux_dir/missing dvips]) AC_ARG_VAR([TEXI2DVI], [program to create DVI from Texinfo files]) Index: 10.239/config/oln.m4 --- 10.239/config/oln.m4 Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/j/15_oln.m4 1.38.1.14 600) +++ 10.240/config/oln.m4 Tue, 11 Jul 2006 15:25:21 +0200 levill_r (oln/j/15_oln.m4 1.38.1.15 600) @@ -650,54 +650,6 @@ AC_LANG_POP([C++]) ]) -# AC_SHARED_LDFLAGS - -# Queries the linker and set the required LDFLAGS for creating a -# shared library. - -# FIXME: This is a simple hack to have Swilena compile on our main -# targets (GNU/Linux/IA-32, Mac OS X/PowerPC). We should obviously -# use Libtool instead, as it handle a whole lot more -# linkers and parameters. - -AC_DEFUN([AC_SHARED_LDFLAGS], -[dnl - AC_CACHE_CHECK([for linker flags to create a shared library], - [ac_cv_ld_style], - [ac_cv_ld_style=unknown - # FIXME: We should not use a hard-coded name for the - # linker, but I can't find a means to get the (C++) linker - # from Autoconf. - if ld -v 2>&1 | grep -i "Apple Computer" >/dev/null 2>&1; - then - ac_cv_ld_style=Apple - elif ld -v 2>&1 | grep -i "GNU" >/dev/null 2>&1; then - ac_cv_ld_style=GNU - else - ac_cv_ld_style=other - fi]) - - case "$ac_cv_ld_style" in - GNU) - _SHARED_LDFLAGS="-shared" - ;; - Apple) - # Seen on http://www.penzilla.net/tutorials/python/swig/. - _SHARED_LDFLAGS="-bundle -flat_namespace -undefined suppress" - ;; - other) - # Default: assume we're using GNU ld. - _SHARED_LDFLAGS="-shared" - ;; - esac - - if test ! ${SHARED_LDFLAGS+set}; then - SHARED_LDFLAGS=$_SHARED_LDFLAGS - fi - - AC_SUBST([SHARED_LDFLAGS]) -]) - ### ### Internal stuff for Olena ###

1 0

oln-0.10 10.239: Add missing files to the distribution
by Roland Levillain 07 Jul '06

07 Jul '06

2006-07-07 Roland Levillain <roland(a)lrde.epita.fr> Add missing files to the distribution. * Makefile.am (EXTRA_DIST): Add bootstrap.sh. Index: 10.238/tools/swilena/ChangeLog --- 10.238/tools/swilena/ChangeLog Fri, 07 Jul 2006 18:29:56 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.42 600) +++ 10.239/tools/swilena/ChangeLog Fri, 07 Jul 2006 18:40:24 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.43 600) @@ -1,3 +1,12 @@ +2006-07-07 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing files to the distribution. + + * Makefile.am (EXTRA_DIST): New. + Add expand.sh, generate_arith_instantiations.py, + generate_conversions_instantiations.py and + generate_morpho_instantiations.py. + 2006-07-06 Roland Levillain <roland(a)lrde.epita.fr> Use SHARED_LDFLAGS. Index: 10.238/Makefile.am --- 10.238/Makefile.am Fri, 22 Aug 2003 10:44:47 +0200 astrid (oln/n/32_Makefile.a 1.17.1.2.1.7 600) +++ 10.239/Makefile.am Fri, 07 Jul 2006 18:40:24 +0200 levill_r (oln/n/32_Makefile.a 1.17.1.2.1.8 600) @@ -19,7 +19,7 @@ ### Development files . ### -EXTRA_DIST = config/oln-local.m4 contrib/runtests +EXTRA_DIST = bootstrap.sh config/oln-local.m4 contrib/runtests ### ### Basic doc files generation. Index: 10.238/tools/swilena/Makefile.am --- 10.238/tools/swilena/Makefile.am Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/o/25_Makefile.a 1.5 600) +++ 10.239/tools/swilena/Makefile.am Fri, 07 Jul 2006 18:40:24 +0200 levill_r (oln/o/25_Makefile.a 1.6 600) @@ -1,3 +1,9 @@ ## Process this file through Automake to produce Makefile.in -*- Makefile -*- SUBDIRS = meta src doc $(OLN_SWILENA_SUBDIRS) + +EXTRA_DIST = \ + expand.sh \ + generate_arith_instantiations.py \ + generate_conversions_instantiations.py \ + generate_morpho_instantiations.py

1 0

oln-0.10 10.238: Use SHARED_LDFLAGS in Swilena
by Roland Levillain 07 Jul '06

07 Jul '06

2006-07-06 Roland Levillain <roland(a)lrde.epita.fr> Use SHARED_LDFLAGS. * expand.sh (AM_LDFLAGS): Replace -shared with $(SHARED_LDFLAGS). ($base.rb): Remove this (useless) rule. Index: 10.237/tools/swilena/expand.sh --- 10.237/tools/swilena/expand.sh Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/s/25_expand.sh 1.18 700) +++ 10.238/tools/swilena/expand.sh Fri, 07 Jul 2006 18:29:56 +0200 levill_r (oln/s/25_expand.sh 1.19 700) @@ -88,7 +88,7 @@ INCLUDES = \$(PYTHON_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -AM_LDFLAGS = -shared \$(ZLIB_LDFLAGS) +AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) EOF } @@ -180,9 +180,7 @@ INCLUDES = \$(RUBY_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -# FIXME: Modern versions of swig don't use libswigpy. -#AM_LDFLAGS = -shared -lswigrb \$(ZLIB_LDFLAGS) -AM_LDFLAGS = -shared \$(ZLIB_LDFLAGS) +AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) EOF } @@ -210,13 +208,8 @@ else sdir=meta fi - # Rule generating a C++ (*_wrap.cc) and a Ruby (*.rb) wrappers from a - # SWIG interface. - # - # FIXME: The generation of the Ruby wrapper is separated from - # the one of the C++ wrapper in this version, and that's not good. - # We should use Make's trick for multiple outputs (with timestamps) - # here. + # Rule generating a C++ (*_wrap.cc) wrapper for Ruby from a SWIG + # interface. base="swilena_${mod}" src="\$(srcdir)/../$sdir/$base.i" dest="${base}_wrap.cxx" @@ -231,9 +224,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./\$(DEPDIR)/${base}_wrap.Pcc@am__quote@ -$base.rb: $src - \$(MAKE) \$(AM_MAKEFLAGS) $dest - EOF done }

1 0

oln-0.10 10.237: Compute LDFLAGS required to create shared libraries
by Roland Levillain 07 Jul '06

07 Jul '06

I'll try to use Libtool in Olena 0.10a (soon) to replace this hack. 2006-07-07 Roland Levillain <roland(a)lrde.epita.fr> Add an Autoconf macro to figure out what are the linker flags for creating a shared library. This is actually a hack, hopefully replaced by Libtool in a future update. * config/oln.m4 (AC_SHARED_LDFLAGS): New macro. * configure.ac: Use it. Save CPPFLAGS before altering them. Index: 10.236/configure.ac --- 10.236/configure.ac Thu, 24 Jun 2004 18:10:23 +0200 odou_s (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.7 600) +++ 10.237/configure.ac Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.8 600) @@ -388,6 +388,8 @@ AC_CHECK_SWIG_FLAGS + AC_SHARED_LDFLAGS + AC_ARG_VAR([DVIPS], [program to make Postscript from TeX DVI files]) AC_CHECK_PROGS([DVIPS], [dvips], [$am_aux_dir/missing dvips]) AC_ARG_VAR([TEXI2DVI], [program to create DVI from Texinfo files]) @@ -438,6 +440,7 @@ echo $line fi done`"]) + save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS" AC_CHECK_HEADERS([ruby.h],, AC_MSG_ERROR( Index: 10.236/config/oln.m4 --- 10.236/config/oln.m4 Tue, 04 Jul 2006 13:33:04 +0200 levill_r (oln/j/15_oln.m4 1.38.1.13 600) +++ 10.237/config/oln.m4 Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/j/15_oln.m4 1.38.1.14 600) @@ -650,6 +650,54 @@ AC_LANG_POP([C++]) ]) +# AC_SHARED_LDFLAGS + +# Queries the linker and set the required LDFLAGS for creating a +# shared library. + +# FIXME: This is a simple hack to have Swilena compile on our main +# targets (GNU/Linux/IA-32, Mac OS X/PowerPC). We should obviously +# use Libtool instead, as it handle a whole lot more +# linkers and parameters. + +AC_DEFUN([AC_SHARED_LDFLAGS], +[dnl + AC_CACHE_CHECK([for linker flags to create a shared library], + [ac_cv_ld_style], + [ac_cv_ld_style=unknown + # FIXME: We should not use a hard-coded name for the + # linker, but I can't find a means to get the (C++) linker + # from Autoconf. + if ld -v 2>&1 | grep -i "Apple Computer" >/dev/null 2>&1; + then + ac_cv_ld_style=Apple + elif ld -v 2>&1 | grep -i "GNU" >/dev/null 2>&1; then + ac_cv_ld_style=GNU + else + ac_cv_ld_style=other + fi]) + + case "$ac_cv_ld_style" in + GNU) + _SHARED_LDFLAGS="-shared" + ;; + Apple) + # Seen on http://www.penzilla.net/tutorials/python/swig/. + _SHARED_LDFLAGS="-bundle -flat_namespace -undefined suppress" + ;; + other) + # Default: assume we're using GNU ld. + _SHARED_LDFLAGS="-shared" + ;; + esac + + if test ! ${SHARED_LDFLAGS+set}; then + SHARED_LDFLAGS=$_SHARED_LDFLAGS + fi + + AC_SUBST([SHARED_LDFLAGS]) +]) + ### ### Internal stuff for Olena ###

1 0

oln-0.10 10.236: Fix sanity tests
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Fix sanity tests. * oln/io/se_fwd.hh: New file. * oln/io/base.hh: Include it, and move the inclusions of oln/io/se_window.hh and oln/io/se_neighborhood.hh at the end of the file to prevent cycles in header inclusions from leading to ill-formed calls to template functions. * oln/makefile.src (OLN_DEP): Add io/se_fwd.hh. Index: 10.235/oln.prj --- 10.235/oln.prj +++ 10.235(w)/oln.prj @@ -1496,6 +1496,11 @@ ;; to version 10.232(w), by levill_r: (olena/oln/convert/float_cmp.hh (oln/w/40_float_cmp. 1.1 644)) + +;; Files added by populate at Wed, 05 Jul 2006 18:20:54 +0200, +;; to version 10.235(w), by levill_r: + + (olena/oln/io/se_fwd.hh ()) ) (Merge-Parents) (New-Merge-Parents) Index: 10.235/olena/oln/io/base.hh --- 10.235/olena/oln/io/base.hh Fri, 19 Mar 2004 18:50:43 +0100 odou_s (oln/b/20_base.hh 1.10 600) +++ 10.235(w)/olena/oln/io/base.hh Wed, 05 Jul 2006 16:46:11 +0200 levill_r (oln/b/20_base.hh 1.10 600) @@ -30,9 +30,8 @@ # include <oln/io/image_read.hh> # include <oln/io/image_write.hh> - -# include <oln/io/se_window.hh> -# include <oln/io/se_neighborhood.hh> +/// Forward declarations. +# include <oln/io/se_fwd.hh> namespace oln { @@ -134,4 +133,8 @@ } // end of namespace oln +// Implementations. +# include <oln/io/se_window.hh> +# include <oln/io/se_neighborhood.hh> + #endif // OLENA_IO_BASE_HH Index: 10.235/olena/oln/makefile.src --- 10.235/olena/oln/makefile.src Wed, 05 Jul 2006 18:12:32 +0200 levill_r (oln/r/4_makefile.s 1.8 600) +++ 10.235(w)/olena/oln/makefile.src Wed, 05 Jul 2006 18:20:32 +0200 levill_r (oln/r/4_makefile.s 1.8 600) @@ -138,6 +138,7 @@ io/pnm_write_data.hh \ io/readable.hh \ io/se.hh \ + io/se_fwd.hh \ io/se_neighborhood.hh \ io/se_window.hh \ io/stream_wrapper.hh \ Only in 10.235(w): olena/oln/io/se_fwd.hh

1 0