Hello community,
here is the log from the commit of package armadillo for openSUSE:Factory
checked in at 2014-05-13 20:42:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-06
13:53:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2014-05-13
20:42:41.000000000 +0200
@@ -1,0 +2,8 @@
+Mon May 12 10:19:20 UTC 2014 - badshah...@gmail.com
+
+- Update to version 4.300.2:
+ + Fix for detection of HDF5 library during automatic
+ installation
+ + Faster find()
+
+-------------------------------------------------------------------
Old:
----
armadillo-4.300.0.tar.gz
New:
----
armadillo-4.300.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ armadillo.spec ++++++
--- /var/tmp/diff_new_pack.bWeTCm/_old 2014-05-13 20:42:42.000000000 +0200
+++ /var/tmp/diff_new_pack.bWeTCm/_new 2014-05-13 20:42:42.000000000 +0200
@@ -19,7 +19,7 @@
%define soname libarmadillo4
Name: armadillo
-Version: 4.300.0
+Version: 4.300.2
Release: 0
Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS
License: MPL-2.0
++++++ armadillo-4.300.0.tar.gz -> armadillo-4.300.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-4.300.0/CMakeLists.txt
new/armadillo-4.300.2/CMakeLists.txt
--- old/armadillo-4.300.0/CMakeLists.txt 2014-05-02 15:29:49.000000000
+0200
+++ new/armadillo-4.300.2/CMakeLists.txt 2014-05-11 15:11:27.000000000
+0200
@@ -14,7 +14,7 @@
set(ARMA_MAJOR 4)
set(ARMA_MINOR 300)
-set(ARMA_PATCH 0)
+set(ARMA_PATCH 2)
message(STATUS "Configuring Armadillo
${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}")
@@ -264,7 +264,7 @@
configure_file(${PROJECT_SOURCE_DIR}/examples/Makefile.cmake
${PROJECT_SOURCE_DIR}/examples/Makefile)
-include_directories(${PROJECT_BINARY_DIR}/build_tmp/include/)
+include_directories(${PROJECT_BINARY_DIR}/build_tmp/include/
${CMAKE_REQUIRED_INCLUDES})
## For any library that is not in a default location,
@@ -305,6 +305,7 @@
message(STATUS "CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}" )
message(STATUS "CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}")
+message(STATUS "CMAKE_REQUIRED_INCLUDES = ${CMAKE_REQUIRED_INCLUDES}" )
add_library( armadillo SHARED ${PROJECT_SOURCE_DIR}/src/wrapper.cpp )
target_link_libraries( armadillo ${ARMA_LIBS} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-4.300.0/README.txt
new/armadillo-4.300.2/README.txt
--- old/armadillo-4.300.0/README.txt 2014-03-11 04:37:27.000000000 +0100
+++ new/armadillo-4.300.2/README.txt 2014-05-11 15:10:28.000000000 +0200
@@ -464,6 +464,7 @@
- Chris Davey
- Alexandre Drouin
- Dirk Eddelbuettel
+- Carles Fernandez
- Romain Francois
- Michael McNeil Forbes
- Piotr Gawron
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-4.300.0/docs.html
new/armadillo-4.300.2/docs.html
--- old/armadillo-4.300.0/docs.html 2014-05-02 15:29:49.000000000 +0200
+++ new/armadillo-4.300.2/docs.html 2014-05-03 16:56:22.000000000 +0200
@@ -8066,6 +8066,9 @@
uvec q1 = find(A > B);
uvec q2 = find(A > 0.5);
uvec q3 = find(A > 0.5, 3, "last");
+
+// change elements of A greater than 0.5 to 1
+A.elem( find(A > 0.5) ).ones();
</pre>
</ul>
</li>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.300.0/include/armadillo_bits/Mat_bones.hpp
new/armadillo-4.300.2/include/armadillo_bits/Mat_bones.hpp
--- old/armadillo-4.300.0/include/armadillo_bits/Mat_bones.hpp 2013-11-07
01:41:37.000000000 +0100
+++ new/armadillo-4.300.2/include/armadillo_bits/Mat_bones.hpp 2014-05-09
13:26:37.000000000 +0200
@@ -1,5 +1,5 @@
-// Copyright (C) 2008-2013 Conrad Sanderson
-// Copyright (C) 2008-2013 NICTA (www.nicta.com.au)
+// Copyright (C) 2008-2014 Conrad Sanderson
+// Copyright (C) 2008-2014 NICTA (www.nicta.com.au)
// Copyright (C) 2012 Ryan Curtin
//
// This Source Code Form is subject to the terms of the Mozilla Public
@@ -520,6 +520,9 @@
inline void steal_mem(Mat& X); //!< don't use this unless you're writing
code internal to Armadillo
+ inline void steal_mem_col(Mat& X, const uword max_n_rows);
+
+
template<uword fixed_n_rows, uword fixed_n_cols> class fixed;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.300.0/include/armadillo_bits/Mat_meat.hpp
new/armadillo-4.300.2/include/armadillo_bits/Mat_meat.hpp
--- old/armadillo-4.300.0/include/armadillo_bits/Mat_meat.hpp 2014-02-22
16:37:16.000000000 +0100
+++ new/armadillo-4.300.2/include/armadillo_bits/Mat_meat.hpp 2014-05-09
13:26:37.000000000 +0200
@@ -1,5 +1,5 @@
-// Copyright (C) 2008-2013 Conrad Sanderson
-// Copyright (C) 2008-2013 NICTA (www.nicta.com.au)
+// Copyright (C) 2008-2014 Conrad Sanderson
+// Copyright (C) 2008-2014 NICTA (www.nicta.com.au)
// Copyright (C) 2012 Ryan Curtin
//
// This Source Code Form is subject to the terms of the Mozilla Public
@@ -1012,6 +1012,65 @@
}
}
+
+
+template<typename eT>
+inline
+void
+Mat<eT>::steal_mem_col(Mat<eT>& x, const uword max_n_rows)
+ {
+ arma_extra_debug_sigprint();
+
+ const uword x_n_elem = x.n_elem;
+ const uword x_mem_state = x.mem_state;
+
+ const uword t_vec_state = vec_state;
+ const uword t_mem_state = mem_state;
+
+ const uword alt_n_rows = (std::min)(x.n_rows, max_n_rows);
+
+ if((x_n_elem == 0) || (alt_n_rows == 0))
+ {
+ (*this).set_size(0,1);
+
+ return;
+ }
+
+ if( (this != &x) && (t_vec_state <= 1) && (t_mem_state <= 1) && (x_mem_state
<= 1) )
+ {
+ if( (x_mem_state == 0) && ((x_n_elem <= arma_config::mat_prealloc) ||
(alt_n_rows <= arma_config::mat_prealloc)) )
+ {
+ (*this).set_size(alt_n_rows, uword(1));
+
+ arrayops::copy( (*this).memptr(), x.memptr(), alt_n_rows );
+ }
+ else
+ {
+ reset();
+
+ access::rw(n_rows) = alt_n_rows;
+ access::rw(n_cols) = 1;
+ access::rw(n_elem) = alt_n_rows;
+ access::rw(mem_state) = x_mem_state;
+ access::rw(mem) = x.mem;
+
+ access::rw(x.n_rows) = 0;
+ access::rw(x.n_cols) = 0;
+ access::rw(x.n_elem) = 0;
+ access::rw(x.mem_state) = 0;
+ access::rw(x.mem) = 0;
+ }
+ }
+ else
+ {
+ Mat<eT> tmp(alt_n_rows, 1);
+
+ arrayops::copy( tmp.memptr(), x.memptr(), alt_n_rows );
+
+ steal_mem(tmp);
+ }
+ }
+
//! construct a matrix from a given auxiliary array of eTs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.300.0/include/armadillo_bits/arma_version.hpp
new/armadillo-4.300.2/include/armadillo_bits/arma_version.hpp
--- old/armadillo-4.300.0/include/armadillo_bits/arma_version.hpp
2014-05-02 15:29:49.000000000 +0200
+++ new/armadillo-4.300.2/include/armadillo_bits/arma_version.hpp
2014-05-11 15:11:27.000000000 +0200
@@ -13,7 +13,7 @@
#define ARMA_VERSION_MAJOR 4
#define ARMA_VERSION_MINOR 300
-#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_PATCH 2
#define ARMA_VERSION_NAME "Medieval Cornea Scraper"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.300.0/include/armadillo_bits/op_find_meat.hpp
new/armadillo-4.300.2/include/armadillo_bits/op_find_meat.hpp
--- old/armadillo-4.300.0/include/armadillo_bits/op_find_meat.hpp
2014-05-01 06:20:38.000000000 +0200
+++ new/armadillo-4.300.2/include/armadillo_bits/op_find_meat.hpp
2014-05-10 05:22:57.000000000 +0200
@@ -452,22 +452,7 @@
Mat<uword> indices;
const uword n_nz = op_find::helper(indices, X.m);
- if(n_nz > 0)
- {
- if(n_nz == indices.n_elem)
- {
- out.steal_mem(indices);
- }
- else
- {
- out.set_size(n_nz, 1);
- arrayops::copy( out.memptr(), indices.memptr(), n_nz );
- }
- }
- else
- {
- out.set_size(0,1);
- }
+ out.steal_mem_col(indices, n_nz);
}
@@ -517,23 +502,7 @@
}
}
-
- if(count > 0)
- {
- if(count == n_elem)
- {
- out.steal_mem(indices);
- }
- else
- {
- out.set_size(count,1);
- arrayops::copy( out.memptr(), indices.memptr(), count );
- }
- }
- else
- {
- out.set_size(0,1);
- }
+ out.steal_mem_col(indices, count);
}
@@ -579,23 +548,7 @@
}
}
-
- if(count > 0)
- {
- if(count == n_elem)
- {
- out.steal_mem(indices);
- }
- else
- {
- out.set_size(count,1);
- arrayops::copy( out.memptr(), indices.memptr(), count );
- }
- }
- else
- {
- out.set_size(0,1);
- }
+ out.steal_mem_col(indices, count);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
