Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2013-06-28 11:48:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-14 15:42:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2013-06-28 11:48:56.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jun 26 21:34:28 UTC 2013 - [email protected] + +- Update to version 3.900.6: + + No list of changes documented by upstream for 3.900.6 and + 3.900.5. + +------------------------------------------------------------------- Old: ---- armadillo-3.900.4.tar.gz New: ---- armadillo-3.900.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.UlMcT1/_old 2013-06-28 11:48:57.000000000 +0200 +++ /var/tmp/diff_new_pack.UlMcT1/_new 2013-06-28 11:48:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: armadillo -Version: 3.900.4 +Version: 3.900.6 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: MPL-2.0 ++++++ armadillo-3.900.4.tar.gz -> armadillo-3.900.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.4/CMakeLists.txt new/armadillo-3.900.6/CMakeLists.txt --- old/armadillo-3.900.4/CMakeLists.txt 2013-06-12 13:54:56.000000000 +0200 +++ new/armadillo-3.900.6/CMakeLists.txt 2013-06-24 05:09:02.000000000 +0200 @@ -13,7 +13,7 @@ set(ARMA_MAJOR 3) set(ARMA_MINOR 900) -set(ARMA_PATCH 4) +set(ARMA_PATCH 6) message(STATUS "Configuring Armadillo ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.4/include/armadillo_bits/arma_version.hpp new/armadillo-3.900.6/include/armadillo_bits/arma_version.hpp --- old/armadillo-3.900.4/include/armadillo_bits/arma_version.hpp 2013-06-12 13:54:56.000000000 +0200 +++ new/armadillo-3.900.6/include/armadillo_bits/arma_version.hpp 2013-06-24 05:09:02.000000000 +0200 @@ -13,7 +13,7 @@ #define ARMA_VERSION_MAJOR 3 #define ARMA_VERSION_MINOR 900 -#define ARMA_VERSION_PATCH 4 +#define ARMA_VERSION_PATCH 6 #define ARMA_VERSION_NAME "Bavarian Sunflower" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.4/include/armadillo_bits/arrayops_bones.hpp new/armadillo-3.900.6/include/armadillo_bits/arrayops_bones.hpp --- old/armadillo-3.900.4/include/armadillo_bits/arrayops_bones.hpp 2013-06-03 06:49:14.000000000 +0200 +++ new/armadillo-3.900.6/include/armadillo_bits/arrayops_bones.hpp 2013-06-14 09:55:42.000000000 +0200 @@ -20,8 +20,8 @@ template<typename eT> - static inline void - copy_big(eT* dest, const eT* src, const uword n_elem); + arma_hot inline static void + copy_small(eT* dest, const eT* src, const uword n_elem); template<typename eT> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.4/include/armadillo_bits/arrayops_meat.hpp new/armadillo-3.900.6/include/armadillo_bits/arrayops_meat.hpp --- old/armadillo-3.900.4/include/armadillo_bits/arrayops_meat.hpp 2013-06-02 10:52:08.000000000 +0200 +++ new/armadillo-3.900.6/include/armadillo_bits/arrayops_meat.hpp 2013-06-14 09:55:42.000000000 +0200 @@ -17,106 +17,43 @@ void arrayops::copy(eT* dest, const eT* src, const uword n_elem) { - switch(n_elem) + if(n_elem <= 16) + { + arrayops::copy_small(dest, src, n_elem); + } + else { - default: - arrayops::copy_big(dest, src, n_elem); - break; - case 8: - dest[7] = src[7]; - case 7: - dest[6] = src[6]; - case 6: - dest[5] = src[5]; - case 5: - dest[4] = src[4]; - case 4: - dest[3] = src[3]; - case 3: - dest[2] = src[2]; - case 2: - dest[1] = src[1]; - case 1: - dest[0] = src[0]; + std::memcpy(dest, src, n_elem*sizeof(eT)); } } template<typename eT> +arma_hot inline void -arrayops::copy_big(eT* dest, const eT* src, const uword n_elem) +arrayops::copy_small(eT* dest, const eT* src, const uword n_elem) { switch(n_elem) { - default: - std::memcpy(dest, src, n_elem*sizeof(eT)); - break; - case 32: - dest[31] = src[31]; - case 31: - dest[30] = src[30]; - case 30: - dest[29] = src[29]; - case 29: - dest[28] = src[28]; - case 28: - dest[27] = src[27]; - case 27: - dest[26] = src[26]; - case 26: - dest[25] = src[25]; - case 25: - dest[24] = src[24]; - case 24: - dest[23] = src[23]; - case 23: - dest[22] = src[22]; - case 22: - dest[21] = src[21]; - case 21: - dest[20] = src[20]; - case 20: - dest[19] = src[19]; - case 19: - dest[18] = src[18]; - case 18: - dest[17] = src[17]; - case 17: - dest[16] = src[16]; - case 16: - dest[15] = src[15]; - case 15: - dest[14] = src[14]; - case 14: - dest[13] = src[13]; - case 13: - dest[12] = src[12]; - case 12: - dest[11] = src[11]; - case 11: - dest[10] = src[10]; - case 10: - dest[9] = src[9]; - case 9: - dest[8] = src[8]; - case 8: - dest[7] = src[7]; - case 7: - dest[6] = src[6]; - case 6: - dest[5] = src[5]; - case 5: - dest[4] = src[4]; - case 4: - dest[3] = src[3]; - case 3: - dest[2] = src[2]; - case 2: - dest[1] = src[1]; - case 1: - dest[0] = src[0]; + case 16: dest[15] = src[15]; + case 15: dest[14] = src[14]; + case 14: dest[13] = src[13]; + case 13: dest[12] = src[12]; + case 12: dest[11] = src[11]; + case 11: dest[10] = src[10]; + case 10: dest[ 9] = src[ 9]; + case 9: dest[ 8] = src[ 8]; + case 8: dest[ 7] = src[ 7]; + case 7: dest[ 6] = src[ 6]; + case 6: dest[ 5] = src[ 5]; + case 5: dest[ 4] = src[ 4]; + case 4: dest[ 3] = src[ 3]; + case 3: dest[ 2] = src[ 2]; + case 2: dest[ 1] = src[ 1]; + case 1: dest[ 0] = src[ 0]; + default: ; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.4/include/armadillo_bits/compiler_setup.hpp new/armadillo-3.900.6/include/armadillo_bits/compiler_setup.hpp --- old/armadillo-3.900.4/include/armadillo_bits/compiler_setup.hpp 2013-06-12 14:45:01.000000000 +0200 +++ new/armadillo-3.900.6/include/armadillo_bits/compiler_setup.hpp 2013-06-22 06:30:08.000000000 +0200 @@ -49,6 +49,11 @@ #endif +#if defined(__APPLE__) + #define ARMA_BLAS_SDOT_BUG +#endif + + #if (__cplusplus >= 201103L) #if !defined(ARMA_USE_CXX11) #define ARMA_USE_CXX11 @@ -76,27 +81,48 @@ #error "*** Need a newer compiler ***" #endif - #define ARMA_GOOD_COMPILER - #undef ARMA_HAVE_STD_TR1 - #if (__INTEL_COMPILER <= 1110) #undef ARMA_HAVE_STD_ISFINITE #endif - // #undef arma_aligned - // #define arma_aligned __attribute__((aligned(16))) + #undef ARMA_HAVE_STD_TR1 - #if defined(_MSC_VER) - #undef arma_align_mem - #define arma_align_mem __declspec(align(16)) - #else + #define ARMA_GOOD_COMPILER + #define ARMA_HAVE_ICC_ASSUME_ALIGNED + + #if defined(__GNUG__) + + // #undef arma_aligned + // #define arma_aligned __attribute__((aligned)) + #undef arma_align_mem #define arma_align_mem __attribute__((aligned(16))) + + #define ARMA_HAVE_ALIGNED_ATTRIBUTE + + #elif defined(_MSC_VER) + + // #if (_MANAGED == 1) || (_M_CEE == 1) + // + // // don't do any alignment when compiling in "managed code" mode + // + // #undef arma_aligned + // #define arma_aligned + // + // #undef arma_align_mem + // #define arma_align_mem + // + // #elif (_MSC_VER >= 1700) + // + // #undef arma_align_mem + // #define arma_align_mem __declspec(align(16)) + // + // #define ARMA_HAVE_ALIGNED_ATTRIBUTE + // + // #endif + #endif - #define ARMA_HAVE_ALIGNED_ATTRIBUTE - #define ARMA_HAVE_ICC_ASSUME_ALIGNED - #elif defined(__GNUG__) #if (__GNUC__ < 4) @@ -172,11 +198,6 @@ #endif -#if defined(__APPLE__) - #define ARMA_BLAS_SDOT_BUG -#endif - - #if defined(_MSC_VER) #if (_MSC_VER < 1500) @@ -211,23 +232,27 @@ #pragma warning(disable: 4711) // call was inlined #pragma warning(disable: 4714) // __forceinline can't be inlined - #if (_MANAGED == 1) || (_M_CEE == 1) - - // don't do any alignment when compiling in "managed code" mode - - #else - // #undef arma_aligned - // #define arma_aligned __declspec(align(16)) - - #undef arma_align_mem - #define arma_align_mem __declspec(align(16)) - - #define ARMA_HAVE_ALIGNED_ATTRIBUTE - - // disable warnings: "structure was padded due to __declspec(align(16))" - #pragma warning(disable: 4324) - - #endif + // #if (_MANAGED == 1) || (_M_CEE == 1) + // + // // don't do any alignment when compiling in "managed code" mode + // + // #undef arma_aligned + // #define arma_aligned + // + // #undef arma_align_mem + // #define arma_align_mem + // + // #elif (_MSC_VER >= 1700) + // + // #undef arma_align_mem + // #define arma_align_mem __declspec(align(16)) + // + // #define ARMA_HAVE_ALIGNED_ATTRIBUTE + // + // // disable warnings: "structure was padded due to __declspec(align(16))" + // #pragma warning(disable: 4324) + // + // #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.4/include/armadillo_bits/field_bones.hpp new/armadillo-3.900.6/include/armadillo_bits/field_bones.hpp --- old/armadillo-3.900.4/include/armadillo_bits/field_bones.hpp 2013-05-04 16:43:37.000000000 +0200 +++ new/armadillo-3.900.6/include/armadillo_bits/field_bones.hpp 2013-06-13 09:49:23.000000000 +0200 @@ -19,7 +19,7 @@ -//! A lightweight 2D container for abitrary objects +//! A lightweight 2D container for arbitrary objects //! (the objects must have a copy constructor) template<typename oT> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.900.4/include/armadillo_bits/field_meat.hpp new/armadillo-3.900.6/include/armadillo_bits/field_meat.hpp --- old/armadillo-3.900.4/include/armadillo_bits/field_meat.hpp 2013-05-04 16:43:37.000000000 +0200 +++ new/armadillo-3.900.6/include/armadillo_bits/field_meat.hpp 2013-06-13 09:54:46.000000000 +0200 @@ -27,9 +27,6 @@ if(arma_config::debug == true) { // try to expose buggy user code that accesses deleted objects - access::rw(n_rows) = 0; - access::rw(n_cols) = 0; - access::rw(n_elem) = 0; mem = 0; } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
