Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2013-08-01 15:21:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armadillo (Old) and /work/SRC/openSUSE:Factory/.armadillo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armadillo" Changes: -------- --- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2013-06-28 11:48:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2013-08-01 15:21:02.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 31 19:09:57 UTC 2013 - [email protected] + +- Update to version 3.900.7 + * minor fix for inplace reshape() + * minor corrections for compilation issues under GCC 4.8+ + +------------------------------------------------------------------- Old: ---- armadillo-3.900.6.tar.gz New: ---- armadillo-3.900.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.lGfhne/_old 2013-08-01 15:21:03.000000000 +0200 +++ /var/tmp/diff_new_pack.lGfhne/_new 2013-08-01 15:21:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: armadillo -Version: 3.900.6 +Version: 3.900.7 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: MPL-2.0 ++++++ armadillo-3.900.6.tar.gz -> armadillo-3.900.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.6/CMakeLists.txt new/armadillo-3.900.7/CMakeLists.txt --- old/armadillo-3.900.6/CMakeLists.txt 2013-06-24 05:09:02.000000000 +0200 +++ new/armadillo-3.900.7/CMakeLists.txt 2013-07-31 05:57:39.000000000 +0200 @@ -13,7 +13,7 @@ set(ARMA_MAJOR 3) set(ARMA_MINOR 900) -set(ARMA_PATCH 6) +set(ARMA_PATCH 7) message(STATUS "Configuring Armadillo ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.6/docs.html new/armadillo-3.900.7/docs.html --- old/armadillo-3.900.6/docs.html 2013-06-04 07:05:22.000000000 +0200 +++ new/armadillo-3.900.7/docs.html 2013-07-17 01:41:55.000000000 +0200 @@ -143,7 +143,7 @@ <ul> <li> To aid the conversion of Matlab/Octave programs, -there is a <a href="#syntax">syntax conversion table</a> +see the <a href="#syntax">syntax conversion table</a> </li> <br> <li> @@ -4430,7 +4430,7 @@ <br> <li> If the requested number of elements is not equal to the old number of elements, new memory is used; -the memory is uninitilised +the memory is uninitialised </li> <br> <li> @@ -11119,7 +11119,7 @@ <li>API and Version Policy <ul> <li> -Armadillo's version number is X.Y.Z, where X is a major version, Y is a minor version, and Z is the patch level (indicating bug fixes). +Armadillo's version number is <i>A.B.C</i>, where <i>A</i> is a major version, <i>B</i> is a minor version, and <i>C</i> is the patch level (indicating bug fixes). </li> <br> <li> @@ -11130,17 +11130,17 @@ </li> <br> <li> -An odd minor version number (eg. 3.3) indicates an experimental version. +An odd minor version number (ie. when <i>B</i> is not evenly divisible by 2) indicates an experimental version. Experimental versions are generally faster and have more functionality, -but their APIs have not been finalised yet. +but their APIs have not been finalised yet (though the likelihood of APIs changes is quite low). </li> <br> <li> -In general, we don't like changes to existing APIs and prefer not to break any user software. -However, to allow evolution and help code maintenance, we reserve the right to change the APIs in future major versions of Armadillo, +In general, we don't like changes to existing APIs and strongly prefer not to break any user software. +However, to allow evolution, we reserve the right to alter the APIs in future major versions of Armadillo, while remaining backwards compatible wherever possible -(eg. 4.0 may have slightly different APIs than 3.x). -Also, in a rare instance the user API may need to be altered if a bug fix absolutely requires it. +(eg. 4.x may have slightly different APIs than 3.x). +Also, in a rare instance the user API may need to be tweaked if a bug fix absolutely requires it. </li> </ul> </li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.6/include/armadillo_bits/arma_version.hpp new/armadillo-3.900.7/include/armadillo_bits/arma_version.hpp --- old/armadillo-3.900.6/include/armadillo_bits/arma_version.hpp 2013-06-24 05:09:02.000000000 +0200 +++ new/armadillo-3.900.7/include/armadillo_bits/arma_version.hpp 2013-07-31 05:57:39.000000000 +0200 @@ -13,7 +13,7 @@ #define ARMA_VERSION_MAJOR 3 #define ARMA_VERSION_MINOR 900 -#define ARMA_VERSION_PATCH 6 +#define ARMA_VERSION_PATCH 7 #define ARMA_VERSION_NAME "Bavarian Sunflower" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.6/include/armadillo_bits/op_reshape_meat.hpp new/armadillo-3.900.7/include/armadillo_bits/op_reshape_meat.hpp --- old/armadillo-3.900.6/include/armadillo_bits/op_reshape_meat.hpp 2013-02-21 08:16:35.000000000 +0100 +++ new/armadillo-3.900.7/include/armadillo_bits/op_reshape_meat.hpp 2013-07-31 06:00:12.000000000 +0200 @@ -1,5 +1,5 @@ -// Copyright (C) 2008-2012 NICTA (www.nicta.com.au) -// Copyright (C) 2008-2012 Conrad Sanderson +// Copyright (C) 2008-2013 Conrad Sanderson +// Copyright (C) 2008-2013 NICTA (www.nicta.com.au) // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -43,19 +43,8 @@ } else // &out == &A, i.e. inplace resize { - const bool same_size = ( (out.n_rows == in_n_rows) && (out.n_cols == in_n_cols) ); - - if(same_size == false) - { - arma_debug_check - ( - (out.mem_state == 3), - "reshape(): size can't be changed as template based size specification is in use" - ); - - access::rw(out.n_rows) = in_n_rows; - access::rw(out.n_cols) = in_n_cols; - } + out.set_size(in_n_rows, in_n_cols); + // set_size() doesn't destroy data as long as the number of elements in the matrix remains the same } } else @@ -66,7 +55,6 @@ out.set_size(in_n_rows, in_n_cols); eT* out_mem = out.memptr(); - uword i = 0; const uword B_n_rows = B.n_rows; const uword B_n_cols = B.n_cols; @@ -74,8 +62,8 @@ for(uword row=0; row<B_n_rows; ++row) for(uword col=0; col<B_n_cols; ++col) { - out_mem[i] = B.at(row,col); - ++i; + *out_mem = B.at(row,col); + out_mem++; } } } @@ -155,25 +143,8 @@ } else // &out == &A, i.e. inplace resize { - const bool same_size = ( (out.n_rows == in_n_rows) && (out.n_cols == in_n_cols) && (out.n_slices == in_n_slices) ); - - if(same_size == false) - { - arma_debug_check - ( - (out.mem_state == 3), - "reshape(): size can't be changed as template based size specification is in use" - ); - - out.delete_mat(); - - access::rw(out.n_rows) = in_n_rows; - access::rw(out.n_cols) = in_n_cols; - access::rw(out.n_elem_slice) = in_n_rows * in_n_cols; - access::rw(out.n_slices) = in_n_slices; - - out.create_mat(); - } + out.set_size(in_n_rows, in_n_cols, in_n_slices); + // set_size() doesn't destroy data as long as the number of elements in the cube remains the same } } else @@ -184,18 +155,17 @@ out.set_size(in_n_rows, in_n_cols, in_n_slices); eT* out_mem = out.memptr(); - uword i = 0; const uword B_n_rows = B.n_rows; const uword B_n_cols = B.n_cols; const uword B_n_slices = B.n_slices; - for(uword slice=0; slice<B_n_slices; ++slice) - for(uword row=0; row<B_n_rows; ++row) - for(uword col=0; col<B_n_cols; ++col) + for(uword slice = 0; slice < B_n_slices; ++slice) + for(uword row = 0; row < B_n_rows; ++row ) + for(uword col = 0; col < B_n_cols; ++col ) { - out_mem[i] = B.at(row,col,slice); - ++i; + *out_mem = B.at(row,col,slice); + out_mem++; } } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
