Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2016-04-28 16:57:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-22 16:25:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2016-04-28 17:02:26.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 27 04:43:12 UTC 2016 - [email protected] + +- Update to version 6.700.5: + + Undocumented bug fixes. + +------------------------------------------------------------------- Old: ---- armadillo-6.700.4.tar.gz New: ---- armadillo-6.700.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.xiEE0u/_old 2016-04-28 17:02:28.000000000 +0200 +++ /var/tmp/diff_new_pack.xiEE0u/_new 2016-04-28 17:02:28.000000000 +0200 @@ -19,7 +19,7 @@ %define soname libarmadillo6 Name: armadillo -Version: 6.700.4 +Version: 6.700.5 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: MPL-2.0 ++++++ armadillo-6.700.4.tar.gz -> armadillo-6.700.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.4/CMakeLists.txt new/armadillo-6.700.5/CMakeLists.txt --- old/armadillo-6.700.4/CMakeLists.txt 2016-04-11 04:46:29.000000000 +0200 +++ new/armadillo-6.700.5/CMakeLists.txt 2016-04-24 04:32:22.000000000 +0200 @@ -16,7 +16,7 @@ set(ARMA_MAJOR 6) set(ARMA_MINOR 700) -set(ARMA_PATCH 4) +set(ARMA_PATCH 5) 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.4/README.txt new/armadillo-6.700.5/README.txt --- old/armadillo-6.700.4/README.txt 2016-04-12 05:35:39.000000000 +0200 +++ new/armadillo-6.700.5/README.txt 2016-04-24 04:32:22.000000000 +0200 @@ -231,11 +231,12 @@ 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.4/include -DARMA_DONT_USE_WRAPPER -lblas -llapack + g++ example1.cpp -o example1 -O2 -I /home/blah/armadillo-6.700.5/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, and/or if you have unpacked the armadillo archive into a different directory. + Replace -lblas with -lopenblas if you have OpenBLAS. On Mac OS X, replace -lblas -llapack with -framework Accelerate @@ -326,12 +327,22 @@ Armadillo can use OpenBLAS, or Intel Math Kernel Library (MKL), or the AMD Core Math Library (ACML) as high-speed replacements -for BLAS and LAPACK. Generally this just involves linking with -the replacement libraries instead of BLAS and LAPACK. +for BLAS and LAPACK. In essence this involves linking with the +replacement libraries instead of BLAS and LAPACK. + +You may need to make minor modifications to include/armadillo_bits/config.hpp +to make sure Armadillo uses the same integer sizes and style of function names +as used by MKL or ACML. Specifically, you may need comment or uncomment the +following defines: + +ARMA_USE_WRAPPER +ARMA_BLAS_CAPITALS +ARMA_BLAS_UNDERSCORE +ARMA_BLAS_LONG +ARMA_BLAS_LONG_LONG -You may need to make minor modifications to "include/armadillo_bits/config.hpp" -in order to make sure Armadillo uses the same style of function names -as used by MKL or ACML. For example, the function names might be in capitals. +See the associated descriptions in include/armadillo_bits/config.hpp +for more information about the above defines. On Linux systems, MKL and ACML might be installed in a non-standard location, such as /opt, which can cause problems during linking. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.4/include/armadillo_bits/arma_version.hpp new/armadillo-6.700.5/include/armadillo_bits/arma_version.hpp --- old/armadillo-6.700.4/include/armadillo_bits/arma_version.hpp 2016-04-11 04:46:29.000000000 +0200 +++ new/armadillo-6.700.5/include/armadillo_bits/arma_version.hpp 2016-04-24 04:32:22.000000000 +0200 @@ -15,7 +15,7 @@ #define ARMA_VERSION_MAJOR 6 #define ARMA_VERSION_MINOR 700 -#define ARMA_VERSION_PATCH 4 +#define ARMA_VERSION_PATCH 5 #define ARMA_VERSION_NAME "Catabolic Amalgamator Deluxe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.4/include/armadillo_bits/compiler_setup.hpp new/armadillo-6.700.5/include/armadillo_bits/compiler_setup.hpp --- old/armadillo-6.700.4/include/armadillo_bits/compiler_setup.hpp 2016-03-22 04:53:42.000000000 +0100 +++ new/armadillo-6.700.5/include/armadillo_bits/compiler_setup.hpp 2016-04-24 04:27:30.000000000 +0200 @@ -11,8 +11,6 @@ #undef arma_hot #undef arma_cold -#undef arma_pure -#undef arma_const #undef arma_aligned #undef arma_align_mem #undef arma_warn_unused @@ -24,8 +22,6 @@ #define arma_hot #define arma_cold -#define arma_pure -#define arma_const #define arma_aligned #define arma_align_mem #define arma_warn_unused @@ -35,6 +31,11 @@ #define arma_noinline #define arma_ignore(variable) ((void)(variable)) +// arma_pure and arma_const kept only for compatibility with old code +#undef arma_pure +#define arma_pure +#undef arma_const +#define arma_const #undef arma_fortran_noprefix #undef arma_fortran_prefix @@ -181,8 +182,6 @@ #define ARMA_GOOD_COMPILER - #undef arma_pure - #undef arma_const #undef arma_aligned #undef arma_align_mem #undef arma_warn_unused @@ -191,8 +190,6 @@ #undef arma_inline #undef arma_noinline - #define arma_pure __attribute__((__pure__)) - #define arma_const __attribute__((__const__)) #define arma_aligned __attribute__((__aligned__)) #define arma_align_mem __attribute__((__aligned__(16))) #define arma_warn_unused __attribute__((__warn_unused_result__)) @@ -266,16 +263,6 @@ #define __has_attribute(x) 0 #endif - #if __has_attribute(__pure__) - #undef arma_pure - #define arma_pure __attribute__((__pure__)) - #endif - - #if __has_attribute(__const__) - #undef arma_const - #define arma_const __attribute__((__const__)) - #endif - #if __has_attribute(__aligned__) #undef arma_aligned #undef arma_align_mem diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.4/include/armadillo_bits/fn_trunc_exp.hpp new/armadillo-6.700.5/include/armadillo_bits/fn_trunc_exp.hpp --- old/armadillo-6.700.4/include/armadillo_bits/fn_trunc_exp.hpp 2015-11-10 05:42:43.000000000 +0100 +++ new/armadillo-6.700.5/include/armadillo_bits/fn_trunc_exp.hpp 2016-04-24 04:11:17.000000000 +0200 @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2012 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 @@ -20,7 +20,7 @@ typename arma_real_only<eT>::result trunc_exp(const eT x) { - if(std::numeric_limits<eT>::is_iec559 && (x >= Math<eT>::log_max() )) + if(std::numeric_limits<eT>::is_iec559 && (x >= Datum<eT>::log_max )) { return std::numeric_limits<eT>::max(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-6.700.4/include/armadillo_bits/fn_trunc_log.hpp new/armadillo-6.700.5/include/armadillo_bits/fn_trunc_log.hpp --- old/armadillo-6.700.4/include/armadillo_bits/fn_trunc_log.hpp 2015-11-10 05:42:43.000000000 +0100 +++ new/armadillo-6.700.5/include/armadillo_bits/fn_trunc_log.hpp 2016-04-24 04:11:17.000000000 +0200 @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2012 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 @@ -23,11 +23,11 @@ { if(x == std::numeric_limits<eT>::infinity()) { - return Math<eT>::log_max(); + return Datum<eT>::log_max; } else { - return (x <= eT(0)) ? Math<eT>::log_min() : std::log(x); + return (x <= eT(0)) ? Datum<eT>::log_min : std::log(x); } } else
