July 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): A couple of minor doxygen documentation corrections.
by Enea Zaffanella 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: 1a0fb124afab41e47f4843459cc86f0c80bcc2a7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1a0fb124afab… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jul 13 14:04:22 2009 +0200 A couple of minor doxygen documentation corrections. --- src/Affine_Space.defs.hh | 2 +- src/Octagonal_Shape.inlines.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Affine_Space.defs.hh b/src/Affine_Space.defs.hh index 464936a..1d1facf 100644 --- a/src/Affine_Space.defs.hh +++ b/src/Affine_Space.defs.hh @@ -435,7 +435,7 @@ public: /*! The affine space inherits the space dimension of the generator system. - \param const_gs + \param gs The system of generators defining the affine space. \exception std::invalid_argument diff --git a/src/Octagonal_Shape.inlines.hh b/src/Octagonal_Shape.inlines.hh index e3ebdfb..7cc8542 100644 --- a/src/Octagonal_Shape.inlines.hh +++ b/src/Octagonal_Shape.inlines.hh @@ -43,7 +43,7 @@ namespace Octagonal_Shapes { #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS //! Returns the index coherent to \p i. -/*! \relates Octagonal_Shape */ +/*! \relates Parma_Polyhedra_Library::Octagonal_Shape */ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) inline dimension_type coherent_index(const dimension_type i) {

1 0

[GIT] ppl/ppl(master): Added determinisitc timeout functionality to the Ocaml interface.
by Enea Zaffanella 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: 8da16bedab3920240eb1f25bafe9178ea53cefbe URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8da16bedab39… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jul 13 13:02:56 2009 +0200 Added determinisitc timeout functionality to the Ocaml interface. --- interfaces/OCaml/OCaml_interface.dox | 20 ++++++++++ interfaces/OCaml/ppl_ocaml_common.cc | 56 +++++++++++++++++++++++++++++ interfaces/OCaml/ppl_ocaml_common.defs.hh | 20 +++++++++- interfaces/OCaml/ppl_ocaml_globals.ml | 6 +++ interfaces/OCaml/ppl_ocaml_globals.mli | 6 +++ interfaces/OCaml/tests/test1.ml | 31 ++++++++++++++++ 6 files changed, 137 insertions(+), 2 deletions(-) diff --git a/interfaces/OCaml/OCaml_interface.dox b/interfaces/OCaml/OCaml_interface.dox index 6cbb1b9..1262e94 100644 --- a/interfaces/OCaml/OCaml_interface.dox +++ b/interfaces/OCaml/OCaml_interface.dox @@ -210,6 +210,26 @@ included with all instantiations of the OCaml interfaces. Resets the timeout time so that the computation is not interrupted. An exception is thrown if the PPL Watchdog library is not enabled. +<H2><CODE> ppl_set_deterministic_timeout weight </CODE></H2> + Computations taking exponential time will be interrupted some time + after reaching the <CODE>weight</CODE> complexity threshold. + If the computation is interrupted that way, a timeout exception + will be thrown. + An exception is immediately thrown if <CODE>hsecs</CODE> is not strictly + greater than zero, or if the PPL Watchdog library is not enabled. + <EM>NOTE:</EM> This "timeout" checking functionality is said to be + <EM>deterministic</EM> because it is not based on actual elapsed time. + Its behavior will only depend on (some of the) computations performed + in the PPL library and it will be otherwise independent from the + computation environment (CPU, operating system, compiler, etc.). + The weight mechanism is under alpha testing: client applications + should be ready to reconsider the tuning of these weight thresholds + when upgrading to newer version of the PPL. + +<H2><CODE> ppl_reset_deterministic_timeout </CODE></H2> + Resets the timeout time so that the computation is not interrupted. + An exception is thrown if the PPL Watchdog library is not enabled. + <H2><CODE> ppl_set_rounding_for_PPL </CODE></H2> Sets the FPU rounding mode so that the PPL abstractions based on floating point numbers work correctly. diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index dffe40b..3b4cce6 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -83,6 +83,12 @@ class PFunc { Parma_Watchdog_Library::Watchdog* p_timeout_object = 0; +typedef +Parma_Watchdog_Library::Threshold_Watcher +<Parma_Polyhedra_Library::Weightwatch_Traits> Weightwatch; + +Weightwatch* p_deterministic_timeout_object = 0; + #endif // PPL_WATCHDOG_LIBRARY_ENABLED void @@ -96,6 +102,17 @@ reset_timeout() { #endif // PPL_WATCHDOG_LIBRARY_ENABLED } +void +reset_deterministic_timeout() { +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED + if (p_deterministic_timeout_object) { + delete p_deterministic_timeout_object; + p_deterministic_timeout_object = 0; + abandon_expensive_computations = 0; + } +#endif // PPL_WATCHDOG_LIBRARY_ENABLED +} + namespace { inline mpz_ptr @@ -737,6 +754,11 @@ unregistered_value_p_MIP_Problem(const MIP_Problem& ph) { using namespace Parma_Polyhedra_Library; using namespace Parma_Polyhedra_Library::Interfaces::OCaml; +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED +template <> Weightwatch::Initialize +Weightwatch::init = Weightwatch::Initialize(); +#endif // PPL_WATCHDOG_LIBRARY_ENABLED + extern "C" CAMLprim value ppl_new_MIP_Problem_from_space_dimension(value d) try { @@ -1254,3 +1276,37 @@ ppl_reset_timeout(value unit) try { #endif // PPL_WATCHDOG_LIBRARY_ENABLED } CATCH_ALL + +extern "C" +CAMLprim value +ppl_set_deterministic_timeout(value weight) try { + CAMLparam1(weight); +#ifndef PPL_WATCHDOG_LIBRARY_ENABLED + const char* what = "PPL OCaml interface usage error:\n" + "ppl_set_deterministic_timeout: the PPL Watchdog library is not enabled."; + throw std::runtime_error(what); +#else + // In case a timeout was already set. + reset_deterministic_timeout(); + unsigned cpp_weight = value_to_unsigned<unsigned>(weight); + static deterministic_timeout_exception e; + p_deterministic_timeout_object + = new Weightwatch(cpp_weight, abandon_expensive_computations, e); + CAMLreturn(Val_unit); +#endif // PPL_WATCHDOG_LIBRARY_ENABLED +} +CATCH_ALL + +extern "C" +CAMLprim value +ppl_reset_deterministic_timeout(value unit) try { + CAMLparam1(unit); +#ifndef PPL_WATCHDOG_LIBRARY_ENABLED + throw std::runtime_error("PPL OCaml interface error:\n" + "the PPL Watchdog library is not enabled."); +#else + reset_deterministic_timeout(); + CAMLreturn(Val_unit); +#endif // PPL_WATCHDOG_LIBRARY_ENABLED +} +CATCH_ALL diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index 9b8bbe1..41b312f 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -158,7 +158,8 @@ private: std::vector<dimension_type> vec; }; -class timeout_exception : public Parma_Polyhedra_Library::Throwable { +class timeout_exception + : public Parma_Polyhedra_Library::Throwable { public: void throw_me() const { throw *this; @@ -166,12 +167,23 @@ public: int priority() const { return 0; } - timeout_exception() { +}; + +class deterministic_timeout_exception + : public Parma_Polyhedra_Library::Throwable { +public: + void throw_me() const { + throw *this; + } + int priority() const { + return 0; } }; void reset_timeout(); +void reset_deterministic_timeout(); + } // namespace OCaml } // namespace Interfaces @@ -201,6 +213,10 @@ catch(timeout_exception&) { \ reset_timeout(); \ caml_raise_constant(*caml_named_value("PPL_timeout_exception")); \ } \ +catch(deterministic_timeout_exception&) { \ + reset_deterministic_timeout(); \ + caml_raise_constant(*caml_named_value("PPL_timeout_exception")); \ +} \ catch(...) { \ caml_raise_constant(*caml_named_value("PPL_unexpected_error")); \ } diff --git a/interfaces/OCaml/ppl_ocaml_globals.ml b/interfaces/OCaml/ppl_ocaml_globals.ml index bd2549e..4ebc003 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.ml +++ b/interfaces/OCaml/ppl_ocaml_globals.ml @@ -170,6 +170,12 @@ int -> unit = "ppl_set_timeout" external ppl_reset_timeout: unit -> unit = "ppl_reset_timeout" +external ppl_set_deterministic_timeout: +int -> unit = "ppl_set_deterministic_timeout" + +external ppl_reset_deterministic_timeout: +unit -> unit = "ppl_reset_deterministic_timeout" + external ppl_new_MIP_Problem_from_space_dimension: int -> mip_problem = "ppl_new_MIP_Problem_from_space_dimension" diff --git a/interfaces/OCaml/ppl_ocaml_globals.mli b/interfaces/OCaml/ppl_ocaml_globals.mli index 3640dd5..f2bd23a 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.mli +++ b/interfaces/OCaml/ppl_ocaml_globals.mli @@ -155,6 +155,12 @@ val ppl_set_timeout: val ppl_reset_timeout: unit -> unit +val ppl_set_deterministic_timeout: + int -> unit + +val ppl_reset_deterministic_timeout: + unit -> unit + type mip_problem val ppl_new_MIP_Problem_from_space_dimension: diff --git a/interfaces/OCaml/tests/test1.ml b/interfaces/OCaml/tests/test1.ml index 9c23116..6acb1a0 100644 --- a/interfaces/OCaml/tests/test1.ml +++ b/interfaces/OCaml/tests/test1.ml @@ -448,6 +448,37 @@ in ( | _ -> print_string_if_noisy "ppl_set_timeout test failed:\n"; print_string_if_noisy "generic exception caught.\n" + end; + begin + try + print_string_if_noisy "\nStarting ppl_reset_deterministic_timeout test:\n"; + ppl_set_deterministic_timeout 2000; + compute_timeout_hypercube 0 2; + ppl_reset_deterministic_timeout (); + print_string_if_noisy "ppl_reset_deterministic_timeout test succeeded.\n" + with + | PPL_timeout_exception -> + print_string_if_noisy "ppl_reset_deterministic_timeout test seems to be failed:\n"; + print_string_if_noisy "Unexpected PPL timeout exception caught.\n" + | _ -> + print_string_if_noisy "ppl_reset_deterministic_timeout test seems to be failed."; + (* FIXME: print the contents of the exception. *) + print_string_if_noisy "\n" + end; + begin + try + print_string_if_noisy "\nStarting ppl_set_deterministic_timeout test:\n"; + ppl_set_deterministic_timeout 2000; + compute_timeout_hypercube 0 100; + ppl_reset_deterministic_timeout (); + print_string_if_noisy "ppl_set_deterministic_timeout test seems to be failed!\n" + with + | PPL_timeout_exception -> + print_string_if_noisy "ppl_set_deterministic_timeout test succeded\n"; + print_string_if_noisy "Expected PPL timeout exception caught.\n" + | _ -> + print_string_if_noisy "ppl_set_deterministic_timeout test failed:\n"; + print_string_if_noisy "generic exception caught.\n" end );;

1 0

[GIT] ppl/ppl(master): Added deterministic timeout functionality to the Java language interface.
by Enea Zaffanella 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: f998de27be99a5429da7fb525e938db87b7d58d2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f998de27be99… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jul 13 10:46:44 2009 +0200 Added deterministic timeout functionality to the Java language interface. --- interfaces/Java/jni/ppl_java_common.cc | 31 ++++++++++++++ interfaces/Java/jni/ppl_java_common.defs.hh | 28 ++++++++++++- interfaces/Java/jni/ppl_java_globals.cc | 42 +++++++++++++++++++- .../Parma_Polyhedra_Library.java | 37 +++++++++++++++++ .../Java/tests/Parma_Polyhedra_Library_test2.java | 37 +++++++++++++++++ 5 files changed, 172 insertions(+), 3 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=f998de27…

1 0

[GIT] ppl/ppl(master): Weightwatch test fixed so as to behave properly under arithmetic overflows .
by Enea Zaffanella 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: 62c817602e25fe567b1685f0b86cbc2266247d45 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=62c817602e25… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jul 13 09:42:35 2009 +0200 Weightwatch test fixed so as to behave properly under arithmetic overflows. --- tests/Polyhedron/weightwatch1.cc | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/tests/Polyhedron/weightwatch1.cc b/tests/Polyhedron/weightwatch1.cc index aeffacb..292e428 100644 --- a/tests/Polyhedron/weightwatch1.cc +++ b/tests/Polyhedron/weightwatch1.cc @@ -108,17 +108,15 @@ bool test01() { // Thanks to the blind relaxation of the strict inequality constraint, // polyhedron ph is easily seen to contain an integer point. const bool contains = ph.contains_integer_point(); - nout << "\nph " << (contains ? "contains" : "does not contain") + nout << endl << "ph " + << (contains ? "contains" : "does not contain") << " an integer point" << endl; return contains; } + // Note: other exceptions are just propagated. catch (const Deterministic_Timeout& e) { // Unexpected timeout exception. - nout << e.what() << endl; - return false; - } - catch (...) { - // Unexpected exception. + nout << endl << e.what() << endl; return false; } // Should never get here. @@ -176,19 +174,17 @@ bool test02() { // The branch-and-bound heuristics of the MIP solver behaves badly // on this particular example, causing timeout to expire. const bool contains = ph.contains_integer_point(); - nout << "ph " << (contains ? "contains" : "does not contain") + nout << endl + << "ph " << (contains ? "contains" : "does not contain") << " an integer point" << endl; return false; } + // Note: other exceptions are just propagated. catch (const Deterministic_Timeout& e) { // Expected exception. - nout << e.what() << endl; + nout << endl << e.what() << endl; return true; } - catch (...) { - // Unexpected exception. - return false; - } // Should never get here. return false; } @@ -216,19 +212,17 @@ bool test03() { // onto a lower dimensional space: the performance issue of previous // test does not depend on high dimension vector space. const bool contains = ph.contains_integer_point(); - nout << "ph " << (contains ? "contains" : "does not contain") + nout << endl + << "ph " << (contains ? "contains" : "does not contain") << " an integer point" << endl; return false; } + // Note: other exceptions are just propagated. catch (const Deterministic_Timeout& e) { // Expected exception. - nout << e.what() << endl; + nout << endl << e.what() << endl; return true; } - catch (...) { - // Unexpected exception. - return false; - } // Should never get here. return false; }

1 0

[GIT] ppl/ppl(master): Added deterministic timeout predicates to the Prolog language interface.
by Enea Zaffanella 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: ff28fdbc4a1fc2016fe249373caa755e05ff5961 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ff28fdbc4a1f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jul 13 09:24:12 2009 +0200 Added deterministic timeout predicates to the Prolog language interface. --- interfaces/Prolog/Prolog_interface.dox | 22 ++++++ ...erface_generator_prolog_procedure_generators.m4 | 2 + interfaces/Prolog/ppl_prolog_common.cc | 68 +++++++++++++++++++- interfaces/Prolog/ppl_prolog_common.defs.hh | 28 +++++++- 4 files changed, 116 insertions(+), 4 deletions(-) diff --git a/interfaces/Prolog/Prolog_interface.dox b/interfaces/Prolog/Prolog_interface.dox index 9af2b30..d4f5f14 100644 --- a/interfaces/Prolog/Prolog_interface.dox +++ b/interfaces/Prolog/Prolog_interface.dox @@ -435,6 +435,28 @@ that are included with all instantiations of the Prolog interfaces. <EM>Resets the timeout time so that the computation is not interrupted.</EM> +<P><CODE> ppl_set_deterministic_timeout(+Weight) </CODE><BR> + + <EM>Computations taking exponential time will be interrupted + some time after reaching the <CODE>Weight</CODE> complexity threshold. + If the computation is interrupted that way, the current timeout + exception atom will be thrown. + <CODE>Weight</CODE> must be strictly greater than zero.</EM> + <P> + <EM>NOTE:</EM> This "timeout" checking functionality is said to be + <EM>deterministic</EM> because it is not based on actual elapsed time. + Its behavior will only depend on (some of the) computations performed + in the PPL library and it will be otherwise independent from the + computation environment (CPU, operating system, compiler, etc.). + The weight mechanism is under alpha testing: client applications + should be ready to reconsider the tuning of these weight thresholds + when upgrading to newer version of the PPL. + +<P><CODE> ppl_reset_deterministic_timeout </CODE><BR> + + <EM>Resets the deterministic timeout so that the computation is not + interrupted.</EM> + <P><CODE> ppl_set_rounding_for_PPL </CODE><BR> <EM>Sets the FPU rounding mode so that the PPL abstractions based on diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 index 220395d..ed75f67 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 @@ -54,6 +54,8 @@ ppl_set_timeout_exception_atom/1 *nofail, ppl_timeout_exception_atom/1, ppl_set_timeout/1 *nofail, ppl_reset_timeout/0 *nofail, +ppl_set_deterministic_timeout/1 *nofail, +ppl_reset_deterministic_timeout/0 *nofail, ppl_new_MIP_Problem_from_space_dimension/2, ppl_new_MIP_Problem/5, ppl_new_MIP_Problem_from_MIP_Problem/2, diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index ec88eb0..100e6e9 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -599,6 +599,12 @@ handle_exception() { Parma_Watchdog_Library::Watchdog* p_timeout_object = 0; +typedef +Parma_Watchdog_Library::Threshold_Watcher +<Parma_Polyhedra_Library::Weightwatch_Traits> Weightwatch; + +Weightwatch* p_deterministic_timeout_object = 0; + void reset_timeout() { if (p_timeout_object) { @@ -607,7 +613,16 @@ reset_timeout() { abandon_expensive_computations = 0; } } -#endif + +void +reset_deterministic_timeout() { + if (p_deterministic_timeout_object) { + delete p_deterministic_timeout_object; + p_deterministic_timeout_object = 0; + abandon_expensive_computations = 0; + } +} +#endif // PPL_WATCHDOG_LIBRARY_ENABLED Prolog_atom timeout_exception_atom; @@ -622,6 +637,17 @@ handle_exception(const timeout_exception&) { Prolog_raise_exception(et); } +void +handle_exception(const deterministic_timeout_exception&) { +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED + assert(p_deterministic_timeout_object); + reset_deterministic_timeout(); +#endif + Prolog_term_ref et = Prolog_new_term_ref(); + Prolog_put_atom(et, timeout_exception_atom); + Prolog_raise_exception(et); +} + Prolog_term_ref variable_term(dimension_type varid) { Prolog_term_ref v = Prolog_new_term_ref(); @@ -1374,6 +1400,12 @@ term_to_complexity_class(Prolog_term_ref t, const char* where) { using namespace Parma_Polyhedra_Library::Interfaces::Prolog; +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED +template <> Weightwatch::Initialize +Weightwatch::init = Weightwatch::Initialize(); +#endif // PPL_WATCHDOG_LIBRARY_ENABLED + + extern "C" Prolog_foreign_return_type ppl_version_major(Prolog_term_ref t_v) { try { @@ -1595,6 +1627,40 @@ ppl_reset_timeout() { } extern "C" Prolog_foreign_return_type +ppl_set_deterministic_timeout(Prolog_term_ref t_weight) { + try { +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED + // In case a deterministic timeout was already set. + reset_deterministic_timeout(); + static deterministic_timeout_exception e; + unsigned weight + = term_to_unsigned<unsigned>(t_weight, + "ppl_set_deterministic_timeout/1"); + p_deterministic_timeout_object = + new Weightwatch(weight, abandon_expensive_computations, e); + return PROLOG_SUCCESS; +#else + used(t_weight); + return PROLOG_FAILURE; +#endif + } + CATCH_ALL; +} + +extern "C" Prolog_foreign_return_type +ppl_reset_deterministic_timeout() { + try { +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED + reset_deterministic_timeout(); + return PROLOG_SUCCESS; +#else + return PROLOG_FAILURE; +#endif + } + CATCH_ALL; +} + +extern "C" Prolog_foreign_return_type ppl_Coefficient_is_bounded() { try { if (std::numeric_limits<Coefficient>::is_bounded) diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index cc7e7e4..dfede01 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -421,7 +421,8 @@ handle_exception(const std::exception& e); void handle_exception(); -class timeout_exception : public Parma_Polyhedra_Library::Throwable { +class timeout_exception + : public Parma_Polyhedra_Library::Throwable { public: void throw_me() const { throw *this; @@ -429,13 +430,25 @@ public: int priority() const { return 0; } - timeout_exception() { - } }; void handle_exception(const timeout_exception&); +class deterministic_timeout_exception + : public Parma_Polyhedra_Library::Throwable { +public: + void throw_me() const { + throw *this; + } + int priority() const { + return 0; + } +}; + +void +handle_exception(const deterministic_timeout_exception&); + #define CATCH_ALL \ catch (const Prolog_unsigned_out_of_range& e) { \ handle_exception(e); \ @@ -485,6 +498,9 @@ handle_exception(const timeout_exception&); catch (const timeout_exception& e) { \ handle_exception(e); \ } \ + catch (const deterministic_timeout_exception& e) { \ + handle_exception(e); \ + } \ catch(const std::overflow_error& e) { \ handle_exception(e); \ } \ @@ -688,6 +704,12 @@ extern "C" Prolog_foreign_return_type ppl_reset_timeout(); extern "C" Prolog_foreign_return_type +ppl_set_deterministic_timeout(Prolog_term_ref t_weight); + +extern "C" Prolog_foreign_return_type +ppl_reset_deterministic_timeout(); + +extern "C" Prolog_foreign_return_type ppl_Coefficient_is_bounded(); extern "C" Prolog_foreign_return_type

1 0

[GIT] ppl/ppl(master): Now we throw/ catch ad hoc exceptions for deterministic timeouts.
by Enea Zaffanella 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: d81e62914cdeefc5bef56decf96c38376f7ce455 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d81e62914cde… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jul 13 08:56:27 2009 +0200 Now we throw/catch ad hoc exceptions for deterministic timeouts. --- interfaces/C/ppl_c_implementation_common.defs.hh | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/interfaces/C/ppl_c_implementation_common.defs.hh b/interfaces/C/ppl_c_implementation_common.defs.hh index fe4db96..11163fa 100644 --- a/interfaces/C/ppl_c_implementation_common.defs.hh +++ b/interfaces/C/ppl_c_implementation_common.defs.hh @@ -104,12 +104,23 @@ public: int priority() const { return 0; } - timeout_exception() { - } }; void reset_timeout(); +class deterministic_timeout_exception + : public Parma_Polyhedra_Library::Throwable { +public: + void throw_me() const { + throw *this; + } + int priority() const { + return 0; + } +}; + +void reset_deterministic_timeout(); + } // namespace C } // namespace Interfaces @@ -136,6 +147,11 @@ catch (timeout_exception&) { \ notify_error(PPL_TIMEOUT_EXCEPTION, "PPL timeout expired"); \ return PPL_TIMEOUT_EXCEPTION; \ } \ +catch (deterministic_timeout_exception&) { \ + reset_deterministic_timeout(); \ + notify_error(PPL_TIMEOUT_EXCEPTION, "PPL deterministic timeout expired"); \ + return PPL_TIMEOUT_EXCEPTION; \ +} \ catch (...) { \ notify_error(PPL_ERROR_UNEXPECTED_ERROR, \ "completely unexpected error: a bug in the PPL"); \

1 0

[GIT] ppl/ppl(master): These tests fail also with 32-bit coefficients.
by Roberto Bagnara 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: 70437eb7512d5168185429f269b43040a0fb9dc5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=70437eb7512d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Jul 13 06:47:50 2009 +0200 These tests fail also with 32-bit coefficients. --- tests/Polyhedron/weightwatch1.cc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Polyhedron/weightwatch1.cc b/tests/Polyhedron/weightwatch1.cc index 9e7978b..aeffacb 100644 --- a/tests/Polyhedron/weightwatch1.cc +++ b/tests/Polyhedron/weightwatch1.cc @@ -236,7 +236,7 @@ bool test03() { } // namespace BEGIN_MAIN - DO_TEST_F16(test01); - DO_TEST_F16(test02); - DO_TEST_F16(test03); + DO_TEST_F32(test01); + DO_TEST_F32(test02); + DO_TEST_F32(test03); END_MAIN

1 0

[GIT] ppl/ppl(master): New configure option --with-gmp-prefix supersedes the (now removed)
by Roberto Bagnara 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: 08dfb6fea094f8c5a533575a3ea2095edce99a6d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=08dfb6fea094… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 21:39:46 2009 +0200 New configure option --with-gmp-prefix supersedes the (now removed) options --with-libgmp-prefix and --with-libgmpxx-prefix. --- NEWS | 3 +++ README.configure | 6 +++--- TODO | 2 -- m4/ac_check_gmp.m4 | 6 +++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index dec828b..adb43c5 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,9 @@ o When the PPL has been configured with procedure checks that the FPU can indeed be controlled and fails if that is not the case. +o New configure option --with-gmp-prefix supersedes the (now removed) + options --with-libgmp-prefix and --with-libgmpxx-prefix. + o The Java interface has to be explicitly initialized before use by calling static method Parma_Polyhedra_Library.initialize_library(). Initialization makes more explicit the exact point where PPL diff --git a/README.configure b/README.configure index 0db173a..5dc7a51 100644 --- a/README.configure +++ b/README.configure @@ -99,7 +99,7 @@ is not standard for your compiler and/or for your linker, you will have to make sure the configure script of the PPL is invoked with, among others, the option - --with-libgmpxx-prefix=<GMP prefix> + --with-gmp-prefix=<GMP prefix> If you use shared libraries, consult the documentation of your dynamic linker/loader (`man ld.so' will do on most Un*x-like systems) to see @@ -151,7 +151,7 @@ you can configure the PPL with a command like CPPFLAGS=-D_GCC_LIMITS_H_ /path/to/ppl-x.y/configure \ --with-cxx=icpc --with-cc=icc \ --with-cxxflags=-pch \ - --with-libgmpxx-prefix=/opt/intel/cce/10.1.018 + --with-gmp-prefix=/opt/intel/cce/10.1.018 Notice that the `CPPFLAGS=-D_GCC_LIMITS_H_' environment variable assignment is required in order to overcome a bug in the Intel C/C++ @@ -170,7 +170,7 @@ Then you can configure the PPL with a command like /path/to/ppl/configure --with-cc="como --c" --with-cxx="como -tused" \ --with-cxxflags="-g++ --remarks --long_long \ --display_error_number --diag_suppress 340,401,679" \ - --disable-shared --with-libgmpxx-prefix=/opt/comeau/local + --disable-shared --with-gmp-prefix=/opt/comeau/local Notice the use of the option `--disable-shared' both in the configuration of GMP and the configuration of the PPL. This is due to the fact that diff --git a/TODO b/TODO index 47cbef8..a94f7d4 100644 --- a/TODO +++ b/TODO @@ -2,8 +2,6 @@ Enhancements for PPL 0.11 ========================= -- Consider adding the --with-gmp configure option, removing - --with-libgmp-prefix and --with-libgmpxx-prefix. - Add the domain of circular linear progressions. - Finish the domain of intervals. - Make all the *affine*image() methods uniform as far as the diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4 index c57c448..62ebce7 100644 --- a/m4/ac_check_gmp.m4 +++ b/m4/ac_check_gmp.m4 @@ -42,9 +42,13 @@ AC_ARG_WITH(gmp-build, LDFLAGS="$LDFLAGS -L$gmp_build_dir -L$gmp_build_dir/.libs" LDFLAGS="$LDFLAGS -L$gmp_build_dir/tune" else - AC_MSG_ERROR([cannot use --with-gmp-build and --with-libgmp* together]) + AC_MSG_ERROR([cannot use --with-gmp-build and --with-gmp-prefix together]) fi) +dnl Both libgmp and libbmpxx come from the gmp package. +AC_LIB_FROMPACKAGE([gmp], [gmp]) +AC_LIB_FROMPACKAGE([gmpxx], [gmp]) + dnl Check how to link with libgmp. AC_LIB_LINKFLAGS([gmp])

1 0

[GIT] ppl/ppl(master): These tests fail also with 16-bit coefficients.
by Roberto Bagnara 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: acac3c72eafcd53bc48660d8340bfafe90376919 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=acac3c72eafc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 21:21:04 2009 +0200 These tests fail also with 16-bit coefficients. --- tests/Polyhedron/weightwatch1.cc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Polyhedron/weightwatch1.cc b/tests/Polyhedron/weightwatch1.cc index 27e06ce..9e7978b 100644 --- a/tests/Polyhedron/weightwatch1.cc +++ b/tests/Polyhedron/weightwatch1.cc @@ -236,7 +236,7 @@ bool test03() { } // namespace BEGIN_MAIN - DO_TEST_F8(test01); - DO_TEST_F8(test02); - DO_TEST_F8(test03); + DO_TEST_F16(test01); + DO_TEST_F16(test02); + DO_TEST_F16(test03); END_MAIN

1 0

[GIT] ppl/ppl(master): New commits
by Roberto Bagnara 12 Jul '09

12 Jul '09

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=81f1af6d0c63… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 21:19:21 2009 +0200 Private typedef renamed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=557898faabc4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 21:19:12 2009 +0200 Removed spurious blank line. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5622bea5c074… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 21:15:32 2009 +0200 Comment improved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=89b767163dfb… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 21:14:09 2009 +0200 Drafted the news for PWL 0.8. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e1a81fe4089f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 19:08:36 2009 +0200 Unused temp removed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=66ccf323a04d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 19:07:58 2009 +0200 Warnings avoided.

1 0