- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(sparse_matrices): CO_Tree: add assertion in rebalance().
by Marco Poletti 07 May '10

07 May '10

Module: ppl/ppl Branch: sparse_matrices Commit: aa99ac13f3b94e1af4e830f904b06743d0a9d088 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aa99ac13f3b9… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri May 7 14:01:38 2010 +0200 CO_Tree: add assertion in rebalance(). --- src/CO_Tree.cc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index b749767..fc73bf9 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -555,6 +555,7 @@ PPL::CO_Tree::rebalance(inorder_iterator& itr, dimension_type key, ++subtree_size; ++height; --itr_depth_minus_1; + PPL_ASSERT(itr.depth() - 1 == itr_depth_minus_1); density = subtree_size / (float) (((dimension_type)1 << height) - 1); };

1 0

[GIT] ppl/ppl(sparse_matrices): CO_Tree: fix bug in rebalance() introduced by commit 554399.
by Marco Poletti 07 May '10

07 May '10

Module: ppl/ppl Branch: sparse_matrices Commit: 64b25d958916f544c488b91bae1b6c356e3bdc2a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=64b25d958916… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri May 7 14:01:15 2010 +0200 CO_Tree: fix bug in rebalance() introduced by commit 554399. --- src/CO_Tree.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index 1f4c01e..b749767 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -503,7 +503,7 @@ PPL::CO_Tree::rebalance(inorder_iterator& itr, dimension_type key, } #endif dimension_type itr_depth_minus_1 = itr.depth() - 1; - dimension_type height = max_depth + itr_depth_minus_1; + dimension_type height = max_depth - itr_depth_minus_1; dimension_type subtree_size; const bool deleting = itr->first == unused_index; PPL_ASSERT(deleting || key != unused_index);

1 0

[GIT] ppl/ppl(master): Fixed comment.
by Abramo Bagnara 07 May '10

07 May '10

