March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/w3ppl(master): Typo fixed.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/w3ppl Branch: master Commit: 5387e5987dcd6228f2aa1433b2c8d7191e4f5b79 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/w3ppl.git;a=commit;h=5387e5987d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 21:25:22 2009 +0200 Typo fixed. --- htdocs/Download/Git.raw | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/htdocs/Download/Git.raw b/htdocs/Download/Git.raw index 4999d0b..43dc890 100644 --- a/htdocs/Download/Git.raw +++ b/htdocs/Download/Git.raw @@ -105,7 +105,7 @@ web pages. To fully clone it, do, e.g., <P> If you are behind a firewall that only allows you access to the outside -word via http (possibly with the intermediation of a proxy), you can use +world via HTTP (possibly with the intermediation of a proxy), you can use the alternative commands </P> <BLOCKQUOTE>

1 0

[GIT] ppl/w3ppl(master): Explained how to anonymously clone the repository via the HTTP protocol.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/w3ppl Branch: master Commit: 1b39d68ce71c84d4b698b530ac4b3f80a0c0153e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/w3ppl.git;a=commit;h=1b39d68ce7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 21:22:56 2009 +0200 Explained how to anonymously clone the repository via the HTTP protocol. --- htdocs/Download/Git.raw | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/htdocs/Download/Git.raw b/htdocs/Download/Git.raw index 7dc820d..4999d0b 100644 --- a/htdocs/Download/Git.raw +++ b/htdocs/Download/Git.raw @@ -103,6 +103,18 @@ web pages. To fully clone it, do, e.g., <CODE>git clone git://git.cs.unipr.it/ppl/w3ppl.git</CODE> </BLOCKQUOTE> +<P> +If you are behind a firewall that only allows you access to the outside +word via http (possibly with the intermediation of a proxy), you can use +the alternative commands +</P> +<BLOCKQUOTE> + <CODE>git clone http://www.cs.unipr.it/git/ppl/ppl.git</CODE> +</BLOCKQUOTE> +<BLOCKQUOTE> + <CODE>git clone http://www.cs.unipr.it/git/ppl/w3ppl.git</CODE> +</BLOCKQUOTE> + <A NAME="read-write-access"/> <H2>Read-Write Git Access</H2>

1 0

[GIT] ppl/ppl(master): Disable test19() on the Alpha.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: dd82590da6f24fb84b0c794d4be71468b6cc1da3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dd82590da6f2… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 18:56:44 2009 +0000 Disable test19() on the Alpha. --- tests/Box/relations4.cc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tests/Box/relations4.cc b/tests/Box/relations4.cc index fd3204c..1367591 100644 --- a/tests/Box/relations4.cc +++ b/tests/Box/relations4.cc @@ -480,6 +480,9 @@ BEGIN_MAIN DO_TEST(test16); DO_TEST(test17); DO_TEST(test18); +#ifndef __alpha__ + // Exception handling is broken in GCC on the Alpha. DO_TEST(test19); +#endif DO_TEST(test20); END_MAIN

1 0

[GIT] ppl/ppl(master): Fixed *_CPPFLAGS variables.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 2f2eadcbe1e80567a58e1b4c2cf3cbb4a561b6ff URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2f2eadcbe1e8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 19:15:03 2009 +0200 Fixed *_CPPFLAGS variables. --- interfaces/C/tests/Makefile.am | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/interfaces/C/tests/Makefile.am b/interfaces/C/tests/Makefile.am index d303e7e..0aba602 100644 --- a/interfaces/C/tests/Makefile.am +++ b/interfaces/C/tests/Makefile.am @@ -27,7 +27,6 @@ TESTS_ENVIRONMENT = $(CHECKER) AM_CPPFLAGS = \ -I$(top_builddir)/interfaces/C \ --I$(top_builddir)/src \ @extra_includes@ \ @debug_flag@ @@ -55,6 +54,10 @@ ppl_c_test.cc nodist_EXTRA_libppl_c_tests_a_SOURCES = \ dummy.cc +libppl_c_tests_a_CPPFLAGS = \ +-I$(top_builddir)/interfaces/C \ +@extra_includes@ + LDADD = \ libppl_c_tests.a \ $(top_builddir)/interfaces/C/libppl_c.la \

1 0

