Hello community,
here is the log from the commit of package armadillo for openSUSE:Factory
checked in at 2014-12-30 00:50:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-12-03
22:49:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2014-12-30
00:50:23.000000000 +0100
@@ -1,0 +2,8 @@
+Sat Dec 27 01:44:31 UTC 2014 - badshah...@gmail.com
+
+- Update to version 4.550.4:
+ + List of changes not documented upstream.
+- Update to version 4.550.3:
+ + List of changes not documented upstream.
+
+-------------------------------------------------------------------
Old:
----
armadillo-4.550.2.tar.gz
New:
----
armadillo-4.550.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ armadillo.spec ++++++
--- /var/tmp/diff_new_pack.LXslBi/_old 2014-12-30 00:50:27.000000000 +0100
+++ /var/tmp/diff_new_pack.LXslBi/_new 2014-12-30 00:50:27.000000000 +0100
@@ -19,7 +19,7 @@
%define soname libarmadillo4
Name: armadillo
-Version: 4.550.2
+Version: 4.550.4
Release: 0
Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS
License: MPL-2.0
++++++ armadillo-4.550.2.tar.gz -> armadillo-4.550.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-4.550.2/CMakeLists.txt
new/armadillo-4.550.4/CMakeLists.txt
--- old/armadillo-4.550.2/CMakeLists.txt 2014-11-30 04:49:49.000000000
+0100
+++ new/armadillo-4.550.4/CMakeLists.txt 2014-12-24 07:21:16.000000000
+0100
@@ -14,7 +14,7 @@
set(ARMA_MAJOR 4)
set(ARMA_MINOR 550)
-set(ARMA_PATCH 2)
+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-4.550.2/README.txt
new/armadillo-4.550.4/README.txt
--- old/armadillo-4.550.2/README.txt 2014-11-30 04:49:49.000000000 +0100
+++ new/armadillo-4.550.4/README.txt 2014-12-24 07:21:16.000000000 +0100
@@ -187,7 +187,7 @@
If you want to use Armadillo without installation,
or you're getting linking errors, compile along these lines:
- g++ example1.cpp -o example1 -O2 -I /home/blah/armadillo-4.550.2/include
-DARMA_DONT_USE_WRAPPER -lblas -llapack
+ g++ example1.cpp -o example1 -O2 -I /home/blah/armadillo-4.550.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-4.550.2/include/armadillo_bits/arma_version.hpp
new/armadillo-4.550.4/include/armadillo_bits/arma_version.hpp
--- old/armadillo-4.550.2/include/armadillo_bits/arma_version.hpp
2014-11-30 04:49:49.000000000 +0100
+++ new/armadillo-4.550.4/include/armadillo_bits/arma_version.hpp
2014-12-24 07:21:16.000000000 +0100
@@ -13,7 +13,7 @@
#define ARMA_VERSION_MAJOR 4
#define ARMA_VERSION_MINOR 550
-#define ARMA_VERSION_PATCH 2
+#define ARMA_VERSION_PATCH 4
#define ARMA_VERSION_NAME "Singapore Sling Deluxe"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.550.2/include/armadillo_bits/compiler_setup.hpp
new/armadillo-4.550.4/include/armadillo_bits/compiler_setup.hpp
--- old/armadillo-4.550.2/include/armadillo_bits/compiler_setup.hpp
2014-10-21 18:40:33.000000000 +0200
+++ new/armadillo-4.550.4/include/armadillo_bits/compiler_setup.hpp
2014-12-16 10:30:32.000000000 +0100
@@ -205,10 +205,20 @@
#if defined(_MSC_VER)
- #if (_MSC_VER < 1700)
+ #if (_MSC_VER < 1600)
#error "*** Need a newer compiler ***"
#endif
+ #if (_MSC_VER < 1700)
+ #pragma message ("WARNING: your C++ compiler is outdated and has
incomplete support for the C++ standard; if something breaks, you get to keep
all the pieces")
+ #endif
+
+ #if defined(ARMA_USE_CXX11)
+ #if (_MSC_VER < 1800)
+ #pragma message ("WARNING: your C++ compiler is in C++11 mode, but it
has incomplete support for C++11 features; if something breaks, you get to keep
all the pieces")
+ #endif
+ #endif
+
#undef ARMA_SIMPLE_LOOPS
#define ARMA_SIMPLE_LOOPS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.550.2/include/armadillo_bits/gmm_diag_meat.hpp
new/armadillo-4.550.4/include/armadillo_bits/gmm_diag_meat.hpp
--- old/armadillo-4.550.2/include/armadillo_bits/gmm_diag_meat.hpp
2014-11-24 07:17:31.000000000 +0100
+++ new/armadillo-4.550.4/include/armadillo_bits/gmm_diag_meat.hpp
2014-12-18 12:32:28.000000000 +0100
@@ -1193,8 +1193,6 @@
{
running_mean_scalar<eT> running_mean;
- const uword N = X.n_cols;
-
for(uword i=0; i<N; ++i)
{
running_mean( internal_scalar_log_p( X.colptr(i), gaus_id ) );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.550.2/include/armadillo_bits/op_diagvec_meat.hpp
new/armadillo-4.550.4/include/armadillo_bits/op_diagvec_meat.hpp
--- old/armadillo-4.550.2/include/armadillo_bits/op_diagvec_meat.hpp
2013-08-08 07:54:23.000000000 +0200
+++ new/armadillo-4.550.4/include/armadillo_bits/op_diagvec_meat.hpp
2014-12-07 15:52:17.000000000 +0100
@@ -39,7 +39,7 @@
const uword len = (std::min)(n_rows - row_offset, n_cols - col_offset);
- if(is_Mat<typename Proxy<T1>::stored_type>::value)
+ if( (is_Mat<typename Proxy<T1>::stored_type>::value) && (Proxy<T1>::fake_mat
== false) )
{
op_diagvec::apply_unwrap(out, P.Q, row_offset, col_offset, len);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.550.2/include/armadillo_bits/op_expmat_meat.hpp
new/armadillo-4.550.4/include/armadillo_bits/op_expmat_meat.hpp
--- old/armadillo-4.550.2/include/armadillo_bits/op_expmat_meat.hpp
2014-12-02 07:51:03.000000000 +0100
+++ new/armadillo-4.550.4/include/armadillo_bits/op_expmat_meat.hpp
2014-12-24 05:30:11.000000000 +0100
@@ -51,7 +51,7 @@
const T log2_val = eop_aux::log2(norm_val);
- const uword s = (std::max)(uword(0), uword(log2_val) + uword(1) +
uword(1));
+ const uword s = uword( (std::max)(sword(0), sword(log2_val) + sword(1) +
sword(1)) );
const Mat<eT> AA = A / eT(eop_aux::pow(double(2), double(s)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.550.2/include/armadillo_bits/op_reshape_meat.hpp
new/armadillo-4.550.4/include/armadillo_bits/op_reshape_meat.hpp
--- old/armadillo-4.550.2/include/armadillo_bits/op_reshape_meat.hpp
2014-04-13 04:03:36.000000000 +0200
+++ new/armadillo-4.550.4/include/armadillo_bits/op_reshape_meat.hpp
2014-12-07 14:10:23.000000000 +0100
@@ -222,7 +222,7 @@
const uword in_n_rows = in.aux_uword_a;
const uword in_n_cols = in.aux_uword_b;
- if(is_Mat<typename Proxy<T1>::stored_type>::value == true)
+ if( (is_Mat<typename Proxy<T1>::stored_type>::value == true) &&
(Proxy<T1>::fake_mat == false) )
{
// not checking for aliasing here, as this might be an inplace reshape
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
