Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2016-04-22 16:25:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-04-06 11:53:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2016-04-22 16:25:57.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 20 01:38:35 UTC 2016 - [email protected] + +- Update to version 6.700.4: + + Undocumented bug fixes. + +------------------------------------------------------------------- Old: ---- armadillo-6.700.3.tar.gz New: ---- armadillo-6.700.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.FB4gcU/_old 2016-04-22 16:25:58.000000000 +0200 +++ /var/tmp/diff_new_pack.FB4gcU/_new 2016-04-22 16:25:58.000000000 +0200 @@ -19,7 +19,7 @@ %define soname libarmadillo6 Name: armadillo -Version: 6.700.3 +Version: 6.700.4 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: MPL-2.0 ++++++ armadillo-6.700.3.tar.gz -> armadillo-6.700.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.3/CMakeLists.txt new/armadillo-6.700.4/CMakeLists.txt --- old/armadillo-6.700.3/CMakeLists.txt 2016-04-05 05:20:49.000000000 +0200 +++ new/armadillo-6.700.4/CMakeLists.txt 2016-04-11 04:46:29.000000000 +0200 @@ -16,7 +16,7 @@ set(ARMA_MAJOR 6) set(ARMA_MINOR 700) -set(ARMA_PATCH 3) +set(ARMA_PATCH 4) set(ARMADILLO_VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}) message(STATUS "Configuring Armadillo ${ARMADILLO_VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.3/README.txt new/armadillo-6.700.4/README.txt --- old/armadillo-6.700.3/README.txt 2016-04-05 05:20:49.000000000 +0200 +++ new/armadillo-6.700.4/README.txt 2016-04-12 05:35:39.000000000 +0200 @@ -9,7 +9,7 @@ 1: Introduction 2: Citation Details - 3: Licenses + 3: Open Source and Commercial Licenses 4: Technical Support 5: Requirements @@ -43,15 +43,16 @@ The syntax (API) is deliberately similar to Matlab. The library provides efficient classes for vectors, matrices and cubes, -as well as 150+ associated functions (eg. contiguous and non-contiguous +as well as 200+ associated functions (eg. contiguous and non-contiguous submatrix views). Various matrix decompositions are provided through integration with LAPACK, or one of its high performance drop-in replacements (eg. OpenBLAS, Intel MKL, AMD ACML, Apple Accelerate framework, etc). -An automatic expression evaluator (via C++ template meta-programming) -combines several operations (at compile time) to increase efficiency. +A sophisticated expression evaluator (via C++ template meta-programming) +automatically combines several operations (at compile time) to increase speed +and efficiency. -The library can be used for machine learning, pattern recognition, +The library can be used for machine learning, pattern recognition, computer vision, signal processing, bioinformatics, statistics, econometrics, etc. Armadillo is primarily developed at Data61 / NICTA (Australia). @@ -77,24 +78,46 @@ -3: Licenses -=========== +3: Open Source and Commercial Licenses +====================================== Armadillo is available under 2 licenses: -- Open source, using the Mozilla Public License (MPL) 2.0. - See the "LICENSE.txt" file for details. +(a) Open source, under the restrictions of the Mozilla Public License (MPL) 2.0. + The file "LICENSE.txt" contains a copy of the MPL. + +(b) Commercial license (not open source), available for purchase. + Please contact Conrad Sanderson for more information: + http://conradsanderson.id.au + + +The main restrictions of the open source license (MPL) are: + + - any derived works, modifications and extensions of Armadillo + are automatically licensed under the MPL + + - if you distribute any part of Armadillo in executable form + (in software or hardware products), then you must also provide + the source code of Armadillo and all derived works, modifications + or extensions + + +The commercial license has the following terms: + + - valid in perpetuity and royalty-free + + - Armadillo and derived works can be integrated into products + (software & hardware), without releasing the source code -- Non-open source (commercial) license, available for purchase. - Please contact Conrad Sanderson for more information: - http://conradsanderson.id.au + - one year of service/support is included (bug fixes and updates); + the service/support can be renewed annually 4: Technical Support ==================== -You can purchase technical support on a commercial basis. +You can purchase the commercial license (see above) which comes with technical support. Please contact Conrad Sanderson for more information: http://conradsanderson.id.au @@ -208,7 +231,7 @@ If you want to use Armadillo without installation (not recommended), compile along these lines: - g++ example1.cpp -o example1 -O2 -I /home/blah/armadillo-6.700.3/include -DARMA_DONT_USE_WRAPPER -lblas -llapack + g++ example1.cpp -o example1 -O2 -I /home/blah/armadillo-6.700.4/include -DARMA_DONT_USE_WRAPPER -lblas -llapack The above command line assumes that you have unpacked the armadillo archive into /home/blah/ You will need to adjust this for later versions of Armadillo, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.3/docs.html new/armadillo-6.700.4/docs.html --- old/armadillo-6.700.3/docs.html 2016-04-04 06:44:29.000000000 +0200 +++ new/armadillo-6.700.4/docs.html 2016-04-12 05:06:40.000000000 +0200 @@ -159,7 +159,7 @@ <td style="text-align: left; vertical-align: top; width: 50%;"> <ul> <li> -To aid the conversion of Matlab/Octave programs, +For converting Matlab/Octave programs, see the <a href="#syntax">syntax conversion table</a> </li> <br> @@ -172,7 +172,7 @@ </li> <br> <li> -Notes on <a href="#api_additions">API additions</a> +History of <a href="#api_additions">API additions</a> </li> </ul> </td> @@ -191,12 +191,15 @@ <br> <font size=-1> Conrad Sanderson. -<br> <i><a href="armadillo_nicta_2010.pdf">Armadillo: An Open Source C++ Linear Algebra Library for Fast Prototyping and Computationally Intensive Experiments</a></i>. -<br> Technical Report, NICTA, 2010. </font> </li> +<br> +<li> +If you use Armadillo in commercial products (software or hardware), +please obtain the <a href="http://arma.sourceforge.net/faq.html#licenses";>commercial license</a> +</li> </ul> </td> </tr> @@ -7041,13 +7044,13 @@ mat A = randu<mat>(5,5); mat B = A + 0.001; -bool same1 = approx_equal(A, B, "abs", 0.002); +bool same1 = approx_equal(A, B, "absdiff", 0.002); mat C = 1000 * randu<mat>(5,5); mat D = C + 1; -bool same2 = approx_equal(C, D, "rel", 0.1); +bool same2 = approx_equal(C, D, "reldiff", 0.1); bool same3 = approx_equal(C, D, "both", 2, 0.1); </pre> @@ -7577,8 +7580,9 @@ <br> <li>See also: <ul> -<li><a href="#cumsum">cumsum()</a></li> -<li><a href="#stats_fns">statistics functions</a></li> +<li><a href="#trapz">trapz()</a></li> +<li><a href="http://en.wikipedia.org/wiki/Numerical_differentiation";>numerical differentiation in Wikipedia</a></li> +<li><a href="http://mathworld.wolfram.com/NumericalDifferentiation.html";>numerical differentiation in MathWorld</a></li> </ul> </li> <br> @@ -9337,8 +9341,10 @@ <li>See also: <ul> <li><a href="#sum">sum()</a></li> +<li><a href="#diff">diff()</a></li> <li><a href="#linspace">linspace()</a></li> <li><a href="https://en.wikipedia.org/wiki/Numerical_integration";>numerical integration in Wikipedia</a> +<li><a href="http://mathworld.wolfram.com/NumericalIntegration.html";>numerical integration in MathWorld</a> <li><a href="https://en.wikipedia.org/wiki/Trapezoidal_rule";>trapezoidal rule in Wikipedia</a> </ul> </li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.3/include/armadillo_bits/Mat_meat.hpp new/armadillo-6.700.4/include/armadillo_bits/Mat_meat.hpp --- old/armadillo-6.700.3/include/armadillo_bits/Mat_meat.hpp 2016-03-31 07:05:58.000000000 +0200 +++ new/armadillo-6.700.4/include/armadillo_bits/Mat_meat.hpp 2016-04-11 04:06:01.000000000 +0200 @@ -8017,7 +8017,7 @@ template<uword fixed_n_rows, uword fixed_n_cols> arma_inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed() - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); } @@ -8028,7 +8028,7 @@ template<uword fixed_n_rows, uword fixed_n_cols> arma_inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed(const fixed<fixed_n_rows, fixed_n_cols>& X) - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); @@ -8045,7 +8045,7 @@ template<typename fill_type> inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed(const fill::fill_class<fill_type>&) - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); @@ -8063,7 +8063,7 @@ template<typename T1> inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed(const Base<eT,T1>& A) - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); @@ -8077,7 +8077,7 @@ template<typename T1, typename T2> inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B) - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); @@ -8090,7 +8090,7 @@ template<uword fixed_n_rows, uword fixed_n_cols> inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed(const eT* aux_mem) - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); @@ -8105,7 +8105,7 @@ template<uword fixed_n_rows, uword fixed_n_cols> inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed(const char* text) - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); @@ -8118,7 +8118,7 @@ template<uword fixed_n_rows, uword fixed_n_cols> inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed(const std::string& text) - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); @@ -8133,7 +8133,7 @@ template<uword fixed_n_rows, uword fixed_n_cols> inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed(const std::initializer_list<eT>& list) - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); @@ -8169,7 +8169,7 @@ template<uword fixed_n_rows, uword fixed_n_cols> inline Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::fixed(const std::initializer_list< std::initializer_list<eT> >& list) - : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : mem_local) ) + : Mat<eT>( arma_fixed_indicator(), fixed_n_rows, fixed_n_cols, 0, ((use_extra) ? mem_local_extra : Mat<eT>::mem_local) ) { arma_extra_debug_sigprint_this(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.3/include/armadillo_bits/arma_version.hpp new/armadillo-6.700.4/include/armadillo_bits/arma_version.hpp --- old/armadillo-6.700.3/include/armadillo_bits/arma_version.hpp 2016-04-05 05:20:49.000000000 +0200 +++ new/armadillo-6.700.4/include/armadillo_bits/arma_version.hpp 2016-04-11 04:46:29.000000000 +0200 @@ -15,7 +15,7 @@ #define ARMA_VERSION_MAJOR 6 #define ARMA_VERSION_MINOR 700 -#define ARMA_VERSION_PATCH 3 +#define ARMA_VERSION_PATCH 4 #define ARMA_VERSION_NAME "Catabolic Amalgamator Deluxe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.3/include/armadillo_bits/fn_clamp.hpp new/armadillo-6.700.4/include/armadillo_bits/fn_clamp.hpp --- old/armadillo-6.700.3/include/armadillo_bits/fn_clamp.hpp 2015-11-10 05:42:43.000000000 +0100 +++ new/armadillo-6.700.4/include/armadillo_bits/fn_clamp.hpp 2016-04-08 11:21:39.000000000 +0200 @@ -14,6 +14,7 @@ template<typename T1> +arma_warn_unused inline typename enable_if2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.3/include/armadillo_bits/fn_reshape.hpp new/armadillo-6.700.4/include/armadillo_bits/fn_reshape.hpp --- old/armadillo-6.700.3/include/armadillo_bits/fn_reshape.hpp 2015-11-10 05:42:43.000000000 +0100 +++ new/armadillo-6.700.4/include/armadillo_bits/fn_reshape.hpp 2016-04-08 11:21:39.000000000 +0200 @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2015 National ICT Australia (NICTA) +// Copyright (C) 2008-2016 National ICT Australia (NICTA) // // 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 @@ -14,6 +14,7 @@ template<typename T1> +arma_warn_unused inline typename enable_if2< is_arma_type<T1>::value, const Op<T1, op_reshape> >::result reshape(const T1& X, const uword in_n_rows, const uword in_n_cols) @@ -26,6 +27,7 @@ template<typename T1> +arma_warn_unused inline typename enable_if2< is_arma_type<T1>::value, const Op<T1, op_reshape> >::result reshape(const T1& X, const SizeMat& s) @@ -54,6 +56,7 @@ template<typename T1> +arma_warn_unused inline const OpCube<T1, op_reshape_ext> reshape(const BaseCube<typename T1::elem_type,T1>& X, const uword in_n_rows, const uword in_n_cols, const uword in_n_slices, const uword dim = 0) @@ -68,6 +71,7 @@ template<typename T1> +arma_warn_unused inline const OpCube<T1, op_reshape_ext> reshape(const BaseCube<typename T1::elem_type,T1>& X, const SizeCube& s, const uword dim = 0) @@ -82,6 +86,7 @@ template<typename T1> +arma_warn_unused inline const SpOp<T1, spop_reshape> reshape(const SpBase<typename T1::elem_type, T1>& X, const uword in_n_rows, const uword in_n_cols) @@ -94,6 +99,7 @@ template<typename T1> +arma_warn_unused inline const SpOp<T1, spop_reshape> reshape(const SpBase<typename T1::elem_type, T1>& X, const SizeMat& s) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.3/include/armadillo_bits/fn_resize.hpp new/armadillo-6.700.4/include/armadillo_bits/fn_resize.hpp --- old/armadillo-6.700.3/include/armadillo_bits/fn_resize.hpp 2015-11-10 05:42:43.000000000 +0100 +++ new/armadillo-6.700.4/include/armadillo_bits/fn_resize.hpp 2016-04-08 11:21:39.000000000 +0200 @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2015 National ICT Australia (NICTA) +// Copyright (C) 2011-2016 National ICT Australia (NICTA) // // 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 @@ -14,6 +14,7 @@ template<typename T1> +arma_warn_unused inline const Op<T1, op_resize> resize(const Base<typename T1::elem_type,T1>& X, const uword in_n_rows, const uword in_n_cols) @@ -26,6 +27,7 @@ template<typename T1> +arma_warn_unused inline const Op<T1, op_resize> resize(const Base<typename T1::elem_type,T1>& X, const SizeMat& s) @@ -38,6 +40,7 @@ template<typename T1> +arma_warn_unused inline const OpCube<T1, op_resize> resize(const BaseCube<typename T1::elem_type,T1>& X, const uword in_n_rows, const uword in_n_cols, const uword in_n_slices) @@ -50,6 +53,7 @@ template<typename T1> +arma_warn_unused inline const OpCube<T1, op_resize> resize(const BaseCube<typename T1::elem_type,T1>& X, const SizeCube& s) @@ -62,6 +66,7 @@ template<typename T1> +arma_warn_unused inline const SpOp<T1, spop_resize> resize(const SpBase<typename T1::elem_type, T1>& X, const uword in_n_rows, const uword in_n_cols) @@ -74,6 +79,7 @@ template<typename T1> +arma_warn_unused inline const SpOp<T1, spop_resize> resize(const SpBase<typename T1::elem_type, T1>& X, const SizeMat& s)
