Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2012-11-28 10:05:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armadillo (Old) and /work/SRC/openSUSE:Factory/.armadillo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armadillo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2012-10-09 13:54:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2012-11-28 10:05:05.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 22 16:46:33 UTC 2012 - [email protected] + +- Update to 3.4.4 + * Fix for handling complex numbers by sparse matrices + * Fix for minor memory leak by sparse matrices + +------------------------------------------------------------------- Old: ---- armadillo-3.4.3.tar.gz New: ---- armadillo-3.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.6EQuHe/_old 2012-11-28 10:05:07.000000000 +0100 +++ /var/tmp/diff_new_pack.6EQuHe/_new 2012-11-28 10:05:07.000000000 +0100 @@ -17,7 +17,7 @@ Name: armadillo -Version: 3.4.3 +Version: 3.4.4 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: LGPL-3.0+ @@ -111,7 +111,7 @@ %{__make} %{?_smp_mflags} %install -%{__make} install DESTDIR=%{buildroot} +%{__make} DESTDIR=%{buildroot} install rm -f examples/Makefile.cmake rm -rf examples/example1_win32 rm -rf examples/example2_win32 ++++++ armadillo-3.4.3.tar.gz -> armadillo-3.4.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.4.3/CMakeLists.txt new/armadillo-3.4.4/CMakeLists.txt --- old/armadillo-3.4.3/CMakeLists.txt 2012-10-03 03:42:50.000000000 +0200 +++ new/armadillo-3.4.4/CMakeLists.txt 2012-11-02 11:31:36.000000000 +0100 @@ -16,7 +16,7 @@ set(ARMA_MAJOR 3) set(ARMA_MINOR 4) -set(ARMA_PATCH 3) +set(ARMA_PATCH 4) message(STATUS "Configuring Armadillo ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.4.3/include/armadillo_bits/SpMat_meat.hpp new/armadillo-3.4.4/include/armadillo_bits/SpMat_meat.hpp --- old/armadillo-3.4.3/include/armadillo_bits/SpMat_meat.hpp 2012-09-24 02:35:40.000000000 +0200 +++ new/armadillo-3.4.4/include/armadillo_bits/SpMat_meat.hpp 2012-10-23 13:03:42.000000000 +0200 @@ -46,7 +46,7 @@ inline SpMat<eT>::~SpMat() { - arma_extra_debug_sigprint(); + arma_extra_debug_sigprint_this(this); // If necessary, release the memory. if (values) @@ -1418,6 +1418,8 @@ { arma_extra_debug_sigprint(); + arma_debug_check(row_num >= n_rows, "SpMat::row(): out of bounds"); + return SpSubview<eT>(*this, row_num, 0, 1, n_cols); } @@ -1430,6 +1432,8 @@ { arma_extra_debug_sigprint(); + arma_debug_check(row_num >= n_rows, "SpMat::row(): out of bounds"); + return SpSubview<eT>(*this, row_num, 0, 1, n_cols); } @@ -1500,6 +1504,8 @@ { arma_extra_debug_sigprint(); + arma_debug_check(col_num >= n_cols, "SpMat::col(): out of bounds"); + return SpSubview<eT>(*this, 0, col_num, n_rows, 1); } @@ -1512,6 +1518,8 @@ { arma_extra_debug_sigprint(); + arma_debug_check(col_num >= n_cols, "SpMat::col(): out of bounds"); + return SpSubview<eT>(*this, 0, col_num, n_rows, 1); } @@ -3470,10 +3478,10 @@ arrayops::copy(new_values, values, copy_size); arrayops::copy(new_row_indices, row_indices, copy_size); - - memory::release(values); - memory::release(row_indices); } + + memory::release(values); + memory::release(row_indices); access::rw(values) = new_values; access::rw(row_indices) = new_row_indices; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.4.3/include/armadillo_bits/SpSubview_meat.hpp new/armadillo-3.4.4/include/armadillo_bits/SpSubview_meat.hpp --- old/armadillo-3.4.3/include/armadillo_bits/SpSubview_meat.hpp 2012-09-24 02:35:40.000000000 +0200 +++ new/armadillo-3.4.4/include/armadillo_bits/SpSubview_meat.hpp 2012-10-30 07:25:14.000000000 +0100 @@ -774,7 +774,7 @@ for(uword ind = 0; ind < end_index; ++ind) { - m.at(ind + aux_row1, ind + aux_col1) = eT(1); + access::rw(m).at(ind + aux_row1, ind + aux_col1) = eT(1); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.4.3/include/armadillo_bits/SpValProxy_bones.hpp new/armadillo-3.4.4/include/armadillo_bits/SpValProxy_bones.hpp --- old/armadillo-3.4.3/include/armadillo_bits/SpValProxy_bones.hpp 2012-09-03 09:46:10.000000000 +0200 +++ new/armadillo-3.4.4/include/armadillo_bits/SpValProxy_bones.hpp 2012-10-30 08:27:43.000000000 +0100 @@ -47,12 +47,6 @@ arma_inline SpValProxy& operator-=(const eT rhs); arma_inline SpValProxy& operator*=(const eT rhs); arma_inline SpValProxy& operator/=(const eT rhs); - arma_inline SpValProxy& operator%=(const eT rhs); - arma_inline SpValProxy& operator<<=(const eT rhs); - arma_inline SpValProxy& operator>>=(const eT rhs); - arma_inline SpValProxy& operator&=(const eT rhs); - arma_inline SpValProxy& operator|=(const eT rhs); - arma_inline SpValProxy& operator^=(const eT rhs); arma_inline SpValProxy& operator++(); arma_inline SpValProxy& operator--(); @@ -77,4 +71,5 @@ }; + //! @} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.4.3/include/armadillo_bits/SpValProxy_meat.hpp new/armadillo-3.4.4/include/armadillo_bits/SpValProxy_meat.hpp --- old/armadillo-3.4.3/include/armadillo_bits/SpValProxy_meat.hpp 2012-09-03 09:46:10.000000000 +0200 +++ new/armadillo-3.4.4/include/armadillo_bits/SpValProxy_meat.hpp 2012-10-30 08:27:43.000000000 +0100 @@ -143,7 +143,7 @@ SpValProxy<T1>& SpValProxy<T1>::operator*=(const eT rhs) { - if (rhs != 0) + if (rhs != eT(0)) { if (val_ptr) @@ -221,145 +221,17 @@ template<typename T1> arma_inline SpValProxy<T1>& -SpValProxy<T1>::operator%=(const eT rhs) - { - if (val_ptr) - { - *val_ptr %= rhs; - check_zero(); - } - - return *this; - } - - - -template<typename T1> -arma_inline -SpValProxy<T1>& -SpValProxy<T1>::operator<<=(const eT rhs) - { - // Shifting 0 by any amount should do nothing. - if (val_ptr) - { - *val_ptr <<= rhs; - check_zero(); - } - - return *this; - } - - - -template<typename T1> -arma_inline -SpValProxy<T1>& -SpValProxy<T1>::operator>>=(const eT rhs) - { - // Shifting 0 by any amount should do nothing. - if (val_ptr) - { - *val_ptr <<= rhs; - check_zero(); - } - - return *this; - } - - - -template<typename T1> -arma_inline -SpValProxy<T1>& -SpValProxy<T1>::operator&=(const eT rhs) - { - // Anding with 0 should do nothing. - if (val_ptr) - { - *val_ptr &= rhs; - check_zero(); - } - - return *this; - } - - - -template<typename T1> -arma_inline -SpValProxy<T1>& -SpValProxy<T1>::operator|=(const eT rhs) - { - // Oring with 0 means we assign rhs. - if (rhs != eT(0)) - { - - if (val_ptr) - { - *val_ptr |= rhs; - } - else - { - val_ptr = &parent.add_element(row, col, rhs); - } - - } - - return *this; - } - - - -template<typename T1> -arma_inline -SpValProxy<T1>& -SpValProxy<T1>::operator^=(const eT rhs) - { - // Xoring 0 with 0 is still 0. - if (rhs != eT(0)) - { - - if (val_ptr) - { - *val_ptr ^= rhs; - check_zero(); - } - else - { - val_ptr = &parent.add_element(row, col, rhs ^ 0); - } - - } - else - { - - if (val_ptr) - { - *val_ptr ^= rhs; - check_zero(); - } - - } - - return *this; - } - - - -template<typename T1> -arma_inline -SpValProxy<T1>& SpValProxy<T1>::operator++() { if (val_ptr) { - ++(*val_ptr); + (*val_ptr) += eT(1); check_zero(); } else { - val_ptr = &parent.add_element(row, col, 1); + val_ptr = &parent.add_element(row, col, eT(1)); } return *this; @@ -374,13 +246,13 @@ { if (val_ptr) { - --(*val_ptr); + (*val_ptr) -= eT(1); check_zero(); } else { - val_ptr = &parent.add_element(row, col, -1); + val_ptr = &parent.add_element(row, col, eT(-1)); } return *this; @@ -395,18 +267,18 @@ { if (val_ptr) { - ++(*val_ptr); + (*val_ptr) += eT(1); check_zero(); } else { - val_ptr = &parent.add_element(row, col, 1); + val_ptr = &parent.add_element(row, col, eT(1)); } if (val_ptr) // It may have changed to now be 0. { - return *(val_ptr - 1); + return *(val_ptr) - eT(1); } else { @@ -423,7 +295,7 @@ { if (val_ptr) { - --(*val_ptr); + (*val_ptr) -= eT(1); check_zero(); } @@ -434,7 +306,7 @@ if (val_ptr) // It may have changed to now be 0. { - return *(val_ptr + 1); + return *(val_ptr) + eT(1); } else { @@ -472,3 +344,7 @@ val_ptr = NULL; } } + + + +//! @} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.4.3/include/armadillo_bits/arma_version.hpp new/armadillo-3.4.4/include/armadillo_bits/arma_version.hpp --- old/armadillo-3.4.3/include/armadillo_bits/arma_version.hpp 2012-10-03 03:42:50.000000000 +0200 +++ new/armadillo-3.4.4/include/armadillo_bits/arma_version.hpp 2012-10-23 13:03:42.000000000 +0200 @@ -18,7 +18,7 @@ #define ARMA_VERSION_MAJOR 3 #define ARMA_VERSION_MINOR 4 -#define ARMA_VERSION_PATCH 3 +#define ARMA_VERSION_PATCH 4 #define ARMA_VERSION_NAME "Ku De Ta" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.4.3/include/armadillo_bits/diskio_meat.hpp new/armadillo-3.4.4/include/armadillo_bits/diskio_meat.hpp --- old/armadillo-3.4.3/include/armadillo_bits/diskio_meat.hpp 2012-09-20 05:10:25.000000000 +0200 +++ new/armadillo-3.4.4/include/armadillo_bits/diskio_meat.hpp 2012-10-23 15:35:20.000000000 +0200 @@ -1559,7 +1559,7 @@ while(line_stream.good() == true) { - getline(line_stream, token, ','); + std::getline(line_stream, token, ','); ++line_n_cols; } @@ -1593,7 +1593,7 @@ while(line_stream.good() == true) { - getline(line_stream, token, ','); + std::getline(line_stream, token, ','); eT val; @@ -2946,7 +2946,7 @@ // // while(line_stream.good() == true) // { -// getline(line_stream, token, ','); +// std::getline(line_stream, token, ','); // ++line_n_cols; // } // @@ -2979,7 +2979,7 @@ // // while(line_stream.good() == true) // { -// getline(line_stream, token, ','); +// std::getline(line_stream, token, ','); // // eT val; // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.4.3/include/armadillo_bits/fn_n_unique.hpp new/armadillo-3.4.4/include/armadillo_bits/fn_n_unique.hpp --- old/armadillo-3.4.3/include/armadillo_bits/fn_n_unique.hpp 2012-09-20 05:10:25.000000000 +0200 +++ new/armadillo-3.4.4/include/armadillo_bits/fn_n_unique.hpp 2012-10-26 18:19:51.000000000 +0200 @@ -64,7 +64,7 @@ { if(x_it == y_it) { - if(op_n_unique_type::eval((*x_it), (*y_it)) != 0) + if(op_n_unique_type::eval((*x_it), (*y_it)) != typename T1::elem_type(0)) { ++total_n_nonzero; } @@ -76,7 +76,7 @@ { if((x_it.col() < y_it.col()) || ((x_it.col() == y_it.col()) && (x_it.row() < y_it.row()))) // if y is closer to the end { - if(op_n_unique_type::eval((*x_it), typename T1::elem_type(0)) != 0) + if(op_n_unique_type::eval((*x_it), typename T1::elem_type(0)) != typename T1::elem_type(0)) { ++total_n_nonzero; } @@ -85,7 +85,7 @@ } else // x is closer to the end { - if(op_n_unique_type::eval(typename T1::elem_type(0), (*y_it)) != 0) + if(op_n_unique_type::eval(typename T1::elem_type(0), (*y_it)) != typename T1::elem_type(0)) { ++total_n_nonzero; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