[GIT] ppl/ppl(master): Include "ppl_c_test.h" instead of "ppl_c.h".
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 2824c7f7c27746823c6a9c084bf183afd34edeb1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2824c7f7c277… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 19:14:25 2009 +0200 Include "ppl_c_test.h" instead of "ppl_c.h". --- interfaces/C/tests/formatted_output.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/C/tests/formatted_output.c b/interfaces/C/tests/formatted_output.c index c83a984..1381adc 100644 --- a/interfaces/C/tests/formatted_output.c +++ b/interfaces/C/tests/formatted_output.c @@ -20,8 +20,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ -#include "ppl_c.h" #include "ppl_c_test.h" + #include "print_to_buffer.h" #include <stdio.h>

1 0

[GIT] ppl/ppl(master): Include "ppl_c.h".
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 57e7cee40f6e2811b859ae196534879f31a78a6a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=57e7cee40f6e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 19:13:50 2009 +0200 Include "ppl_c.h". --- interfaces/C/tests/ppl_c_test.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/interfaces/C/tests/ppl_c_test.h b/interfaces/C/tests/ppl_c_test.h index 5ca4b34..ad729d0 100644 --- a/interfaces/C/tests/ppl_c_test.h +++ b/interfaces/C/tests/ppl_c_test.h @@ -23,6 +23,8 @@ site: http://www.cs.unipr.it/ppl/ . */ #ifndef PPL_ppl_c_test_h #define PPL_ppl_c_test_h 1 +#include "ppl_c.h" + #ifdef __cplusplus extern "C" { #endif

1 0