Module: ppl/ppl Branch: master Commit: e452159271aba95fe7f3bc4e60b9a850af3585ad URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e452159271ab… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 08:44:28 2010 +0200 Fixed comment. --- src/compiler.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/compiler.hh b/src/compiler.hh index 0ff65a4..2e51f95 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -30,7 +30,7 @@ namespace Parma_Polyhedra_Library { No-op macro that allows to avoid unused variable warnings from the compiler. */ -#endif // defined(ECLAIR_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) #define used(v) (void)v #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS

1 0

[GIT] ppl/ppl(sparse_matrices): CO_Tree: fix compiler error in debug mode.
by Marco Poletti 07 May '10

07 May '10

Module: ppl/ppl Branch: sparse_matrices Commit: 583486b8638b3862ae004b1bb4dbb4a87e2baecc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=583486b8638b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri May 7 07:33:08 2010 +0200 CO_Tree: fix compiler error in debug mode. --- src/CO_Tree.inlines.hh | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/CO_Tree.inlines.hh b/src/CO_Tree.inlines.hh index 617ea7b..59e3dcf 100644 --- a/src/CO_Tree.inlines.hh +++ b/src/CO_Tree.inlines.hh @@ -1031,12 +1031,14 @@ CO_Tree::inorder_iterator::get_next_value() { get_parent(); } +#ifndef NDEBUG if (!is_at_end()) // previous_index could be unused_index because we deleted the current // node, as we do in move_data_from(). if (previous_index != unused_index) - PPL_ASSERT((*this)->first != unused_index - && (*this)->first > previous_index); + PPL_ASSERT((*this)->first != unused_index + && (*this)->first > previous_index); +#endif } #endif // defined(USE_PPL_CO_TREE_VEB_LAYOUT) || defined(USE_PPL_CO_TREE_BFS_LAYOUT) @@ -1678,12 +1680,14 @@ CO_Tree::inorder_const_iterator::get_next_value() { get_parent(); } +#ifndef NDEBUG if (!is_at_end()) // previous_index could be unused_index because we deleted the current // node, as we do in move_data_from(). if (previous_index != unused_index) - PPL_ASSERT((*this)->first != unused_index - && (*this)->first > previous_index); + PPL_ASSERT((*this)->first != unused_index + && (*this)->first > previous_index); +#endif } #endif // defined(USE_PPL_CO_TREE_VEB_LAYOUT) || defined(USE_PPL_CO_TREE_BFS_LAYOUT)

1 0

[GIT] ppl/ppl(master): Removed current implementation of PPL_{LT, GT}_SILENT : the cure was worse than the disease.
by Abramo Bagnara 07 May '10

07 May '10

Module: ppl/ppl Branch: master Commit: d7c20fa14445cf00ffa4744dc7352efea0754e71 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d7c20fa14445… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 07:49:16 2010 +0200 Removed current implementation of PPL_{LT,GT}_SILENT: the cure was worse than the disease. --- src/checked.inlines.hh | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/checked.inlines.hh b/src/checked.inlines.hh index fffcff8..c5f6412 100644 --- a/src/checked.inlines.hh +++ b/src/checked.inlines.hh @@ -28,26 +28,14 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "C_Integer.hh" #include "assert.hh" -#if defined(__GNUC__) /*! \brief Performs the test <CODE>a < b</CODE> avoiding the warning about the comparison being always false due to limited range of data type. + FIXME: we don't have found a working solution. gcc option + -Wno-type-limits suppress the warning */ -#define PPL_LT_SILENT(a, b) \ - ({ \ - __typeof__(a) _a = (a); \ - __typeof__(b) _b = (b); \ - _a <= _b && _a != _b; \ - }) -/*! \brief - Performs the test <CODE>a > b</CODE> avoiding the warning about the - comparison being always false due to limited range of data type. -*/ -#define PPL_GT_SILENT(a, b) PPL_LT_SILENT(b, a) -#else #define PPL_LT_SILENT(a, b) ((a) < (b)) #define PPL_GT_SILENT(a, b) ((a) > (b)) -#endif namespace Parma_Polyhedra_Library {

1 0

[GIT] ppl/ppl(master): Avoid temporary in smod_2exp.
by Abramo Bagnara 07 May '10

07 May '10

Module: ppl/ppl Branch: master Commit: f9182bb6ab09f42b9065bf1da5664dba1243f9b1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f9182bb6ab09… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 07:20:52 2010 +0200 Avoid temporary in smod_2exp. --- src/checked_mpq.inlines.hh | 14 +++++++------- src/checked_mpz.inlines.hh | 10 ++++------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/checked_mpq.inlines.hh b/src/checked_mpq.inlines.hh index ffd8067..2ac13e9 100644 --- a/src/checked_mpq.inlines.hh +++ b/src/checked_mpq.inlines.hh @@ -389,12 +389,13 @@ template <typename To_Policy, typename From_Policy> inline Result smod_2exp_mpq(mpq_class& to, const mpq_class& x, unsigned int exp, Rounding_Dir) { - to.get_num() = x.get_num(); mpz_mul_2exp(to.get_den().get_mpz_t(), x.get_den().get_mpz_t(), exp); - mpz_fdiv_r(to.get_num().get_mpz_t(), to.get_num().get_mpz_t(), to.get_den().get_mpz_t()); - to.canonicalize(); - if (to >= 0.5) - to -= 1; + mpz_fdiv_r(to.get_num().get_mpz_t(), x.get_num().get_mpz_t(), to.get_den().get_mpz_t()); + mpz_fdiv_q_2exp(to.get_den().get_mpz_t(), to.get_den().get_mpz_t(), 1); + bool neg = to.get_num() >= to.get_den(); + mpz_mul_2exp(to.get_den().get_mpz_t(), to.get_den().get_mpz_t(), 1); + if (neg) + to.get_num() -= to.get_den(); mpz_mul_2exp(to.get_num().get_mpz_t(), to.get_num().get_mpz_t(), exp); to.canonicalize(); return V_EQ; @@ -406,9 +407,8 @@ template <typename To_Policy, typename From_Policy> inline Result umod_2exp_mpq(mpq_class& to, const mpq_class& x, unsigned int exp, Rounding_Dir) { - to.get_num() = x.get_num(); mpz_mul_2exp(to.get_den().get_mpz_t(), x.get_den().get_mpz_t(), exp); - mpz_fdiv_r(to.get_num().get_mpz_t(), to.get_num().get_mpz_t(), to.get_den().get_mpz_t()); + mpz_fdiv_r(to.get_num().get_mpz_t(), x.get_num().get_mpz_t(), to.get_den().get_mpz_t()); mpz_mul_2exp(to.get_num().get_mpz_t(), to.get_num().get_mpz_t(), exp); to.canonicalize(); return V_EQ; diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index 6d1d41c..380e085 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -507,12 +507,10 @@ template <typename To_Policy, typename From_Policy> inline Result smod_2exp_mpz(mpz_class& to, const mpz_class& x, unsigned int exp, Rounding_Dir) { - mpz_fdiv_r_2exp(to.get_mpz_t(), x.get_mpz_t(), exp); - if (mpz_tstbit(to.get_mpz_t(), exp - 1)) { - mpz_class m = 1; - mpz_mul_2exp(m.get_mpz_t(), m.get_mpz_t(), exp); - to -= m; - } + if (mpz_tstbit(x.get_mpz_t(), exp - 1)) + mpz_cdiv_r_2exp(to.get_mpz_t(), x.get_mpz_t(), exp); + else + mpz_fdiv_r_2exp(to.get_mpz_t(), x.get_mpz_t(), exp); return V_EQ; }

1 0

[GIT] ppl/ppl(master): Better/canonical way to avoid gcc warning.
by Abramo Bagnara 07 May '10

07 May '10

Module: ppl/ppl Branch: master Commit: df9bcf9e4ed24b91caa6266e7fec7fb381e04aa3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=df9bcf9e4ed2… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 06:11:49 2010 +0200 Better/canonical way to avoid gcc warning. --- src/compiler.hh | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/compiler.hh b/src/compiler.hh index 77115a2..0ff65a4 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -27,14 +27,11 @@ namespace Parma_Polyhedra_Library { #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS /*! \brief - No-op function that allows to avoid unused variable warnings from + No-op macro that allows to avoid unused variable warnings from the compiler. */ -#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -template <typename T> -inline void -used(const T&) { -} +#endif // defined(ECLAIR_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) +#define used(v) (void)v #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS /*! \brief

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 06 May '10

06 May '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f3a27bbfe0e2… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 23:21:08 2010 +0200 CO_Tree: optimize compact_elements_in_the_rightmost_end() for the DFS and BFS layouts. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0b8690f79ff3… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 23:01:57 2010 +0200 CO_Tree: optimize the const version of count_used_in_subtree() for the DFS and BFS layouts. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e52a540488c9… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 22:58:13 2010 +0200 CO_Tree: optimize count_used_in_subtree() for the DFS and BFS layouts. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=55439917173d… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 22:49:24 2010 +0200 CO_Tree: avoid multiple calls to itr.depth(), in rebalance(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ddaff547989f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 22:42:19 2010 +0200 CO_Tree::inorder_const_iterator: optimize for the DFS layout. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b72ebfdd76f4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 22:30:43 2010 +0200 CO_Tree::inorder_iterator: optimize get_next_value() for the DFS layout. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6af3f1c3cbca… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 22:20:45 2010 +0200 CO_Tree::inorder_iterator: optimize get_previous_value() for the DFS layout. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4572f359cad1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 22:08:10 2010 +0200 CO_Tree::inorder_iterator: optimize operator++() and operator--() for the DFS layout. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8599e9aa1d60… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 21:28:45 2010 +0200 CO_Tree: don't unnecessarily store at_end and before_begin in iterators, when using the DFS layout URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=64e837354553… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 19:07:16 2010 +0200 CO_Tree: optimize rebuild_bigger_tree() for the DFS and BFS layouts. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3ec972d8902a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 18:21:35 2010 +0200 CO_Tree: use two calls to malloc() and two calls to free(), preparing for further optimizations. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dc8797d103dc… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 18:04:49 2010 +0200 CO_Tree: use malloc() and free() instead of operator new() and operator delete(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2ab386c1a18e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 17:44:25 2010 +0200 CO_Tree: add comment in move_data_element(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ca44a98b16ff… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 17:39:08 2010 +0200 CO_Tree: optimize count_used_in_subtree() for the DFS layout. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9915ec2af6f4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 17:38:00 2010 +0200 CO_Tree.defs.hh: reorganize code. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a747fa1fce5f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu May 6 17:12:15 2010 +0200 CO_Tree: reimplement copy_data_from() in a simpler and faster way.

1 0

Build PPL under cygwin fails
by Matthias Hofmann 06 May '10

06 May '10

Hi, due to configure, the PPL build fails under cygwin with the following error message: checking for ld used by GCC... /usr/i686-pc-cygwin/bin/ld.exe checking if the linker (/usr/i686-pc-cygwin/bin/ld.exe) is GNU ld... yes checking for shared library run path origin... done checking how to link with libgmp... /usr/gmp/lib/libgmp.a checking how to link with libgmpxx... /usr/gmp/lib/libgmpxx.a /usr/gmp/lib/libgm p.a checking for the GMP library version 4.1.3 or above... no configure: error: Cannot find GMP version 4.1.3 or higher. GMP is the GNU Multi-Precision library: see http://www.swox.com/gmp/ for more information. When compiling the GMP library, do not forget to enable the C++ interface: add --enable-cxx to the configuration options. I have build and installed gmp-5.0.1 into the directory /usr/gmp previously and compiled it with --enable-cxx. Any solutions or ideas? Thank you, Matthias

3 2

[GIT] ppl/ppl(sparse_matrices): CO_Tree: add DFS and BFS layouts.
by Marco Poletti 05 May '10

05 May '10

Module: ppl/ppl Branch: sparse_matrices Commit: 03ba9f0473a8356f486f7df98ff384b9e43267f3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=03ba9f0473a8… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed May 5 21:43:23 2010 +0200 CO_Tree: add DFS and BFS layouts. --- src/CO_Tree.cc | 13 ++ src/CO_Tree.defs.hh | 91 +++++++++--- src/CO_Tree.inlines.hh | 399 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 470 insertions(+), 33 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=03ba9f04…

1 0