Boost C++ Libraries: Ticket #7363: coordinate_matrix::sort() fails with gcc 4.7

component changed

Gunter — Mon, 10 Sep 2012 21:36:03 GMT

component None → uBLAS

Gunter — Mon, 10 Sep 2012 21:38:13 GMT

(In [80487]) * boost/numeric/ublas/matrix_sparse.hpp: see #7363, add new define BOOST_UBLAS_COO_ALWAYS_DO_FULL_SORT in order to force a full sort instead of partial sort + inplace merge

libs/numeric/ublas/test/Jamfile.v2: add test to see effect of new define

status changed

Gunter — Sun, 16 Sep 2012 21:06:42 GMT

status new → assigned

attachment set

anonymous — Tue, 18 Sep 2012 19:43:48 GMT

attachment → custom_inplace_merge.diff

j.ungermann@… — Tue, 18 Sep 2012 19:49:15 GMT

I just attached a patch (as anonymous, sorry) hopefully fixing the problem.

Two custom inplace_merge routines were added to coordinate_vector and coordinate_matrix that replace the problematic STL version.

This could be generalized, but this requires an astonishing amount of templated code to properly pull of, so this copy-paste version seems preferable.

In addition two new test files were added that exercise the coordinate types and check on sortedness of indice and correctness.

I compiled and executed the tests, so some additional changes are likely required to automatically execute them. (I am unfamiliar with the boost test system and familiarizing me with that would have create delayed the patch).

Gunter — Tue, 18 Sep 2012 20:51:16 GMT

(In [80586])

libs/numeric/ublas/test/Jamfile.v2: see #7363 - separate test of COO matrix

Gunter — Tue, 18 Sep 2012 21:40:07 GMT

(In [80591])

boost/numeric/ublas/vector_sparse.hpp: add ifdef BOOST_UBLAS_COO_ALWAYS_DO_FULL_SORT to coordinate_vector::sort() (similar to coordinate_matrix::sort()), see #7363

libs/numeric/ublas/test/Jamfile.v2: use COO_ALWAYS_DO_FULL_SORT in test_assign because we do not want to test performance here

j.ungermann@… — Wed, 19 Sep 2012 19:46:26 GMT

Ticket #4862 is a duplicate of this one (obvious from the attached error output in that ticket).

attachment set

j.ungermann@… — Fri, 21 Sep 2012 21:18:04 GMT

attachment → custom_inplace_merge_fixed.diff

attachment set

j.ungermann@… — Fri, 21 Sep 2012 21:33:15 GMT

attachment → custom_inplace_merge_r80623.diff

j.ungermann@… — Fri, 21 Sep 2012 21:36:02 GMT

I provided two new patch files. The first one with "_fixed" fixes a danging include statement that should generate a compilation error. The second one is the same patch but against the most recent revision 80623 that I just checked out. The original patch was partly against an older version.

Gunter — Fri, 21 Sep 2012 23:43:20 GMT

(In [80625])

boost/numeric/ublas/vector_sparse.hpp, boost/numeric/ublas/matrix_sparse.hpp: see #7363, applied patch (added inplace_merge)

libs/numeric/ublas/test/Jamfile.v2, libs/numeric/ublas/test/test_coordinate_vector_inplace_merge.cpp, libs/numeric/ublas/test/test_coordinate_matrix_inplace_merge.cpp: add test for COO::sort()

Gunter — Sat, 22 Sep 2012 20:23:23 GMT

(In [80643])

boost/numeric/ublas/storage.hpp: see #7363, remove boost::noncopyable from index_pair and index_triple because both classes can be copied

Gunter — Sat, 22 Sep 2012 21:58:00 GMT

(In [80645]) merged [80483],[80487],[80586],[80591],[80592],[80599],[80600],[80624],[80625],[80643],[80644] into release:

fix #4024

fix #5812

fix #7296 (hopefully ;-)

see #7363 (must wait for a full test cycle before closing this task)

Gunter — Sat, 22 Sep 2012 22:53:43 GMT

(In [80649])

libs/numeric/ublas/doc/release_notes.htm, libs/numeric/ublas/doc/index.htm: see #7363, update release notes and docs

status changed; resolution set

Gunter — Sun, 30 Sep 2012 19:59:08 GMT

status assigned → closed
resolution → fixed

tests are green on release branch