oln 10.178: Add Sanity Check. Fix make clean in swilena.
20 Apr
2004
20 Apr
'04
4:15 p.m.
[Ce n'est pas mon jour, je ne devais pas checkin les
generate*py. J'avais une version diminué pour accélerer
la compilation de swilena]
Index: integre/ChangeLog
from Niels Van Vliet <niels@lrde.epita.fr>
* integre/tests/sanity/Makefile.am: Replace maintainer-check by check.
+2004-04-20 Niels Van Vliet <niels@lrde.epita.fr>
+
* integre/ntg/core/internal/traits.hh: Include headers so as to pass
sanity check.
Index: metalic/ChangeLog
from Niels Van Vliet <niels@lrde.epita.fr>
* metalic/tests/sanity/Makefile.am: Replace maintainer-check by check.
+2004-04-20 Niels Van Vliet <niels@lrde.epita.fr>
+
* tests/*/tests/* (6 files): Add copyright.
2004-04-13 Niels Van Vliet <niels@lrde.epita.fr>
Index: olena/ChangeLog
from Niels Van Vliet <niels@lrde.epita.fr>
* olena/tests/sanity/Makefile.am: Replace maintainer-check by check.
+2004-04-20 Niels Van Vliet <niels@lrde.epita.fr>
+
* olena/oln/convert/rgbhsl.hh: Include headers so as to pass
sanity check.
* olena/oln/snakes/energies.hh: Likewise.
Index: tools/swilena/ChangeLog
from Niels Van Vliet <niels@lrde.epita.fr>
* tools/swilena/expand.sh (generation of makefile.swig): Add cxx
files to CLEANFILES.
* tools/swilena/python/Makefile.am (CLEANFILES): Remove.
+2004-04-20 Niels Van Vliet <niels@lrde.epita.fr>
+
* swilena/python/Makefile.am: Add new line at end of file.
2004-04-20 Niels Van Vliet <niels@lrde.epita.fr>
Index: tools/swilena/python/Makefile.am
--- tools/swilena/python/Makefile.am Tue, 20 Apr 2004 16:03:16 +0200
van-vl_n (oln/w/2_Makefile.a 1.6 600)
+++ tools/swilena/python/Makefile.am Tue, 20 Apr 2004 16:08:52 +0200
van-vl_n (oln/w/2_Makefile.a 1.6 600)
@@ -9,4 +9,3 @@
include makefile.swig
-CLEANFILES = *.pyc *.cxx
Index: olena/tests/sanity/Makefile.am
--- olena/tests/sanity/Makefile.am Wed, 12 Mar 2003 17:13:14 +0100
burrus_n (oln/f/48_Makefile.a 1.4.1.2 600)
+++ olena/tests/sanity/Makefile.am Tue, 20 Apr 2004 16:05:35 +0200
van-vl_n (oln/f/48_Makefile.a 1.4.1.2 600)
@@ -1,6 +1,6 @@
EXTRA_DIST = includes.test
-maintainer-check:
+check:
TOP_SRCDIR=$(top_srcdir) SRCDIR=$(srcdir) \
TOP_BUILDDIR=$(top_builddir) \
PATH_TO_OLN_SRCDIR=$(OLN_LOCAL_SRC) \
Index: tools/swilena/expand.sh
--- tools/swilena/expand.sh Tue, 13 Apr 2004 19:49:30 +0200 thivol_d
(oln/s/25_expand.sh 1.16 700)
+++ tools/swilena/expand.sh Tue, 20 Apr 2004 17:42:29 +0200 van-vl_n
(oln/s/25_expand.sh 1.16 700)
@@ -111,9 +111,15 @@
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"
for mod in $MODULES; do
echo -e "\\"
echo -ne "\t swilena_$mod.py"
+ echo -e "\\"
+ echo -ne "\t swilena_${mod}_wrap.cxx"
done
echo; echo
Index: integre/tests/sanity/Makefile.am
--- integre/tests/sanity/Makefile.am Tue, 13 May 2003 21:32:45 +0200
burrus_n (oln/t/0_Makefile.a 1.1 600)
+++ integre/tests/sanity/Makefile.am Tue, 20 Apr 2004 16:06:17 +0200
van-vl_n (oln/t/0_Makefile.a 1.1 600)
@@ -1,6 +1,6 @@
EXTRA_DIST = includes.test
-maintainer-check:
+check:
TOP_SRCDIR=$(top_srcdir) SRCDIR=$(srcdir) \
TOP_BUILDDIR=$(top_builddir) \
PATH_TO_NTG_SRCDIR=$(NTG_LOCAL_SRC) \
Index: metalic/tests/sanity/Makefile.am
--- metalic/tests/sanity/Makefile.am Tue, 13 May 2003 21:32:45 +0200
burrus_n (oln/t/2_Makefile.a 1.1 600)
+++ metalic/tests/sanity/Makefile.am Tue, 20 Apr 2004 16:06:06 +0200
van-vl_n (oln/t/2_Makefile.a 1.1 600)
@@ -1,6 +1,6 @@
EXTRA_DIST = includes.test
-maintainer-check:
+check:
TOP_SRCDIR=$(top_srcdir) SRCDIR=$(srcdir) \
TOP_BUILDDIR=$(top_builddir) \
PATH_TO_MLC_SRCDIR=$(MLC_LOCAL_SRC) \
Ne pas lire la suite, c'est une err de ma part de l'avoir
checkin.
Index: tools/swilena/generate_morpho_instantiations.py
--- tools/swilena/generate_morpho_instantiations.py Mon, 12 Apr 2004
12:56:30 +0200 van-vl_n (oln/v/24_generate_m 1.8 700)
+++ tools/swilena/generate_morpho_instantiations.py Tue, 20 Apr 2004
16:36:38 +0200 van-vl_n (oln/v/24_generate_m 1.8 700)
@@ -13,13 +13,13 @@
file.close()
def open_files(path):
- for dim in range(1, 4):
+ for dim in range(1, 2):
for type in range(1, 7):
str_type = dict_type_num[type]
files.append(open(path +
"/swilena_morpho%(dim)sd_%(str_type)s.i" % vars(), 'w'))
def write_headers():
- for dim in range(1, 4):
+ for dim in range(1, 2):
for type in range(1, 7):
str_type = dict_type_num[type]
file = files[(dim - 1)* 6 + type - 1]
@@ -50,7 +50,7 @@
def write_algorithms():
# Algorithms with all types and all dims
- for dim in range(1, 4):
+ for dim in range(1, 2):
for type in [ "ntg_bin",
"ntg_int_u8", "ntg_int_u32",
"ntg_int_s8", "ntg_int_s32",
@@ -64,100 +64,7 @@
# FIXME: these algorithms do not work with floats
if type != "ntg_float":
instantiate(idx, "erosion", img_type, img_type, win_type)
- instantiate(idx, "fast_erosion", img_type, img_type, win_type)
-
- instantiate(idx, "dilation", img_type, img_type, win_type)
- instantiate(idx, "fast_dilation", img_type, img_type, win_type)
-
- instantiate(idx, "opening", img_type, img_type, win_type)
- instantiate(idx, "fast_opening", img_type, img_type, win_type)
-
- instantiate(idx, "closing", img_type, img_type, win_type)
- instantiate(idx, "fast_closing", img_type, img_type, win_type)
-
- instantiate(idx, "thickening", img_type, img_type, win_type, win_type)
- instantiate(idx, "fast_thickening", img_type, img_type, win_type,
win_type)
-
- instantiate(idx, "thinning", img_type, img_type, win_type, win_type)
- instantiate(idx, "fast_thinning", img_type, img_type, win_type, win_type)
-
- instantiate(idx, "geodesic_erosion", img_type, img_type, img_type,
neighb_type)
- instantiate(idx, "sure_geodesic_erosion", img_type, img_type,
img_type, neighb_type)
-
- instantiate(idx, "geodesic_dilation", img_type, img_type, img_type,
neighb_type)
- instantiate(idx, "sure_geodesic_dilation", img_type,
img_type, img_type, neighb_type)
-
- instantiate(idx,
"sure_geodesic_reconstruction_dilation", img_type, img_type, img_type,
neighb_type)
- instantiate(idx,
"sequential_geodesic_reconstruction_dilation", img_type, img_type,
img_type, neighb_type)
- instantiate(idx,
"hybrid_geodesic_reconstruction_dilation", img_type, img_type, img_type,
neighb_type)
-
- instantiate(idx,
"sure_geodesic_reconstruction_erosion", img_type, img_type, img_type,
neighb_type)
- instantiate(idx,
"sequential_geodesic_reconstruction_erosion", img_type, img_type,
img_type, neighb_type)
- instantiate(idx,
"hybrid_geodesic_reconstruction_erosion", img_type, img_type, img_type,
neighb_type)
-
- instantiate(idx, "hit_or_miss", img_type, img_type, win_type, win_type)
- instantiate(idx, "fast_hit_or_miss", img_type,
img_type, win_type, win_type)
-
- instantiate(idx, "hit_or_miss_opening", img_type, img_type, win_type,
win_type)
- instantiate(idx, "fast_hit_or_miss_opening", img_type,
img_type, win_type, win_type)
-
- instantiate(idx, "hit_or_miss_opening_bg", img_type, img_type,
win_type, win_type)
- instantiate(idx, "fast_hit_or_miss_opening_bg", img_type, img_type,
win_type, win_type)
-
- instantiate(idx, "hit_or_miss_closing", img_type, img_type, win_type,
win_type)
- instantiate(idx, "fast_hit_or_miss_closing", img_type, img_type,
win_type, win_type)
-
- instantiate(idx, "hit_or_miss_closing_bg", img_type, img_type,
win_type, win_type)
- instantiate(idx, "fast_hit_or_miss_closing_bg", img_type, img_type,
win_type, win_type)
-
- # FIXME: This should work with other types.
- if type != "ntg_bin":
- instantiate(idx, "beucher_gradient", img_type,
img_type, win_type)
- instantiate(idx, "fast_beucher_gradient", img_type,
img_type, win_type)
-
- instantiate(idx, "internal_gradient", img_type,
img_type, win_type)
- instantiate(idx, "fast_internal_gradient",
img_type, img_type, win_type)
-
- instantiate(idx, "external_gradient", img_type,
img_type, win_type)
- instantiate(idx, "fast_external_gradient",
img_type, img_type, win_type)
-
- instantiate(idx, "white_top_hat", img_type,
img_type, win_type)
- instantiate(idx, "fast_white_top_hat", img_type,
img_type, win_type)
-
- instantiate(idx, "black_top_hat", img_type,
img_type, win_type)
- instantiate(idx, "fast_black_top_hat", img_type,
img_type, win_type)
-
- instantiate(idx, "self_complementary_top_hat",
img_type, img_type, win_type)
- instantiate(idx, "fast_self_complementary_top_hat",
img_type, img_type, win_type)
-
- 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()
- 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()
- 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)
-
- instantiate(idx, "sure_regional_minima",
bin_img_type, img_type, neighb_type)
- instantiate(idx, "sequential_regional_minima",
bin_img_type, img_type, neighb_type)
- instantiate(idx, "hybrid_regional_minima",
bin_img_type, img_type, neighb_type)
-
- # Extrema killers
- if dim == 2:
- instantiate(idx, "fast_maxima_killer",
img_type, neighb_type)
- instantiate(idx, "fast_minima_killer",
img_type, neighb_type)
- # FIXME: This should work with other types.
- if type == "ntg_int_u8":
- instantiate(idx, "sure_maxima_killer",
img_type, neighb_type)
- instantiate(idx, "sure_minima_killer",
img_type, neighb_type)
-
- #FIXME: Does not work due to the return type:
- #instantiate(idx, "watershed_seg_or", img_type,
img_type, img_ret_type, neighb_type)
- #instantiate(idx, "laplacian", img_type, img_type,
win_type)
- #instantiate(idx, "fast_laplacian", img_type, img_type, win_type)
+#FIXME
def main():
if len(sys.argv) != 2:
Index: tools/swilena/generate_conversions_instantiations.py
--- tools/swilena/generate_conversions_instantiations.py Mon, 10 Nov
2003 14:09:27 +0100 burrus_n (oln/v/50_generate_c 1.1 700)
+++ tools/swilena/generate_conversions_instantiations.py Tue, 20 Apr
2004 16:36:13 +0200 van-vl_n (oln/v/50_generate_c 1.1 700)
@@ -9,11 +9,11 @@
file.close()
def open_files(path):
- for dim in range(1, 4):
+ for dim in range(1, 2):
files.append(open(path + "/swilena_conversions%(dim)sd.i" % vars(), 'w'))
def write_headers():
- for dim in range(1, 4):
+ for dim in range(1, 2):
file = files[dim - 1]
file.write("""// Note: this file was generated by
generate_conversions_instantiations.py.
@@ -73,7 +73,7 @@
scalar_types = integer_types + [ "ntg_float" ]
# Algorithms with all types and all dims
- for dim in range(1, 4):
+ for dim in range(1, 2):
# stretch, bound and force
for relation in reduce_relations:
for algo in ["stretch", "bound"]:
Index: tools/swilena/generate_arith_instantiations.py
--- tools/swilena/generate_arith_instantiations.py Mon, 10 Nov 2003
14:09:27 +0100 burrus_n (oln/v/51_generate_a 1.1 700)
+++ tools/swilena/generate_arith_instantiations.py Tue, 20 Apr 2004
16:51:33 +0200 van-vl_n (oln/v/51_generate_a 1.1 700)
@@ -9,11 +9,11 @@
file.close()
def open_files(path):
- for dim in range(1, 4):
+ for dim in range(1, 2):
files.append(open(path + "/swilena_arith%(dim)sd.i" % vars(), 'w'))
def write_headers():
- for dim in range(1, 4):
+ for dim in range(1, 2):
file = files[dim - 1]
file.write("""// Note: this file was generated by generate_arith.py.
@@ -52,7 +52,7 @@
def write_algorithms():
# Algorithms with all types and all dims
- for dim in range(1, 4):
+ for dim in range(1, 2):
for type in [ "ntg_bin",
"ntg_int_u8", "ntg_int_u32",
"ntg_int_s8", "ntg_int_s32",
7795
Age (days ago)
7795
Last active (days ago)
0 comments
1 participants
participants (1)
-
Niels Van Vliet