Hello community,
here is the log from the commit of package armadillo for openSUSE:Factory
checked in at 2013-09-12 14:29: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 2013-08-13
15:36:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2013-09-12
14:29:16.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 11 15:16:31 UTC 2013 - badshah...@gmail.com
+
+- Update to version 3.910.1:
+ + Minor fix for handling of complex matrices by braindead
+ compilers (MSVC).
+
+-------------------------------------------------------------------
Old:
----
armadillo-3.910.0.tar.gz
New:
----
armadillo-3.910.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ armadillo.spec ++++++
--- /var/tmp/diff_new_pack.QrFlKd/_old 2013-09-12 14:29:17.000000000 +0200
+++ /var/tmp/diff_new_pack.QrFlKd/_new 2013-09-12 14:29:17.000000000 +0200
@@ -17,7 +17,7 @@
Name: armadillo
-Version: 3.910.0
+Version: 3.910.1
Release: 0
Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS
License: MPL-2.0
++++++ armadillo-3.910.0.tar.gz -> armadillo-3.910.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-3.910.0/CMakeLists.txt
new/armadillo-3.910.1/CMakeLists.txt
--- old/armadillo-3.910.0/CMakeLists.txt 2013-08-12 09:37:05.000000000
+0200
+++ new/armadillo-3.910.1/CMakeLists.txt 2013-08-19 05:56:03.000000000
+0200
@@ -13,7 +13,7 @@
set(ARMA_MAJOR 3)
set(ARMA_MINOR 910)
-set(ARMA_PATCH 0)
+set(ARMA_PATCH 1)
message(STATUS "Configuring Armadillo
${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-3.910.0/README.txt
new/armadillo-3.910.1/README.txt
--- old/armadillo-3.910.0/README.txt 2013-08-12 09:38:56.000000000 +0200
+++ new/armadillo-3.910.1/README.txt 2013-09-11 05:10:03.000000000 +0200
@@ -1,31 +1,37 @@
+Armadillo C++ Linear Algebra Library
+http://arma.sourceforge.net
+
+
+
=== Contents ===
-1: Introduction
+ 1: Introduction
-2: Citation Details
+ 2: Citation Details
-3: Installation
- 3.0: Preliminaries
- 3.1: Installation on Linux and Mac OS X
- 3.2: Manual Installation / Installation on Windows
+ 3: Installation
+ 3.0: Preliminaries
+ 3.1: Installation on Linux and Mac OS X
+ 3.2: Manual Installation / Installation on Windows
-4: Compiling Programs and Linking
- 4.0: Examples
- 4.1: Compiling & Linking on Linux and Mac OS X
- 4.2: Compiling & Linking on Windows
+ 4: Compiling Programs and Linking
+ 4.0: Examples
+ 4.1: Compiling & Linking on Linux and Mac OS X
+ 4.2: Compiling & Linking on Windows
-5: Support for high-speed BLAS & LAPACK replacements
- 5.0: Support for OpenBLAS, Intel MKL and AMD ACML
- 5.1: Support for ATLAS
+ 5: Support for high-speed BLAS & LAPACK replacements
+ 5.0: Support for OpenBLAS, Intel MKL and AMD ACML
+ 5.1: Support for ATLAS
-6: Documentation / API Reference Manual
+ 6: Documentation / API Reference Manual
-7: FAQs and Bug Reports
+ 7: Bug Reports and Frequently Asked Questions
-8: Developers and Contributors
+ 8: Developers and Contributors
-9: License
+ 9: License
+10: Related Software
@@ -124,8 +130,9 @@
the most important. If you have ATLAS and Boost, it's also necessary
to have the corresponding header files installed.
- For best performance, we recommend using the multi-threaded OpenBLAS
- library instead of standard BLAS. See http://xianyi.github.com/OpenBLAS/
+ For best performance, we recommend using the multi-threaded
+ OpenBLAS library instead of standard BLAS.
+ See http://xianyi.github.com/OpenBLAS/
* Step 3:
Open a shell (command line), change into the directory that was
@@ -251,14 +258,13 @@
=== 4.2: Compiling & Linking on Windows ===
As a courtesy, we've provided pre-compiled 32 bit versions of
-standard LAPACK and BLAS for Windows, as well as MSVC project
-files to compile example1.cpp and example2.cpp.
+standard LAPACK and BLAS libaries for Windows, as well as MSVC
+project files to compile example1.cpp and example2.cpp.
The project files are stored in the following folders:
examples/example1_win32
examples/example2_win32
-The standard 32 bit versions of the LAPACK and BLAS libraries
-are stored in:
+The standard 32 bit versions of LAPACK and BLAS are stored in:
examples/lib_win32
If you're getting messages such as "use of LAPACK needs to be enabled",
@@ -283,11 +289,10 @@
The pre-compiled versions of LAPACK and BLAS were downloaded from:
http://www.fi.muni.cz/~xsvobod2/misc/lapack/
-If the provided libraries don't work for you, or you want more speed,
-try these versions:
+Faster and/or alternative implementations of BLAS and LAPACK are available:
+ http://xianyi.github.com/OpenBLAS/
http://software.intel.com/en-us/intel-mkl/
http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/
- http://xianyi.github.com/OpenBLAS/
http://www.stanford.edu/~vkl/code/libs.html
http://icl.cs.utk.edu/lapack-for-windows/lapack/
@@ -325,10 +330,10 @@
=== 5.0: Support for OpenBLAS, Intel MKL and AMD ACML ===
-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.
+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.
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
@@ -380,8 +385,8 @@
Old versions (eg. 3.6) can produce incorrect results
as well as corrupting memory, leading to random crashes.
-Users of Ubuntu and Debian based systems should explicitly
-check that version 3.6 is not installed. It's better to
+Users of older Ubuntu and Debian based systems should explicitly
+check that ATLAS 3.6 is not installed. It's better to
remove the old version and use the standard LAPACK library.
@@ -400,9 +405,9 @@
-=== 7: FAQs and Bug Reports ===
+=== 7: Bug Reports and Frequently Asked Questions ===
-Answers to Frequently Asked Questions (FAQs) can be found at:
+Answers to frequently asked questions can be found at:
http://arma.sourceforge.net/faq.html
@@ -413,8 +418,8 @@
If you find a bug in the library (or the documentation),
we are interested in hearing about it. Please make a
-_small_ _self-contained_ program which exposes the bug
-and send the program source (as well as the bug description)
+_small_ and _self-contained_ program which exposes the bug,
+and then send the program source (as well as the bug description)
to the developers. The developers' contact details are at:
http://arma.sourceforge.net/contact.html
@@ -502,3 +507,21 @@
See "include/armadillo_bits/fft_engine.hpp" for license details.
+
+=== 10: Related Software ===
+
+* MLPACK: C++ library for machine learning
+ and pattern recognition, built on top of Armadillo.
+ http://mlpack.org
+
+* libpca: C++ library for principal component analysis
+ http://sourceforge.net/projects/libpca/
+
+* KL1p: C++ library for sparse recovery of underdetermined linear systems,
+ such as compressed sensing.
+ http://kl1p.sourceforge.net
+
+* ArmaNpy: interfaces Armadillo matrices with Python
+ http://sourceforge.net/projects/armanpy/
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-3.910.0/docs.html
new/armadillo-3.910.1/docs.html
--- old/armadillo-3.910.0/docs.html 2013-08-12 09:37:05.000000000 +0200
+++ new/armadillo-3.910.1/docs.html 2013-09-08 14:54:42.000000000 +0200
@@ -112,7 +112,7 @@
<td style="text-align: left; vertical-align: top;">
<font size=+2><b>Reference for Armadillo 3.910</b></font>
<br>
- <b>(development version)</b>
+ <b>(Pyrenees)</b>
</td>
<td style="text-align: right; vertical-align: top;">
<b><a href="http://arma.sourceforge.net";>to Armadillo home page</a></b>
@@ -1851,7 +1851,7 @@
<li>For <i>k < 0</i>, the <i>k</i>-th sub-diagonal is accessed (bottom-left
corner)</li>
<br>
<li>
-An extracted diagonal is interpreted as a column vector
+The diagonal is interpreted as a column vector within expressions
</li>
<br>
<li>
@@ -2445,10 +2445,10 @@
Member function of <i>Mat</i>, <i>Col</i>, <i>Row</i>, <i>Cube</i> and
<i>field</i> classes
</li>
<br>
-<li>Returns true if the object has no elements
+<li>Returns <i>true</i> if the object has no elements
</li>
<br>
-<li>Returns false if the object has one or more elements
+<li>Returns <i>false</i> if the object has one or more elements
</li>
<br>
<li>
@@ -4583,7 +4583,7 @@
<td style="vertical-align: top;"> <br>
</td>
<td style="vertical-align: top;">
- returns true if the object has no elements; returns false if the
object has one or more elements
+ returns <i>true</i> if the object has no elements; returns
<i>false</i> if the object has one or more elements
</td>
</tr>
<tr>
@@ -6476,7 +6476,7 @@
<br>
<li>
To obtain the zero norm or Hamming norm (ie. the number of non-zero elements),
-you may want to use this expression: <a
href="#accu">accu</a>(X != 0).
+use this expression: <a href="#accu">accu</a>(X != 0)
</li>
<br>
<li>
@@ -6602,7 +6602,7 @@
<li>For <i>k < 0</i>, the <i>k</i>-th sub-diagonal is extracted
(bottom-left corner)</li>
<br>
<li>
-An extracted a diagonal is interpreted as a column vector
+The extracted diagonal is interpreted as a column vector
</li>
<br>
<li>
@@ -7979,12 +7979,10 @@
<hr class="greyline"><br>
<a name="strans"></a>
-<b>strans(mat)</b>
-<br><b>strans(colvec)</b>
-<br><b>strans(rowvec)</b>
+<b>strans(A)</b>
<ul>
<li>
-Simple matrix transpose, without taking the conjugate of the elements (complex
matrices)
+Simple matrix transpose of <i>A</i>, without taking the conjugate of the
elements (complex matrices)
</li>
<br>
<li>
@@ -8003,35 +8001,28 @@
<a name="trans"></a>
-<b>trans(mat)</b>
-<br><b>trans(colvec)</b>
-<br><b>trans(rowvec)</b>
+<b>trans(A)</b>
<ul>
<li>
-Matrix transpose / Hermitian transpose
+Matrix transpose / Hermitian transpose of <i>A</i>
</li>
<br>
<li>
-If a given object has real elements, a normal transpose is done
+If <i>A</i> has real elements, a normal transpose is done
</li>
<br>
<li>
-If a given object has complex elements, a Hermitian transpose is done (ie. the
conjugate of the elements is taken during the transpose operation)
-</li>
-<br>
-<li>
-<b>Caveat:</b> for complex matrices, the functionality of trans() has changed
in version 2.0:
-<ul>
-<li>in version 1.x, <i>trans()</i> does not take the conjugate of complex
elements</li>
-<li>in version 1.x, the <i>htrans()</i> function is used for the Hermitian
transpose</li>
-</ul>
+If <i>A</i> has complex elements, a Hermitian transpose is done (ie. the
conjugate of the elements is taken during the transpose operation)
</li>
<br>
<li>
Examples:
<ul>
-<pre>mat A = randu<mat>(5,10);
+<pre>
+mat A = randu<mat>(5,10);
+
mat B = trans(A);
+mat C = A.t(); // equivalent to trans(A), but more compact
</pre>
</ul>
</li>
@@ -8946,7 +8937,7 @@
</li>
<br>
<li>
-If the decomposition fails, the output objects are reset and bool set to
<i>false</i> is returned
+If the decomposition fails, the output objects are reset and a bool set to
<i>false</i> is returned
</li>
<br>
<li>
@@ -9176,11 +9167,6 @@
</li>
<br>
<li>
-In previous versions of Armadillo (eg. 2.x), the constants are accessed via
static functions in <i>math</i> and <i>phy</i> classes, eg. <i>math::pi()</i>;
-for compatibility, these classes are still available in version 3.x, but are
not explicitly documented
-</li>
-<br>
-<li>
Meaning of the constants:
<br>
<br>
@@ -9625,7 +9611,7 @@
<b>Caveat:</b>
datum::nan is not equal to anything, even itself;
if you wish to check whether a given number <i>x</i> is finite,
-use <a href="#is_finite_standalone">is_finite</a>(<i>x</i>).
+use <a href="#is_finite_standalone">is_finite</a>(<i>x</i>)
</li>
<br>
<li>
@@ -10713,12 +10699,12 @@
</pre>
</ul>
<li>
-You may also want to have a look at the example programs that come with the
Armadillo archive.
+You may also want to have a look at the example programs that come with the
Armadillo archive
</li>
<br>
<li>
As Armadillo is a template library, we strongly recommended to have
optimisation enabled when compiling programs
-(eg. when compiling with GCC, use the -O1 or -O2 options).
+(eg. when compiling with GCC, use the -O1 or -O2 options)
</li>
</ul>
<br>
@@ -11035,7 +11021,7 @@
</td>
<td style="vertical-align: top;">
-Enable the the ability to <a href="#save_load_mat">save and load</a> matrices
stored in the HDF5 format;
+Enable the ability to <a href="#save_load_mat">save and load</a> matrices
stored in the HDF5 format;
the <i>hdf5.h</i> header file must be available on your system and you will
need to link with the hdf5 library (eg. -lhdf5)
</td>
</tr>
@@ -11372,7 +11358,7 @@
<ul>
<li>faster multiplication of a matrix with a transpose of itself, ie.
<i>X*X.t()</i> and <i>X.t()*X</i></li>
<li><a href="#vectorise">vectorise()</a> for reshaping matrices into
vectors</li>
-<li><a href="#all">all()</a> and <a href="#any">any()</a> for indicating
presence of elements satisfying a relational condtion</li>
+<li><a href="#all">all()</a> and <a href="#any">any()</a> for indicating
presence of elements satisfying a relational condition</li>
</ul>
</li>
<br>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-3.910.0/include/armadillo_bits/arma_ostream_bones.hpp
new/armadillo-3.910.1/include/armadillo_bits/arma_ostream_bones.hpp
--- old/armadillo-3.910.0/include/armadillo_bits/arma_ostream_bones.hpp
2013-08-02 09:05:38.000000000 +0200
+++ new/armadillo-3.910.1/include/armadillo_bits/arma_ostream_bones.hpp
2013-08-25 06:51:34.000000000 +0200
@@ -1,5 +1,5 @@
-// Copyright (C) 2008-2011 Conrad Sanderson
-// Copyright (C) 2008-2011 NICTA (www.nicta.com.au)
+// Copyright (C) 2008-2012 Conrad Sanderson
+// Copyright (C) 2008-2012 NICTA (www.nicta.com.au)
//
// 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
@@ -52,7 +52,7 @@
template<typename eT> inline static void print_dense(std::ostream& o, const
SpMat<eT>& m, const bool modify);
- template<typename eT> inline static void print(std::ostream& o, const
SpMat<eT>& m, const bool modify);
+ template<typename eT> inline static void print(std::ostream& o, const
SpMat<eT>& m, const bool modify);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-3.910.0/include/armadillo_bits/arma_version.hpp
new/armadillo-3.910.1/include/armadillo_bits/arma_version.hpp
--- old/armadillo-3.910.0/include/armadillo_bits/arma_version.hpp
2013-08-12 09:37:05.000000000 +0200
+++ new/armadillo-3.910.1/include/armadillo_bits/arma_version.hpp
2013-08-19 05:56:03.000000000 +0200
@@ -13,7 +13,7 @@
#define ARMA_VERSION_MAJOR 3
#define ARMA_VERSION_MINOR 910
-#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_PATCH 1
#define ARMA_VERSION_NAME "Pyrenees"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-3.910.0/include/armadillo_bits/diskio_meat.hpp
new/armadillo-3.910.1/include/armadillo_bits/diskio_meat.hpp
--- old/armadillo-3.910.0/include/armadillo_bits/diskio_meat.hpp
2013-05-30 03:00:56.000000000 +0200
+++ new/armadillo-3.910.1/include/armadillo_bits/diskio_meat.hpp
2013-08-26 09:58:57.000000000 +0200
@@ -16,7 +16,7 @@
//! Generate the first line of the header used for saving matrices in text
format.
//! Format: "ARMA_MAT_TXT_ABXYZ".
//! A is one of: I (for integral types) or F (for floating point types).
-//! B is one of: U (for unsigned types), S (for signed types), N (for not
appliable) or C (for complex types).
+//! B is one of: U (for unsigned types), S (for signed types), N (for not
applicable) or C (for complex types).
//! XYZ specifies the width of each element in terms of bytes, e.g. "008"
indicates eight bytes.
template<typename eT>
inline
@@ -122,7 +122,7 @@
//! Generate the first line of the header used for saving matrices in binary
format.
//! Format: "ARMA_MAT_BIN_ABXYZ".
//! A is one of: I (for integral types) or F (for floating point types).
-//! B is one of: U (for unsigned types), S (for signed types), N (for not
appliable) or C (for complex types).
+//! B is one of: U (for unsigned types), S (for signed types), N (for not
applicable) or C (for complex types).
//! XYZ specifies the width of each element in terms of bytes, e.g. "008"
indicates eight bytes.
template<typename eT>
inline
@@ -228,7 +228,7 @@
//! Generate the first line of the header used for saving matrices in binary
format.
//! Format: "ARMA_SPM_BIN_ABXYZ".
//! A is one of: I (for integral types) or F (for floating point types).
-//! B is one of: U (for unsigned types), S (for signed types), N (for not
appliable) or C (for complex types).
+//! B is one of: U (for unsigned types), S (for signed types), N (for not
applicable) or C (for complex types).
//! XYZ specifies the width of each element in terms of bytes, e.g. "008"
indicates eight bytes.
template<typename eT>
inline
@@ -333,7 +333,7 @@
//! Generate the first line of the header used for saving cubes in text format.
//! Format: "ARMA_CUB_TXT_ABXYZ".
//! A is one of: I (for integral types) or F (for floating point types).
-//! B is one of: U (for unsigned types), S (for signed types), N (for not
appliable) or C (for complex types).
+//! B is one of: U (for unsigned types), S (for signed types), N (for not
applicable) or C (for complex types).
//! XYZ specifies the width of each element in terms of bytes, e.g. "008"
indicates eight bytes.
template<typename eT>
inline
@@ -439,7 +439,7 @@
//! Generate the first line of the header used for saving cubes in binary
format.
//! Format: "ARMA_CUB_BIN_ABXYZ".
//! A is one of: I (for integral types) or F (for floating point types).
-//! B is one of: U (for unsigned types), S (for signed types), N (for not
appliable) or C (for complex types).
+//! B is one of: U (for unsigned types), S (for signed types), N (for not
applicable) or C (for complex types).
//! XYZ specifies the width of each element in terms of bytes, e.g. "008"
indicates eight bytes.
template<typename eT>
inline
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-3.910.0/include/armadillo_bits/fn_fft.hpp
new/armadillo-3.910.1/include/armadillo_bits/fn_fft.hpp
--- old/armadillo-3.910.0/include/armadillo_bits/fn_fft.hpp 2013-04-05
11:20:41.000000000 +0200
+++ new/armadillo-3.910.1/include/armadillo_bits/fn_fft.hpp 2013-08-25
06:44:00.000000000 +0200
@@ -11,9 +11,8 @@
-// TODO: fft(real) -> complex [to be tested thoroughly]
-// TODO: fft(complex) -> complex [to be tested thoroughly]
-// TODO: ifft(complex) -> complex [to be tested thoroughly]
+// 1D FFT & 1D IFFT
+
template<typename T1>
@@ -118,4 +117,8 @@
+// TODO: 2D FFT & 2D IFFT
+
+
+
//! @}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-3.910.0/include/armadillo_bits/mul_herk.hpp
new/armadillo-3.910.1/include/armadillo_bits/mul_herk.hpp
--- old/armadillo-3.910.0/include/armadillo_bits/mul_herk.hpp 2013-08-12
04:35:47.000000000 +0200
+++ new/armadillo-3.910.1/include/armadillo_bits/mul_herk.hpp 2013-09-11
04:54:07.000000000 +0200
@@ -429,12 +429,13 @@
inline
static
void
- apply( Mat<eT>& C, const TA& A, const eT alpha = eT(1), const eT beta =
eT(0) )
+ apply( Mat<eT>& C, const TA& A, const eT alpha = eT(1), const eT beta =
eT(0), const typename arma_not_cx<eT>::result* junk = 0 )
{
arma_ignore(C);
arma_ignore(A);
arma_ignore(alpha);
arma_ignore(beta);
+ arma_ignore(junk);
// herk() cannot be used by non-complex matrices
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