[GIT] ppl/ppl(master): Avoid redefining NDEBUG.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 2b87c02d3875f58c799481cec96f0e943f16d7b4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2b87c02d3875… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 19:13:12 2009 +0200 Avoid redefining NDEBUG. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 52203fd..cfc97cb 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AH_TOP([ ]) AH_BOTTOM([ -#ifdef PPL_NDEBUG +#if defined(PPL_NDEBUG) && !defined(NDEBUG) # define NDEBUG PPL_NDEBUG #endif

1 0

[GIT] ppl/ppl(master): Register PPL_timeout_exception in the OCaml interface.
by Enea Zaffanella 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 9677eb06b871033c05f54a552fc6f583bda2fff5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9677eb06b871… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 30 18:47:53 2009 +0200 Register PPL_timeout_exception in the OCaml interface. Avoid flood of warnings by directly thowing CAML exceptions in CATCH_ALL. Still debugging the handling of timeouts. --- .../OCaml/ppl_interface_generator_ocaml_ml.m4 | 2 +- interfaces/OCaml/ppl_ocaml_common.cc | 14 +--- interfaces/OCaml/ppl_ocaml_common.defs.hh | 48 ++++++----- interfaces/OCaml/tests/Makefile.am | 9 ++- interfaces/OCaml/tests/test1.ml | 91 +++++++++++--------- 5 files changed, 85 insertions(+), 79 deletions(-) diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_ml.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_ml.m4 index a54e157..7379217 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_ml.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_ml.m4 @@ -42,7 +42,7 @@ let _ = Callback.register_exception "PPL_arithmetic_overflow" (Error "any string let _ = Callback.register_exception "PPL_internal_error" (Error "any string") let _ = Callback.register_exception "PPL_unknown_standard_exception" (Error "any string") let _ = Callback.register_exception "PPL_not_an_unsigned_exception" (Error "any string") - +let _ = Callback.register_exception "PPL_timeout_error" (Error "any string") let _ = Callback.register_exception "PPL_unexpected_error" (Error "any string") m4_divert(-1) diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index a705ffd..e13a4ee 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -83,25 +83,17 @@ class PFunc { Parma_Watchdog_Library::Watchdog* p_timeout_object = 0; +#endif // PPL_WATCHDOG_LIBRARY_ENABLED + void reset_timeout() { +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED if (p_timeout_object) { delete p_timeout_object; p_timeout_object = 0; abandon_expensive_computations = 0; } -} - #endif // PPL_WATCHDOG_LIBRARY_ENABLED - -void -handle_timeout_exception() { -#ifdef PPL_WATCHDOG_LIBRARY_ENABLED - assert(p_timeout_object); - reset_timeout(); -#endif - caml_raise_with_string(*caml_named_value("PPL_timeout_exception"), - "timeout expired"); } namespace { diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index 294cf82..a893b20 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -170,7 +170,7 @@ public: } }; -void handle_timeout_exception(); +void reset_timeout(); } // namespace OCaml @@ -181,28 +181,30 @@ void handle_timeout_exception(); #define CATCH_ALL \ catch(std::bad_alloc&) { \ caml_raise_out_of_memory(); \ - } \ - catch(std::invalid_argument& e) { \ - caml_invalid_argument(const_cast<char*>(e.what())); \ - } \ - catch(std::overflow_error& e) { \ - caml_raise_with_string(*caml_named_value("PPL_arithmetic_overflow"), \ - (const_cast<char*>(e.what()))); \ - } \ - catch(std::runtime_error& e) { \ - caml_raise_with_string(*caml_named_value("PPL_internal_error"), \ - (const_cast<char*>(e.what()))); \ - } \ - catch(timeout_exception&) { \ - handle_timeout_exception(); \ - } \ - catch(std::exception& e) { \ - caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ - (const_cast<char*>(e.what()))); \ - } \ - catch(...) { \ - caml_raise_constant(*caml_named_value("PPL_unexpected_error")); \ - } +} \ +catch(std::invalid_argument& e) { \ + caml_invalid_argument(const_cast<char*>(e.what())); \ +} \ +catch(std::overflow_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_arithmetic_overflow"), \ + (const_cast<char*>(e.what()))); \ +} \ +catch(std::runtime_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_internal_error"), \ + (const_cast<char*>(e.what()))); \ +} \ +catch(std::exception& e) { \ + caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ + (const_cast<char*>(e.what()))); \ +} \ +catch(timeout_exception&) { \ + reset_timeout(); \ + caml_raise_with_string(*caml_named_value("PPL_timeout_exception"), \ + "timeout expired"); \ +} \ +catch(...) { \ + caml_raise_constant(*caml_named_value("PPL_unexpected_error")); \ +} #include "ppl_ocaml_common.inlines.hh" diff --git a/interfaces/OCaml/tests/Makefile.am b/interfaces/OCaml/tests/Makefile.am index f6047ca..ca98b4a 100644 --- a/interfaces/OCaml/tests/Makefile.am +++ b/interfaces/OCaml/tests/Makefile.am @@ -34,8 +34,7 @@ CHECKER = endif !VALGRIND_TESTS_ENABLED TESTS_ENVIRONMENT = \ - $(LIBTOOL) --mode=execute \ - -dlopen ../../../src/libppl.la $(WATCHDOG_DLOPEN) $(CHECKER) + $(LIBTOOL) --mode=execute $(PPL_DLOPEN) $(PWL_DLOPEN) $(CHECKER) interface_generator_files = \ ppl_interface_generator_ocaml_test_ml.m4 \ @@ -90,6 +89,12 @@ endif BUILD_WATCHDOG_LIBRARY endif !ENABLE_SHARED +PPL_DLOPEN = -dlopen ../../../src/libppl.la + +if BUILD_WATCHDOG_LIBRARY +PWL_DLOPEN = -dlopen ../../../Watchdog/src/libpwl.la +endif BUILD_WATCHDOG_LIBRARY + .ml.cmo: $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< diff --git a/interfaces/OCaml/tests/test1.ml b/interfaces/OCaml/tests/test1.ml index 3366c85..62b3571 100644 --- a/interfaces/OCaml/tests/test1.ml +++ b/interfaces/OCaml/tests/test1.ml @@ -219,47 +219,6 @@ let congruence1 = (e2, e2 , (Z.from_int 1));; let congruences1 = [e3, e2 , (Z.from_int 20)];; let grid_generator1 = Grid_Point (e3, (Z.from_int 1));; -(* Testing timeouts *) -let lower = Coefficient(Gmp.Z.of_int 0) -in let upper = Coefficient(Gmp.Z.of_int 1) -in let rec hypercube_cs dim = - begin - if dim < 0 then [] - else - Greater_Or_Equal(Variable dim, lower) - :: Less_Or_Equal(Variable dim, upper) - :: hypercube_cs (dim-1) - end -in let rec compute_timeout_hypercube dim_in dim_out = - if dim_in < dim_out then - let ph = ppl_new_C_Polyhedron_from_constraints (hypercube_cs dim_in) - in begin -(* FIXME. - try - let () = ppl_Polyhedron_get_minimized_constraints ph; - ppl_delete_Polyhedron ph - with x -> - raise x; -*) - compute_timeout_hypercube (dim_in + 1) dim_out - end -in begin - try - ppl_set_timeout 100; - compute_timeout_hypercube 0 2; - ppl_reset_timeout; - print_string_if_noisy "ppl_reset_timeout test succeeded\n"; - with x -> - print_string_if_noisy "ppl_reset_timeout test seems to be failed!\n"; - try - ppl_set_timeout 100; - compute_timeout_hypercube 0 100; - ppl_reset_timeout; - print_string_if_noisy "ppl_set_timeout test seems to be failed!\n"; - with x -> - print_string_if_noisy "ppl_set_timeout test succeded\n"; - end;; - let mip1 = ppl_new_MIP_Problem 10 constraints1 e3 Maximization;; let objective_func = ppl_MIP_Problem_objective_function mip1;; print_string_if_noisy "\n";; @@ -414,7 +373,7 @@ let b = ppl_banner ();; print_string_if_noisy "\n";; print_string_if_noisy "Banner is: "; print_string_if_noisy(b);; -print_string_if_noisy "\n";; +print_string_if_noisy "\n\n";; print_string_if_noisy "PPL Coefficient integer datatype is " ;; if (ppl_Coefficient_is_bounded()) then print_string_if_noisy "bounded\n" @@ -423,6 +382,54 @@ print_string_if_noisy "Maximum space dimension is: "; let i = ppl_max_space_dimension() in print_int_if_noisy i;; print_string_if_noisy "\n";; + +(* Testing timeouts *) +let lower = Coefficient(Gmp.Z.of_int 0) +and upper = Coefficient(Gmp.Z.of_int 1) +in let rec hypercube_cs dim = + if dim < 0 + then [] + else Greater_Or_Equal(Variable dim, lower) + :: Less_Or_Equal(Variable dim, upper) + :: hypercube_cs (dim-1) +and hypercube_ph dim = + ppl_new_C_Polyhedron_from_constraints (hypercube_cs dim) +and compute_timeout_hypercube dim_in dim_out = + if dim_in < dim_out then ( + let _ = ppl_Polyhedron_get_minimized_constraints (hypercube_ph dim_in) + in ( + print_string_if_noisy "Built hypercube of dimension "; + print_int_if_noisy dim_in; + print_string_if_noisy "\n" + ); + compute_timeout_hypercube (dim_in + 1) dim_out + ) +in ( + begin + try + print_string_if_noisy "\nStarting ppl_reset_timeout test:\n"; + ppl_set_timeout 100; + compute_timeout_hypercube 0 2; + ppl_reset_timeout (); + print_string_if_noisy "ppl_reset_timeout test succeeded.\n" + with x -> + print_string_if_noisy "ppl_reset_timeout test seems to be failed!\n" + end +(* DEBUGGING + ; + begin + try + print_string "\nStarting ppl_set_timeout test:\n"; + ppl_set_timeout 100; + compute_timeout_hypercube 0 100; + ppl_reset_timeout (); + print_string "ppl_set_timeout test seems to be failed!\n" + with x -> + print_string "ppl_set_timeout test succeded\n" + end +DEBUGGING *) +);; + (* Pointset_Powersed_Grid is not enabled by default, the following code is *) (* commented *) (* let pps = ppl_new_Pointset_Powerset_Grid_from_space_dimension 3;; *)

1 0

[GIT] ppl/ppl(master): Removed the tag "(0.10.1)" from a FIXME unrelated to with PPL 0.10.1.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 675e168d438c37e1985638a95ee9ff1f6a8858b3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=675e168d438c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 15:18:23 2009 +0200 Removed the tag "(0.10.1)" from a FIXME unrelated to with PPL 0.10.1. --- src/Pointset_Ask_Tell.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Pointset_Ask_Tell.templates.hh b/src/Pointset_Ask_Tell.templates.hh index f318439..1c30960 100644 --- a/src/Pointset_Ask_Tell.templates.hh +++ b/src/Pointset_Ask_Tell.templates.hh @@ -68,7 +68,7 @@ Pointset_Ask_Tell<NNC_Polyhedron> nnc_tell(NNC_Polyhedron(i->tell().element().constraints())); x.sequence.push_back(Pair(nnc_ask, nnc_tell)); } - // FIXME(0.10.1): the following is a bug! + // FIXME: the following is a bug! x.normalized = y.normalized; assert(x.OK()); }

1 0

[GIT] ppl/ppl(master): Obsolete FIXME removed: methods Box:: refine_* were fixed long ago.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 41f6b3361c374b2f565e86adfb60ed10a5f917a6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=41f6b3361c37… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 15:16:35 2009 +0200 Obsolete FIXME removed: methods Box::refine_* were fixed long ago. --- src/Box.inlines.hh | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/Box.inlines.hh b/src/Box.inlines.hh index 64557d4..d3a514b 100644 --- a/src/Box.inlines.hh +++ b/src/Box.inlines.hh @@ -401,7 +401,6 @@ Box<ITV> break; case Constraint::NONSTRICT_INEQUALITY: seq_v.refine_existential((den > 0) ? GREATER_OR_EQUAL : LESS_OR_EQUAL, q); - // FIXME(0.10.1): this assertion fails due to a bug in refine. assert(seq_v.OK()); break; case Constraint::STRICT_INEQUALITY:

1 0