Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2012-06-05 12:02:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armadillo (Old) and /work/SRC/openSUSE:Factory/.armadillo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armadillo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2012-05-31 17:02:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2012-06-05 12:02:28.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 31 17:33:30 UTC 2012 - [email protected] + +- Update to version 3.2.2: + + Better detection of ATLAS on Fedora and Red Hat systems + + Minor fix for compiling without debugging enabled (aka release + mode). + +------------------------------------------------------------------- Old: ---- armadillo-3.2.1.tar.gz New: ---- armadillo-3.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.PWddkj/_old 2012-06-05 12:02:32.000000000 +0200 +++ /var/tmp/diff_new_pack.PWddkj/_new 2012-06-05 12:02:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: armadillo -Version: 3.2.1 +Version: 3.2.2 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: LGPL-3.0+ ++++++ armadillo-3.2.1.tar.gz -> armadillo-3.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.1/CMakeLists.txt new/armadillo-3.2.2/CMakeLists.txt --- old/armadillo-3.2.1/CMakeLists.txt 2012-05-25 08:27:22.000000000 +0200 +++ new/armadillo-3.2.2/CMakeLists.txt 2012-06-01 08:20:52.000000000 +0200 @@ -16,7 +16,7 @@ set(ARMA_MAJOR 3) set(ARMA_MINOR 2) -set(ARMA_PATCH 1) +set(ARMA_PATCH 2) message(STATUS "Configuring Armadillo ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.1/build_aux/cmake/Modules/ARMA_FindCBLAS.cmake new/armadillo-3.2.2/build_aux/cmake/Modules/ARMA_FindCBLAS.cmake --- old/armadillo-3.2.1/build_aux/cmake/Modules/ARMA_FindCBLAS.cmake 2010-06-28 03:51:58.000000000 +0200 +++ new/armadillo-3.2.2/build_aux/cmake/Modules/ARMA_FindCBLAS.cmake 2012-05-28 15:53:45.000000000 +0200 @@ -16,7 +16,7 @@ SET(CBLAS_NAMES ${CBLAS_NAMES} cblas) FIND_LIBRARY(CBLAS_LIBRARY NAMES ${CBLAS_NAMES} - PATHS /usr/lib64/atlas /usr/lib/atlas /usr/local/lib64/atlas /usr/local/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib + PATHS /usr/lib64/atlas-sse3 /usr/lib64/atlas /usr/lib64 /usr/local/lib64/atlas /usr/local/lib64 /usr/lib/atlas-sse3 /usr/lib/atlas-sse2 /usr/lib/atlas-sse /usr/lib/atlas-3dnow /usr/lib/atlas /usr/lib /usr/local/lib/atlas /usr/local/lib ) IF (CBLAS_LIBRARY AND CBLAS_INCLUDE_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.1/build_aux/cmake/Modules/ARMA_FindCLAPACK.cmake new/armadillo-3.2.2/build_aux/cmake/Modules/ARMA_FindCLAPACK.cmake --- old/armadillo-3.2.1/build_aux/cmake/Modules/ARMA_FindCLAPACK.cmake 2010-06-28 03:51:58.000000000 +0200 +++ new/armadillo-3.2.2/build_aux/cmake/Modules/ARMA_FindCLAPACK.cmake 2012-05-28 15:53:45.000000000 +0200 @@ -17,7 +17,7 @@ SET(CLAPACK_NAMES ${CLAPACK_NAMES} clapack) FIND_LIBRARY(CLAPACK_LIBRARY NAMES ${CLAPACK_NAMES} - PATHS /usr/lib64/atlas /usr/lib/atlas /usr/local/lib64/atlas /usr/local/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib + PATHS /usr/lib64/atlas-sse3 /usr/lib64/atlas /usr/lib64 /usr/local/lib64/atlas /usr/local/lib64 /usr/lib/atlas-sse3 /usr/lib/atlas-sse2 /usr/lib/atlas-sse /usr/lib/atlas-3dnow /usr/lib/atlas /usr/lib /usr/local/lib/atlas /usr/local/lib ) IF (CLAPACK_LIBRARY AND CLAPACK_INCLUDE_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.1/docs/index.html new/armadillo-3.2.2/docs/index.html --- old/armadillo-3.2.1/docs/index.html 2012-05-25 05:34:16.000000000 +0200 +++ new/armadillo-3.2.2/docs/index.html 2012-06-01 08:08:51.000000000 +0200 @@ -113,6 +113,7 @@ <a href="#diag">diag</a> · <a href="#element_access">element access</a> · <a href="#element_initialisation">element initialisation</a> · +<a href="#eval_member">eval</a> · <a href="#eye_member">eye</a> · <a href="#fill">fill</a> · <a href="#i_member">i (inverse)</a> · @@ -292,68 +293,68 @@ <tbody> <tr> <td style="vertical-align: top;"> - umat + mat </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Mat<<a href="#uword">uword</a>> + Mat<double> </td> </tr> <tr> <td style="vertical-align: top;"> - imat + fmat </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Mat<<a href="#uword">sword</a>> + Mat<float> </td> </tr> <tr> <td style="vertical-align: top;"> - fmat + cx_mat </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Mat<float> + Mat<<a href="#cx_float_double">cx_double</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - mat + cx_fmat </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Mat<double> + Mat<<a href="#cx_float_double">cx_float</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - cx_fmat + umat </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Mat<<a href="#cx_float_double">cx_float</a>> + Mat<<a href="#uword">uword</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - cx_mat + imat </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Mat<<a href="#cx_float_double">cx_double</a>> + Mat<<a href="#uword">sword</a>> </td> </tr> </tbody> @@ -507,21 +508,13 @@ As such, the code below <b>will not</b> generate a 5x5 matrix with every element equal to 123.0: <ul> <pre> -mat A(5,5); -A = 123.0; +mat A(5,5); A = 123.0; </pre> </ul> Use the following code instead: <ul> <pre> -mat A(5,5); -A.fill(123.0); -</pre> -</ul> -Or: -<ul> -<pre> -mat A = 123.0 * ones<mat>(5,5); +mat A(5,5); A.fill(123.0); </pre> </ul> <br> @@ -536,6 +529,7 @@ <li><a href="#save_load_mat">saving & loading matrices</a></li> <li><a href="#print">printing matrices</a></li> <li><a href="#iterators_mat">STL-style element iterators</a></li> +<li><a href="#eval_member">.eval()</a></li> <li><a href="#conv_to">conv_to()</a> (convert between matrix types)</li> <li><a href="http://www.cplusplus.com/doc/tutorial/other_data_types/";>explanation of <i>typedef</i></a> (cplusplus.com) <li><a href="#Col">Col class</a></li> @@ -568,68 +562,68 @@ <tbody> <tr> <td style="vertical-align: top;"> - uvec, ucolvec + vec, colvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Col<<a href="#uword">uword</a>> + Col<double> </td> </tr> <tr> <td style="vertical-align: top;"> - ivec, icolvec + fvec, fcolvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Col<<a href="#uword">sword</a>> + Col<float> </td> </tr> <tr> <td style="vertical-align: top;"> - fvec, fcolvec + cx_vec, cx_colvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Col<float> + Col<<a href="#cx_float_double">cx_double</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - vec, colvec + cx_fvec, cx_fcolvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Col<double> + Col<<a href="#cx_float_double">cx_float</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - cx_fvec, cx_fcolvec + uvec, ucolvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Col<<a href="#cx_float_double">cx_float</a>> + Col<<a href="#uword">uword</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - cx_vec, cx_colvec + ivec, icolvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Col<<a href="#cx_float_double">cx_double</a>> + Col<<a href="#uword">sword</a>> </td> </tr> </tbody> @@ -747,21 +741,13 @@ As such, the code below <b>will not</b> generate a column vector with every element equal to 123.0: <ul> <pre> -vec q(5); -q = 123.0; +vec a(5); a = 123.0; </pre> </ul> Use the following code instead: <ul> <pre> -vec q(5); -q.fill(123.0); -</pre> -</ul> -Or: -<ul> -<pre> -vec q = 123.0 * ones<vec>(5,1); +vec a(5); a.fill(123.0); </pre> </ul> </li> @@ -795,68 +781,68 @@ <tbody> <tr> <td style="vertical-align: top;"> - urowvec + rowvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Row<<a href="#uword">uword</a>> + Row<double> </td> </tr> <tr> <td style="vertical-align: top;"> - irowvec + frowvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Row<<a href="#uword">sword</a>> + Row<float> </td> </tr> <tr> <td style="vertical-align: top;"> - frowvec + cx_rowvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Row<float> + Row<<a href="#cx_float_double">cx_double</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - rowvec + cx_frowvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Row<double> + Row<<a href="#cx_float_double">cx_float</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - cx_frowvec + urowvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Row<<a href="#cx_float_double">cx_float</a>> + Row<<a href="#uword">uword</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - cx_rowvec + irowvec </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Row<<a href="#cx_float_double">cx_double</a>> + Row<<a href="#uword">sword</a>> </td> </tr> </tbody> @@ -971,21 +957,13 @@ As such, the code below <b>will not</b> generate a row vector with every element equal to 123.0: <ul> <pre> -rowvec r(5); -r = 123.0; +rowvec r(5); r = 123.0; </pre> </ul> Use the following code instead: <ul> <pre> -rowvec r(5); -r.fill(123.0); -</pre> -</ul> -Or: -<ul> -<pre> -rowvec r = 123.0 * ones<rowvec>(1,5); +rowvec r(5); r.fill(123.0); </pre> </ul> <br> @@ -1006,7 +984,7 @@ <br><b>cx_cube</b> <ul> <li> -Classes for cubes, also known as "3D matrices" +Classes for cubes, also known as "3D matrices" or 3rd order tensors </li> <br> <li> @@ -1021,68 +999,68 @@ <tbody> <tr> <td style="vertical-align: top;"> - ucube + cube </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Cube<<a href="#uword">uword</a>> + Cube<double> </td> </tr> <tr> <td style="vertical-align: top;"> - icube + fcube </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Cube<<a href="#uword">sword</a>> + Cube<float> </td> </tr> <tr> <td style="vertical-align: top;"> - fcube + cx_cube </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Cube<float> + Cube<<a href="#cx_float_double">cx_double</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - cube + cx_fcube </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Cube<double> + Cube<<a href="#cx_float_double">cx_float</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - cx_fcube + ucube </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Cube<<a href="#cx_float_double">cx_float</a>> + Cube<<a href="#uword">uword</a>> </td> </tr> <tr> <td style="vertical-align: top;"> - cx_cube + icube </td> <td style="vertical-align: top;"> = </td> <td style="vertical-align: top;"> - Cube<<a href="#cx_float_double">cx_double</a>> + Cube<<a href="#uword">sword</a>> </td> </tr> </tbody> @@ -1209,26 +1187,17 @@ As such, the code below <b>will not</b> generate a cube with every element equal to 123.0: <ul> <pre> -cube c(5,6,7); -c = 123.0; +cube c(5,6,7); c = 123.0; </pre> </ul> Use the following code instead: <ul> <pre> -cube c(5,6,7); -c.fill(123.0); -</pre> -</ul> -Or: -<ul> -<pre> -cube c = 123.0 * ones<cube>(5,6,7); +cube c(5,6,7); c.fill(123.0); </pre> </ul> -</li> -</ul> <br> +</ul> <li> See also: <ul> @@ -1446,7 +1415,8 @@ See also: <ul> <li><a href="#memptr">.memptr()</a></li> -<li><a href="#submat">submatrix access</a></li> +<li><a href="#submat">submatrix views</a></li> +<li><a href="#element_access">element access</a></li> <li><a href="#iterators_mat">iterators (matrices)</a></li> <li><a href="#adv_constructors_mat">advanced constructors (matrices)</a></li> </ul> @@ -1571,7 +1541,7 @@ For <i>mat</i>, <i>cube</i> and <i>field</i>, access the <i>n</i>-th element/object under the assumption of a flat layout, with column-major ordering of data (ie. column by column). A <i>std::logic_error</i> exception is thrown if the requested element is out of bounds. -The bounds check can be optionally disabled at compile-time (see below) to get more speed. +The bounds check can be <a href="#element_access_bounds_check_note">optionally disabled</a> at compile-time to get more speed. </td> </tr> <tr> @@ -1604,7 +1574,7 @@ <td style="vertical-align: top;"> For <i>mat</i> and <i>field</i> classes, access the element/object stored at the <i>i</i>-th row and <i>j</i>-th column. A <i>std::logic_error</i> exception is thrown if the requested element is out of bounds. -The bounds check can be optionally disabled at compile-time (see below) to get more speed. +The bounds check can be <a href="#element_access_bounds_check_note">optionally disabled</a> at compile-time to get more speed. </td> </tr> <tr> @@ -1639,7 +1609,7 @@ <td style="vertical-align: top;"> Cube only: access the element stored at the <i>i</i>-th row, <i>j</i>-th column and <i>k</i>-th slice. A <i>std::logic_error</i> exception is thrown if the requested element is out of bounds. -The bounds check can be optionally disabled at compile-time (see below) to get more speed. +The bounds check can be <a href="#element_access_bounds_check_note">optionally disabled</a> at compile-time to get more speed. </td> </tr> <tr> @@ -1662,6 +1632,7 @@ </ul> </li> <br> +<a name="element_access_bounds_check_note"></a> <li> The bounds checks used by the <i>(n)</i>, <i>(i,j)</i> and <i>(i,j,k)</i> access forms can be disabled by defining <a href="#config_hpp_arma_no_debug"><i>ARMA_NO_DEBUG</i></a> or <i>NDEBUG</i> macros @@ -1689,8 +1660,12 @@ <li>See also: <ul> <li><a href="#in_range">.in_range()</a></li> +<li><a href="#element_initialisation">element initialisation</a></li> +<li><a href="#submat">submatrix views</a></li> +<li><a href="#memptr">.memptr()</a></li> <li><a href="#iterators_mat">iterators (matrices)</a></li> <li><a href="#iterators_cube">iterators (cubes)</a></li> +<li><a href="#config_hpp">config.hpp</a></li> </ul> </li> <br> @@ -1746,6 +1721,47 @@ </ul> <hr class="greyline"><br> +<a name="eval_member"></a> +<b>.eval()</b> +<br> +<ul> +<li> +Member function of any matrix or vector expression +</li> +<br> +<li> +Explicitly forces the evaluation of a delayed expression and outputs a matrix +</li> +<br> +<li> +This function should be used sparingly and only in cases where it is absolutely necessary; indiscriminate use can cause slow downs +</li> +<br> +<li> +This function was added in version 3.2 +</li> +<br> +<li> +Examples: +<ul> +<pre> +cx_mat A( randu<mat>(4,4), randu<mat>(4,4) ); + +real(A).eval().save("A_real.dat", raw_ascii); +imag(A).eval().save("A_imag.dat", raw_ascii); +</pre> +</ul> +</li> +<br> +<li>See also: +<ul> +<li><a href="#Mat">Mat class</a></li> +</ul> +</li> +<br> +</ul> +<hr class="greyline"><br> + <a name="eye_member"></a> <b>.eye()</b> <br> @@ -2564,6 +2580,9 @@ <li><a href="#stl_container_fns">STL container functions</a></li> <li><a href="http://cplusplus.com/reference/std/iterator/";>iterator at cplusplus.com</a></li> <li><a href="#element_access">element access</a></li> +<li><a href="#memptr">.memptr()</a></li> +<li><a href="#colptr">.colptr()</a></li> +<li><a href="#submat">submatrix views</a></li> </ul> </li> <br> @@ -2804,6 +2823,7 @@ See also: <ul> <li><a href="#colptr">.colptr()</a></li> +<li><a href="#element_access">element_access</a></li> <li><a href="#iterators_mat">iterators (matrices)</a></li> <li><a href="#iterators_cube">iterators (cubes)</a></li> <li><a href="#adv_constructors_mat">advanced constructors (matrices)</a></li> @@ -10269,6 +10289,7 @@ <li>Added in 3.2: <ul> <li><a href="#unique">unique()</a>, for finding unique elements of a matrix</li> +<li><a href="#eval_member">.eval()</a>, for forcing the evaluation of delayed expressions</li> <li>faster <a href="#eig_sym">eigen decomposition</a> via "divide and conquer" algorithm</li> <li>faster <a href="#t_st_members">transpose</a> of vectors and compound expressions</li> <li>faster handling of <a href="#diag">diagonal views</a></li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.1/include/armadillo_bits/arma_version.hpp new/armadillo-3.2.2/include/armadillo_bits/arma_version.hpp --- old/armadillo-3.2.1/include/armadillo_bits/arma_version.hpp 2012-05-25 08:27:22.000000000 +0200 +++ new/armadillo-3.2.2/include/armadillo_bits/arma_version.hpp 2012-06-01 08:20:52.000000000 +0200 @@ -18,7 +18,7 @@ #define ARMA_VERSION_MAJOR 3 #define ARMA_VERSION_MINOR 2 -#define ARMA_VERSION_PATCH 1 +#define ARMA_VERSION_PATCH 2 #define ARMA_VERSION_NAME "Creamfields" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
