Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2021-08-12 09:01:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armadillo (Old) and /work/SRC/openSUSE:Factory/.armadillo.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armadillo" Thu Aug 12 09:01:37 2021 rev:153 rq:911481 version:10.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2021-07-31 18:52:25.502456242 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new.1899/armadillo.changes 2021-08-12 09:02:31.426069515 +0200 @@ -1,0 +2,6 @@ +Sat Aug 7 15:56:45 UTC 2021 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 10.6.2: + * No documented changes. + +------------------------------------------------------------------- Old: ---- armadillo-10.6.1.tar.xz New: ---- armadillo-10.6.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.dJ34CK/_old 2021-08-12 09:02:31.898068777 +0200 +++ /var/tmp/diff_new_pack.dJ34CK/_new 2021-08-12 09:02:31.902068771 +0200 @@ -18,7 +18,7 @@ %define soname libarmadillo10 Name: armadillo -Version: 10.6.1 +Version: 10.6.2 Release: 0 Summary: C++ matrix library with interfaces to LAPACK and ATLAS License: Apache-2.0 ++++++ armadillo-10.6.1.tar.xz -> armadillo-10.6.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/README.md new/armadillo-10.6.2/README.md --- old/armadillo-10.6.1/README.md 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/README.md 2016-06-16 18:23:12.000000000 +0200 @@ -21,7 +21,7 @@ 2. [Citation Details](#2-citation-details) 3. [Distribution License](#3-distribution-license) -4. [Compilers and External Dependencies](#4-compilers-and-external-dependencies) +4. [Prerequisites](#4-prerequisites) 5. [Linux and macOS: Installation](#5-linux-and-macos-installation) 6. [Linux and macOS: Compiling and Linking](#6-linux-and-macos-compiling-and-linking) @@ -33,7 +33,7 @@ 10. [Support for ATLAS](#10-support-for-atlas) 11. [Support for OpenMP](#11-support-for-openmp) -12. [Documentation](#12-documentation) +12. [Documentation of Functions and Classes](#12-documentation-of-functions-and-classes) 13. [API Stability and Versioning](#13-api-stability-and-versioning) 14. [Bug Reports and Frequently Asked Questions](#14-bug-reports-and-frequently-asked-questions) @@ -102,147 +102,162 @@ --- -### 4: Compilers and External Dependencies +### 4: Prerequisites Armadillo 10.x requires a C++ compiler that supports at least the C++11 standard. Use Armadillo 9.900 if your compiler only supports the old C++98/C++03 standards. +On Linux-based systems, install the GCC C++ compiler, which is available as pre-built package. +The package name might be `g++` or `gcc-c++` depending on your system. + +On macOS systems, a C++ compiler can be obtained by first installing Xcode (version 8 or later) +and then running the following command in a terminal window: + + xcode-select --install + +On Windows systems, the MinGW toolset or Visual Studio C++ 2019 (MSVC) can be used. + The functionality of Armadillo is partly dependent on other libraries: -LAPACK, BLAS (preferably OpenBLAS), ARPACK and SuperLU. -LAPACK and BLAS are used for dense matrices, -while ARPACK and SuperLU are used for sparse matrices. +OpenBLAS (or standard BLAS) and LAPACK (for dense matrices), +as well as ARPACK and SuperLU (for sparse matrices). +Caveat: only SuperLU versions 5.2.x can be used. +On macOS, the Accelerate framework can be used for BLAS and LAPACK functions. Armadillo can work without the above libraries, but its functionality will be reduced. Basic functionality will be available (eg. matrix addition and multiplication), -but operations like eigen decomposition or matrix inversion will not be. -Matrix multiplication (mainly for big matrices) may not be as fast. - -As Armadillo is a template library, we recommended that optimisation -is enabled during compilation of programs that use Armadillo. -For example, for GCC and Clang compilers use -O2 or -O3 +but operations such as eigen decomposition and system solvers will not be. +Matrix multiplication may not be as fast (mainly for large matrices). --- ### 5: Linux and macOS: Installation -* Step 1: - Ensure a C++ compiler is installed on your system. +Armadillo can be installed in several ways: either manually or via cmake, with or without root access. +The cmake based installation is preferred. +The cmake tool can be downloaded from http://www.cmake.org +or (preferably) installed using the package manager on your system; +on macOS systems, cmake can be installed through MacPorts or Homebrew. + +Before installing Armadillo, first install OpenBLAS and LAPACK, and optionally ARPACK and SuperLU. +It is also necessary to install the corresponding development files for each library. +For example, when installing the `libopenblas` package, also install the `libopenblas-dev` package. + + +#### 5a: Installation via CMake + +The cmake based installer detects which relevant libraries +are installed on your system (eg. OpenBLAS, LAPACK, SuperLU, ARPACK, etc) +and correspondingly modifies Armadillo's configuration. +The installer also generates the Armadillo runtime library, +which is a wrapper for all the detected libraries, +and provides a thread-safe random number generator. - - On macOS systems install Xcode (version 8 or later) - and then type the following command in a terminal window: +Change into the directory that was created by unpacking the armadillo archive +(eg. `cd armadillo-10.6.1`) and then run cmake using: - xcode-select --install + cmake . -* Step 2: - Ensure the CMake tool is installed on your system. +**NOTE:** the full stop (.) separated from `cmake` by a space is important. - - Cmake can be downloaded from http://www.cmake.org - or (preferably) installed using the package manager on your system. +On macOS, to enable the detection of OpenBLAS, +use the additional `ALLOW_OPENBLAS_MACOS` option when running cmake: - - On Linux-based systems, CMake can be installed using dnf, yum, apt, aptitude, ... + cmake -DALLOW_OPENBLAS_MACOS=ON . - - On macOS systems, CMake can be installed through MacPorts or Homebrew. +Depending on your installation, OpenBLAS may masquerade as standard BLAS. +To detect standard BLAS and LAPACK, use the `ALLOW_BLAS_LAPACK_MACOS` option: -* Step 3: - Ensure that OpenBLAS (or standard BLAS and LAPACK) is installed on your system. - On macOS, the Accelerate framework can be used for BLAS/LAPACK. + cmake -DALLOW_BLAS_LAPACK_MACOS=ON . - - On macOS, optionally install OpenBLAS for better performance. +By default, cmake assumes that the Armadillo runtime library and the corresponding header files +will be installed in the default system directory (eg. in the `/usr` hierarchy in Linux-based systems). +To install the library and headers in an alternative directory, +use the additional option `CMAKE_INSTALL_PREFIX` in this form: - - If support for sparse matrices is required, also install ARPACK and SuperLU. - Caveat: only SuperLU version 5.2 can be used! + cmake . -DCMAKE_INSTALL_PREFIX:PATH=alternative_directory - - On Linux-based systems, the following libraries are recommended - to be present: OpenBLAS, LAPACK, SuperLU and ARPACK. - It is also necessary to install the corresponding development files for each library. - For example, when installing the "libopenblas" package, also install the "libopenblas-dev" package. - -* Step 4: - Run the cmake installer. +If cmake needs to be re-run, it's a good idea to first delete the `CMakeCache.txt` file +(not `CMakeLists.txt`). - - Open a terminal window and change into the directory that was created - by unpacking the armadillo archive. - - - The simplest case is to run cmake using: +**Caveat:** if Armadillo is installed in a non-system directory, +make sure that the C++ compiler is configured to use the `lib` and `include` +sub-directories present within this directory. +Note that the `lib` directory might be named differently on your system. +On recent 64 bit Debian & Ubuntu systems it is `lib/x86_64-linux-gnu`. +On recent 64 bit Fedora & RHEL systems it is `lib64`. - cmake . +If you have sudo access (ie. root/administrator/superuser privileges) +and didn't use the `CMAKE_INSTALL_PREFIX` option, run the following command: - - NOTE: the full stop separated from "cmake" by a space is important. - - - Options to the cmake installer: - - - On macOS, to enable the detection of OpenBLAS, - use the additional ALLOW_OPENBLAS_MACOS option when running cmake: + sudo make install + +If you don't have sudo access, make sure to use the `CMAKE_INSTALL_PREFIX` option +and run the following command: - cmake -DALLOW_OPENBLAS_MACOS=ON . + make install - Note: depending on your installation, OpenBLAS may masquerade as standard BLAS. - To detect standard BLAS and LAPACK, use the ALLOW_BLAS_LAPACK_MACOS option: - cmake -DALLOW_BLAS_LAPACK_MACOS=ON . - - - By default, cmake assumes that the Armadillo library and the - corresponding header files will be installed in the default - system directory (eg. in the /usr hierarchy in Linux-based systems). - To install the library and headers in an alternative directory, - use the additional option CMAKE_INSTALL_PREFIX in this form: - - cmake . -DCMAKE_INSTALL_PREFIX:PATH=alternative_directory - - - CMake will detect which relevant libraries are installed on your system - (eg. OpenBLAS, LAPACK, SuperLU, ARPACK, etc) - and will modify Armadillo's configuration correspondingly. - CMake will also generate the Armadillo run-time library, - which is a wrapper for all the detected libraries. - - - If cmake needs to re-run, it's a good idea to first delete the - "CMakeCache.txt" file (not "CMakeLists.txt"). - - - Caveat: if Armadillo is installed in a non-system directory, - make sure that the C++ compiler is configured to use the "lib" and "include" - sub-directories present within this directory. Note that the "lib" - directory might be named differently on your system. - On recent 64 bit Debian & Ubuntu systems it is "lib/x86_64-linux-gnu". - On recent 64 bit Fedora & RHEL systems it is "lib64". - -* Step 5: - If you and have access to root/administrator/superuser privileges - (ie. able to use "sudo") and didn't use the CMAKE_INSTALL_PREFIX option, - type the following command: +#### 5b: Manual Installation - sudo make install +Manual installation involves simply copying the `include/armadillo` header +**and** the associated `include/armadillo_bits` directory to a location +such as `/usr/include/` which is searched by your C++ compiler. +If you don't have sudo access or don't have write access to `/usr/include/`, +use a directory within your own home directory (eg. `/home/blah/include/`). + +If required, modify `include/armadillo_bits/config.hpp` +to indicate which libraries are currently available on your system. +Comment or uncomment the following lines: - If you don't have root/administrator/superuser privileges, - make sure that you use the CMAKE_INSTALL_PREFIX option in Step 4, - and type the following command: + #define ARMA_USE_LAPACK + #define ARMA_USE_BLAS + #define ARMA_USE_ARPACK + #define ARMA_USE_SUPERLU - make install +If support for sparse matrices is not needed, ARPACK and SuperLU are not necessary. + +Note that the manual installation will not generate the Armadillo runtime library, +and hence you will need to link your programs directly with OpenBLAS, LAPACK, etc. --- ### 6: Linux and macOS: Compiling and Linking -If you have installed Armadillo via the CMake installer, -use the following command: +If you have installed Armadillo via the cmake installer, +use the following command to compile your programs: - g++ prog.cpp -o prog -std=c++11 -O2 -larmadillo + g++ prog.cpp -o prog -O2 -std=c++11 -larmadillo -Otherwise, if you want to use Armadillo without installation -(ie. without the Armadillo runtime library), use the following command: - - g++ prog.cpp -o prog -std=c++11 -O2 -I /home/blah/armadillo-7.200.3/include -DARMA_DONT_USE_WRAPPER -lopenblas +If you have installed Armadillo manually, link with OpenBLAS and LAPACK +instead of the Armadillo runtime library: -The above command assumes that the armadillo archive was unpacked into /home/blah/ -The command needs to be adjusted if the archive was unpacked into a different directory -and/or for each specific version of Armadillo (ie. "7.200.3" needs to be changed). - -If you don't have OpenBLAS, on Linux change -lopenblas to -lblas -llapack -and on macOS change -lopenblas to -framework Accelerate + g++ prog.cpp -o prog -O2 -std=c++11 -lopenblas -llapack -See the Questions page for more info on linking: -http://arma.sourceforge.net/faq.html +If you have manually installed Armadillo in a non-standard location, +such as `/home/blah/include/`, you will need to make sure +that your C++ compiler searches `/home/blah/include/` +by explicitly specifying the directory as an argument/option. +For example, using the `-I` switch in GCC and Clang: + + g++ prog.cpp -o prog -O2 -std=c++11 -I /home/blah/include/ -lopenblas -llapack + +If you're getting linking issues (unresolved symbols), +enable the `ARMA_DONT_USE_WRAPPER` option: + + g++ prog.cpp -o prog -O2 -std=c++11 -I /home/blah/include/ -DARMA_DONT_USE_WRAPPER -lopenblas -llapack -The "examples" directory contains a short example program that uses the Armadillo library. +If you don't have OpenBLAS, on Linux change `-lopenblas` to `-lblas`; +on macOS change `-lopenblas -llapack` to `-framework Accelerate` + +The `examples` directory contains a short example program that uses Armadillo. + +We recommend that compilation is done with optimisation enabled, +in order to make best use of the extensive template meta-programming +techniques employed in Armadillo. +For GCC and Clang compilers use `-O2` or `-O3` to enable optimisation. + +For more information on compiling and linking, see the Questions page: +http://arma.sourceforge.net/faq.html --- @@ -251,50 +266,50 @@ The installation is comprised of 3 steps: * Step 1: - Copy the entire "include" folder to a convenient location + Copy the entire `include` folder to a convenient location and tell your compiler to use that location for header files (in addition to the locations it uses already). - Alternatively, the "include" folder can be used directly. + Alternatively, the `include` folder can be used directly. * Step 2: - Modify "include/armadillo_bits/config.hpp" to indicate which - libraries are currently available on your system. For example, - if LAPACK, BLAS (or OpenBLAS), ARPACK and SuperLU present, - uncomment the following lines: + If required, modify `include/armadillo_bits/config.hpp` + to indicate which libraries are currently available on your system: #define ARMA_USE_LAPACK #define ARMA_USE_BLAS #define ARMA_USE_ARPACK #define ARMA_USE_SUPERLU - If support for sparse matrices is not required, - don't worry about ARPACK or SuperLU. + If support for sparse matrices is not needed, ARPACK or SuperLU are not necessary. * Step 3: Configure your compiler to link with LAPACK and BLAS (and optionally ARPACK and SuperLU). + Note that OpenBLAS can be used as a high-performance substitute + for both LAPACK and BLAS. --- ### 8: Windows: Compiling and Linking -Within the "examples" folder, there is an MSVC project named "example1_win64" -which can be used to compile "example1.cpp". The project needs to be compiled as a -64 bit program: the active solution platform must be set to x64, instead of win32. +Within the `examples` folder, the MSVC project named `example1_win64` +can be used to compile `example1.cpp`. +The project needs to be compiled as a 64 bit program: +the active solution platform must be set to x64, instead of win32. The MSVC project was tested on Windows 10 (64 bit) with Visual Studio C++ 2019. -Adaptations may need to be made for 32 bit systems, later versions of Windows -and/or the compiler. For example, options such as ARMA_BLAS_LONG and ARMA_BLAS_UNDERSCORE, -defined in "armadillo_bits/config.hpp", may need to be either enabled or disabled. - -The folder "examples/lib_win64" contains a copy of lib and dll files -obtained from a pre-compiled release of OpenBLAS 0.3.10: -https://github.com/xianyi/OpenBLAS/releases/download/v0.3.10/OpenBLAS-0.3.10-x64.zip +Adaptations may be required for 32 bit systems, later versions of Windows and/or the compiler. +For example, options such as `ARMA_BLAS_LONG` and `ARMA_BLAS_UNDERSCORE`, +defined in `include/armadillo_bits/config.hpp`, may need to be either enabled or disabled. + +The folder `examples/lib_win64` contains a copy of lib and dll files +obtained from a pre-compiled release of OpenBLAS: +https://github.com/xianyi/OpenBLAS/releases/ The compilation was done by a third party. USE AT YOUR OWN RISK. **Caveat:** for any high performance scientific/engineering workloads, -we strongly recommend using a Linux based operating system: +we strongly recommend using a Linux-based operating system: * Fedora http://fedoraproject.org/ * Ubuntu http://www.ubuntu.com/ * CentOS http://centos.org/ @@ -307,7 +322,7 @@ replacements for BLAS and LAPACK. In essence this involves linking with the replacement libraries instead of BLAS and LAPACK. -Minor modifications to include/armadillo_bits/config.hpp may be required +Minor modifications to `include/armadillo_bits/config.hpp` may be required to ensure Armadillo uses the same integer sizes and style of function names as used by the replacement libraries. Specifically, the following defines may need to be enabled or disabled: @@ -320,25 +335,26 @@ See the documentation for more information on the above defines. -On Linux-based systems, MKL might be installed in a non-standard location -such as /opt which can cause problems during linking. Before installing -Armadillo, the system should know where the MKL libraries are located. -For example, /opt/intel/mkl/lib/intel64/. This can be achieved by setting -the LD_LIBRARY_PATH environment variable, or for a more permanent solution, -adding the directory locations to /etc/ld.so.conf. It may also be possible -to store a text file with the locations in the /etc/ld.so.conf.d directory. -For example, /etc/ld.so.conf.d/mkl.conf. If /etc/ld.so.conf is modified -or /etc/ld.so.conf.d/mkl.conf is created, /sbin/ldconfig must be run afterwards. +On Linux-based systems, MKL might be installed in a non-standard location such as `/opt` +which can cause problems during linking. +Before installing Armadillo, the system should know where the MKL libraries are located. +For example, `/opt/intel/mkl/lib/intel64/`. +This can be achieved by setting the `LD_LIBRARY_PATH` environment variable, +or for a more permanent solution, adding the directory locations to `/etc/ld.so.conf`. +It may also be possible to store a text file with the locations +in the `/etc/ld.so.conf.d` directory. For example, `/etc/ld.so.conf.d/mkl.conf`. +If `/etc/ld.so.conf` is modified or `/etc/ld.so.conf.d/mkl.conf` is created, +`/sbin/ldconfig` must be run afterwards. -Below is an example of /etc/ld.so.conf.d/mkl.conf -where Intel MKL is installed in /opt/intel +Below is an example of `/etc/ld.so.conf.d/mkl.conf` +where Intel MKL is installed in `/opt/intel` /opt/intel/lib/intel64 /opt/intel/mkl/lib/intel64 If MKL is installed and it is persistently giving problems during linking, Support for MKL can be disabled by editing the CMakeLists.txt file, -deleting CMakeCache.txt and re-running the CMake based installation. +deleting CMakeCache.txt and re-running the cmake based installation. Comment out the line containing: INCLUDE(ARMA_FindMKL) @@ -347,13 +363,10 @@ ### 10: Support for ATLAS -Armadillo can use the ATLAS library for faster versions of a subset -of LAPACK and BLAS functions. LAPACK should still be installed to -obtain full functionality. - -Caveat: the minimum recommended version of ATLAS is 3.10; -earlier versions (such as 3.6 and 3.8) can produce incorrect -results and/or corrupt memory, leading to random crashes. +If OpenBLAS is not available, Armadillo can use the ATLAS library for faster versions +of a subset of LAPACK and BLAS functions. +LAPACK should still be installed to obtain full functionality. +The minimum recommended version of ATLAS is 3.10. --- @@ -363,18 +376,18 @@ expensive element-wise functions such as exp(), log(), cos(), etc. This requires a C++11/C++14 compiler with OpenMP 3.1+ support. -When using gcc or clang, use the following options to enable both -C++11 and OpenMP: -std=c++11 -fopenmp +For GCC and Clang compilers, use the following options to enable both C++11 and OpenMP: +`-std=c++11 -fopenmp` --- -### 12: Documentation +### 12: Documentation of Functions and Classes -The documentation for Armadillo functions and classes is available at: +The documentation of Armadillo functions and classes is available at: http://arma.sourceforge.net/docs.html -The documentation is also in the "docs.html" file in this folder, -which can be viewed with a web browser. +The documentation is also in the `docs.html` file distributed with Armadillo. +Use a web browser to view it. --- @@ -435,7 +448,7 @@ ### 15: MEX Interface to Octave/Matlab -The "mex_interface" folder contains examples of how to interface +The `mex_interface` folder contains examples of how to interface Octave/Matlab with C++ code that uses Armadillo matrices. --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/docs.html new/armadillo-10.6.2/docs.html --- old/armadillo-10.6.1/docs.html 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/docs.html 2016-06-16 18:23:12.000000000 +0200 @@ -541,7 +541,7 @@ <tbody> <tr style="background-color: #F5F5F5;"><td><a href="#constants">constants</a></td><td> </td><td>pi, inf, NaN, speed of light, ...</td></tr> <tr style="background-color: #F5F5F5;"><td><a href="#wall_clock">wall_clock</a></td><td> </td><td>timer for measuring number of elapsed seconds</td></tr> -<tr style="background-color: #F5F5F5;"><td><a href="#logging">logging of errors/warnings</a></td><td> </td><td>how to change the streams for displaying warnings and errors</td></tr> +<tr style="background-color: #F5F5F5;"><td><a href="#output_streams">output streams</a></td><td> </td><td>streams for printing warnings and errors</td></tr> <tr><td><a href="#uword">uword / sword</a></td><td> </td><td>shorthand for unsigned and signed integers</td></tr> <tr><td><a href="#cx_double">cx_double / cx_float</a></td><td> </td><td>shorthand for std::complex<double> and std::complex<float></td></tr> <tr><td><a href="#syntax">Matlab/Armadillo syntax differences</a></td><td> </td><td>examples of Matlab syntax and conceptually corresponding Armadillo syntax</td></tr> @@ -6794,7 +6794,7 @@ <li><a href="#brief_print">.brief_print()</a></li> <li><a href="#save_load_mat">saving & loading matrices</a></li> <li><a href="#element_initialisation">initialising elements</a></li> -<li><a href="#logging">logging of errors and warnings</a></li> +<li><a href="#output_streams">output streams</a></li> </ul> </li> <br> @@ -13175,7 +13175,14 @@ </li> <br> <li> -<b>Caveat:</b> using <i><code>solve_opts::fast</code></i> will speed up finding the solution, but for poorly conditioned systems the solution may have lower quality +If a rank deficient system is detected and the <i><code>solve_opts::no_approx</code></i> option is <b>not</b> enabled, a warning is emitted and an approximate solution is attempted; +<br>in Armadillo 10.4 and later versions, this warning can be disabled by setting <a href="#config_hpp">ARMA_WARN_LEVEL</a> to 1 before including the armadillo header: +<br><code>#define ARMA_WARN_LEVEL 1</code> +<br><code>#include <armadillo></code> +</li> +<br> +<li> +<b>Caveat:</b> using <i><code>solve_opts::fast</code></i> will speed up finding the solution, but for poorly conditioned systems the solution may have lower quality </li> <br> <li> @@ -17190,48 +17197,65 @@ <br> <div class="pagebreak"></div><div class="noprint"><hr class="greyline"><br></div> +<a name="output_streams"></a> <a name="logging"></a> -<b>logging of warnings and errors</b> +<b>std::ostream& x = get_cout_stream()</b> +<br><b>std::ostream& x = get_cerr_stream()</b> <br> -<br><b>set_cerr_stream( user_stream )</b> <br><b>set_cout_stream( user_stream )</b> -<br> -<br><b>std::ostream& x = get_cerr_stream()</b> -<br><b>std::ostream& x = get_cout_stream()</b> +<br><b>set_cerr_stream( user_stream )</b> <br> <ul> -<li>Warnings and errors are printed by default to the <i>std::cerr</i> stream</li> -<br> -<li>Printing of all warnings and errors can be disabled by placing <i>#define <a href="#config_hpp">ARMA_DONT_PRINT_ERRORS</a></i> before <i>#include <armadillo></i></li> -<br> -<li>More fine grained control over the degree of emitted warnings and errors is avaiable via the <i><a href="#config_hpp">ARMA_WARN_LEVEL</a></i> option (Armadillo 10.4 and later)</li> -<br> -<li>Detailed information about errors is always reported via the base <i>std::exception</i> class</li> +<li><b>get_cout_stream()</b>: +<ul> +<li>get a reference to the stream used for printing matrices and cubes with <a href="#print">.print()</a> and <a href="#raw_print">.raw_print()</a></li> +<li>by default this is <i>std::cout</i></li> +</ul> <br> -<li><b>set_cerr_stream()</b>: +<li><b>get_cerr_stream()</b>: <ul> -<li>change the stream for printing warnings and errors involving out of bounds accesses, failed decompositions and out of memory conditions</li> -<li>the stream can also be changed via the ARMA_CERR_STREAM define; see <a href="#config_hpp">config.hpp</a></li> +<li>get a reference to the stream used for printing warnings and errors involving out of bounds accesses, failed decompositions, failed loading/saving, out of memory conditions, etc</li> +<li>by default this is <i>std::cerr</i></li> </ul> -</li> <br> -<li><b>set_cout_stream()</b>: +<li><b>set_cout_stream( custom_stream )</b>: <ul> -<li>change the default stream for printing matrices and cubes with <a href="#print">.print()</a> and <a href="#raw_print">.raw_print()</a></li> +<li>set the stream used for printing matrices and cubes</li> <li>the stream can also be changed via the ARMA_COUT_STREAM define; see <a href="#config_hpp">config.hpp</a></li> </ul> </li> <br> -<li><b>get_cerr_stream()</b>: +<li><b>set_cerr_stream( custom_stream )</b>: <ul> -<li>get a reference to the stream for printing warnings and errors</li> +<li>change the stream for printing warnings and errors +<li>the stream can also be changed via the ARMA_CERR_STREAM define; see <a href="#config_hpp">config.hpp</a></li> </ul> +</li> <br> -<li><b>get_cout_stream()</b>: +<li> +<b>Caveats:</b> +<ul> +<li> +in Armadillo 10.4 and later versions: +<ul> +<li>the default degree of emitted warnings about failed decompositions has been considerably reduced compared to earlier versions</li> +<li>the <i><a href="#config_hpp">ARMA_WARN_LEVEL</a></i> option allows fine-grained control over the degree of emitted warnings</li> +</ul> +</li> +<li> +in Armadillo 10.3 and earlier versions: <ul> -<li>get a reference to the stream for printing matrices and cubes</li> +<li>all failed decompositions print warnings</li> +<li>a blunt method to disable printing of all warnings and errors is via placing <i>#define <a href="#config_hpp">ARMA_DONT_PRINT_ERRORS</a></i> before <i>#include <armadillo></i> +</ul> +</li> +<li> +detailed information about errors is always reported via the base <i>std::exception</i> class +</li> </ul> +</li> <br> +<!-- <li> Examples: <ul> @@ -17252,6 +17276,7 @@ </ul> </li> <br> +--> <li> See also: <ul> @@ -19037,7 +19062,7 @@ </td> <td style="vertical-align: top;"> -The default stream used for printing <a href="#logging">error messages and warnings</a>. +The default stream used for printing warnings and errors. Must be always enabled. By default defined to <i>std::cerr</i> </td> @@ -19124,10 +19149,10 @@ <li> See also: <ul> -<li><a href="#logging">logging of warnings and errors</a></li> <li><a href="#element_access">element access</a></li> <li><a href="#element_initialisation">element initialisation</a></li> <li><a href="#uword">uword/sword</a></li> +<li><a href="#output_streams">output streams</a></li> </ul> </li> <br> @@ -19300,7 +19325,7 @@ <li>faster handling of <a href="#subcube">subcubes</a></li> <li>added <a href="#misc_fns">tgamma()</a></li> <li>added <a href="#brief_print">.brief_print()</a> for abridged printing of matrices & cubes</li> -<li>expanded forms of <a href="#trimat">trimatu()</a> and <a href="#trimat">trimatl()</a> with diagonal specification to handle sparse matrices</li> +<li>expanded sparse matrix forms of <a href="#trimat">trimatu()</a> and <a href="#trimat">trimatl()</a> to allow specifying the diagonal delimiter</li> <li>expanded <a href="#eigs_sym">eigs_sym()</a> and <a href="#eigs_gen">eigs_gen()</a> with optional shift-invert mode</li> </ul> </li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/examples/lib_win64/README.txt new/armadillo-10.6.2/examples/lib_win64/README.txt --- old/armadillo-10.6.1/examples/lib_win64/README.txt 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/examples/lib_win64/README.txt 2016-06-16 18:23:12.000000000 +0200 @@ -1,7 +1,7 @@ The lib and dll files in this folder are for MSVC running on Windows 10 (64 bit). -The files were obtained from a pre-compiled release of OpenBLAS 0.3.10: -https://github.com/xianyi/OpenBLAS/releases/download/v0.3.10/OpenBLAS-0.3.10-x64.zip +The files were obtained from a pre-compiled release of OpenBLAS 0.3.13: +https://github.com/xianyi/OpenBLAS/releases/download/v0.3.13/OpenBLAS-0.3.13-x64.zip The compilation was done by a third party. USE AT YOUR OWN RISK. @@ -11,7 +11,7 @@ The original sources for OpenBLAS are at: https://github.com/xianyi/OpenBLAS/ -OpenBLAS is a fast implementation of BLAS and LAPACK. +OpenBLAS is a high-performance implementation of BLAS and LAPACK. The original sources for standard BLAS and LAPACK are at: http://www.netlib.org/blas/ http://www.netlib.org/lapack/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/include/armadillo_bits/arma_version.hpp new/armadillo-10.6.2/include/armadillo_bits/arma_version.hpp --- old/armadillo-10.6.1/include/armadillo_bits/arma_version.hpp 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/include/armadillo_bits/arma_version.hpp 2016-06-16 18:23:12.000000000 +0200 @@ -21,7 +21,7 @@ #define ARMA_VERSION_MAJOR 10 #define ARMA_VERSION_MINOR 6 -#define ARMA_VERSION_PATCH 1 +#define ARMA_VERSION_PATCH 2 #define ARMA_VERSION_NAME "Keep Calm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/include/armadillo_bits/compiler_check.hpp new/armadillo-10.6.2/include/armadillo_bits/compiler_check.hpp --- old/armadillo-10.6.1/include/armadillo_bits/compiler_check.hpp 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/include/armadillo_bits/compiler_check.hpp 2016-06-16 18:23:12.000000000 +0200 @@ -41,6 +41,7 @@ #endif +// warn about ignored option used in old versions of Armadillo #if defined(ARMA_DONT_USE_CXX11) #pragma message ("WARNING: ARMA_DONT_USE_CXX11 ignored") #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/include/armadillo_bits/debug.hpp new/armadillo-10.6.2/include/armadillo_bits/debug.hpp --- old/armadillo-10.6.1/include/armadillo_bits/debug.hpp 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/include/armadillo_bits/debug.hpp 2016-06-16 18:23:12.000000000 +0200 @@ -427,7 +427,6 @@ template<typename T1> inline -static void arma_warn_level(const uword level, const T1& arg1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/include/armadillo_bits/diagmat_proxy.hpp new/armadillo-10.6.2/include/armadillo_bits/diagmat_proxy.hpp --- old/armadillo-10.6.1/include/armadillo_bits/diagmat_proxy.hpp 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/include/armadillo_bits/diagmat_proxy.hpp 2016-06-16 18:23:12.000000000 +0200 @@ -143,9 +143,15 @@ const T1& P; - static constexpr bool P_is_vec = (T1::n_rows == 1) || (T1::n_cols == 1); - static constexpr uword n_rows = P_is_vec ? T1::n_elem : T1::n_rows; - static constexpr uword n_cols = P_is_vec ? T1::n_elem : T1::n_cols; + //// this may require T1::n_elem etc to be declared as static constexpr inline variables (C++17) + //// see also the notes in Mat::fixed + // static constexpr bool P_is_vec = (T1::n_rows == 1) || (T1::n_cols == 1); + // static constexpr uword n_rows = P_is_vec ? T1::n_elem : T1::n_rows; + // static constexpr uword n_cols = P_is_vec ? T1::n_elem : T1::n_cols; + + static const bool P_is_vec = (T1::n_rows == 1) || (T1::n_cols == 1); + static const uword n_rows = P_is_vec ? T1::n_elem : T1::n_rows; + static const uword n_cols = P_is_vec ? T1::n_elem : T1::n_cols; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/include/armadillo_bits/glue_max_meat.hpp new/armadillo-10.6.2/include/armadillo_bits/glue_max_meat.hpp --- old/armadillo-10.6.1/include/armadillo_bits/glue_max_meat.hpp 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/include/armadillo_bits/glue_max_meat.hpp 2016-06-16 18:23:12.000000000 +0200 @@ -58,7 +58,7 @@ const uword n_rows = PA.get_n_rows(); const uword n_cols = PA.get_n_cols(); - arma_debug_assert_same_size(n_rows, n_cols, PB.get_n_rows(), PB.get_n_cols(), "element-wise maximum"); + arma_debug_assert_same_size(n_rows, n_cols, PB.get_n_rows(), PB.get_n_cols(), "element-wise max()"); out.set_size(n_rows, n_cols); @@ -102,7 +102,7 @@ const uword n_rows = PA.get_n_rows(); const uword n_cols = PA.get_n_cols(); - arma_debug_assert_same_size(n_rows, n_cols, PB.get_n_rows(), PB.get_n_cols(), "element-wise maximum"); + arma_debug_assert_same_size(n_rows, n_cols, PB.get_n_rows(), PB.get_n_cols(), "element-wise max()"); out.set_size(n_rows, n_cols); @@ -179,7 +179,7 @@ const uword n_cols = PA.get_n_cols(); const uword n_slices = PA.get_n_slices(); - arma_debug_assert_same_size(n_rows, n_cols, n_slices, PB.get_n_rows(), PB.get_n_cols(), PB.get_n_slices(), "element-wise maximum"); + arma_debug_assert_same_size(n_rows, n_cols, n_slices, PB.get_n_rows(), PB.get_n_cols(), PB.get_n_slices(), "element-wise max()"); out.set_size(n_rows, n_cols, n_slices); @@ -225,7 +225,7 @@ const uword n_cols = PA.get_n_cols(); const uword n_slices = PA.get_n_slices(); - arma_debug_assert_same_size(n_rows, n_cols, n_slices, PB.get_n_rows(), PB.get_n_cols(), PB.get_n_slices(), "element-wise maximum"); + arma_debug_assert_same_size(n_rows, n_cols, n_slices, PB.get_n_rows(), PB.get_n_cols(), PB.get_n_slices(), "element-wise max()"); out.set_size(n_rows, n_cols, n_slices); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/include/armadillo_bits/glue_min_meat.hpp new/armadillo-10.6.2/include/armadillo_bits/glue_min_meat.hpp --- old/armadillo-10.6.1/include/armadillo_bits/glue_min_meat.hpp 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/include/armadillo_bits/glue_min_meat.hpp 2016-06-16 18:23:12.000000000 +0200 @@ -58,7 +58,7 @@ const uword n_rows = PA.get_n_rows(); const uword n_cols = PA.get_n_cols(); - arma_debug_assert_same_size(n_rows, n_cols, PB.get_n_rows(), PB.get_n_cols(), "element-wise minimum"); + arma_debug_assert_same_size(n_rows, n_cols, PB.get_n_rows(), PB.get_n_cols(), "element-wise min()"); out.set_size(n_rows, n_cols); @@ -102,7 +102,7 @@ const uword n_rows = PA.get_n_rows(); const uword n_cols = PA.get_n_cols(); - arma_debug_assert_same_size(n_rows, n_cols, PB.get_n_rows(), PB.get_n_cols(), "element-wise minimum"); + arma_debug_assert_same_size(n_rows, n_cols, PB.get_n_rows(), PB.get_n_cols(), "element-wise min()"); out.set_size(n_rows, n_cols); @@ -179,7 +179,7 @@ const uword n_cols = PA.get_n_cols(); const uword n_slices = PA.get_n_slices(); - arma_debug_assert_same_size(n_rows, n_cols, n_slices, PB.get_n_rows(), PB.get_n_cols(), PB.get_n_slices(), "element-wise minimum"); + arma_debug_assert_same_size(n_rows, n_cols, n_slices, PB.get_n_rows(), PB.get_n_cols(), PB.get_n_slices(), "element-wise min()"); out.set_size(n_rows, n_cols, n_slices); @@ -225,7 +225,7 @@ const uword n_cols = PA.get_n_cols(); const uword n_slices = PA.get_n_slices(); - arma_debug_assert_same_size(n_rows, n_cols, n_slices, PB.get_n_rows(), PB.get_n_cols(), PB.get_n_slices(), "element-wise minimum"); + arma_debug_assert_same_size(n_rows, n_cols, n_slices, PB.get_n_rows(), PB.get_n_cols(), PB.get_n_slices(), "element-wise min()"); out.set_size(n_rows, n_cols, n_slices); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/include/armadillo_bits/subview_meat.hpp new/armadillo-10.6.2/include/armadillo_bits/subview_meat.hpp --- old/armadillo-10.6.1/include/armadillo_bits/subview_meat.hpp 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/include/armadillo_bits/subview_meat.hpp 2016-06-16 18:23:12.000000000 +0200 @@ -192,9 +192,13 @@ } else // not a row vector { - if( (is_same_type<op_type, op_internal_equ>::yes) && (s.aux_row1 == 0) && (s_n_rows == s.m.n_rows) ) + if((s.aux_row1 == 0) && (s_n_rows == s.m.n_rows)) { - arrayops::copy( s.colptr(0), B.memptr(), s.n_elem ); + if(is_same_type<op_type, op_internal_equ >::yes) { arrayops::copy ( s.colptr(0), B.memptr(), s.n_elem ); } + if(is_same_type<op_type, op_internal_plus >::yes) { arrayops::inplace_plus ( s.colptr(0), B.memptr(), s.n_elem ); } + if(is_same_type<op_type, op_internal_minus>::yes) { arrayops::inplace_minus( s.colptr(0), B.memptr(), s.n_elem ); } + if(is_same_type<op_type, op_internal_schur>::yes) { arrayops::inplace_mul ( s.colptr(0), B.memptr(), s.n_elem ); } + if(is_same_type<op_type, op_internal_div >::yes) { arrayops::inplace_div ( s.colptr(0), B.memptr(), s.n_elem ); } } else { @@ -1090,13 +1094,13 @@ if( (s.aux_row1 == 0) && (s_n_rows == s.m.n_rows) ) { arrayops::inplace_set( s.colptr(0), val, s.n_elem ); - - return; } - - for(uword ucol=0; ucol < s_n_cols; ++ucol) + else { - arrayops::inplace_set( s.colptr(ucol), val, s_n_rows ); + for(uword ucol=0; ucol < s_n_cols; ++ucol) + { + arrayops::inplace_set( s.colptr(ucol), val, s_n_rows ); + } } } } @@ -1612,13 +1616,13 @@ if( (in.aux_row1 == 0) && (n_rows == in.m.n_rows) ) { arrayops::copy( out.memptr(), in.colptr(0), in.n_elem ); - - return; } - - for(uword col=0; col < n_cols; ++col) + else { - arrayops::copy( out.colptr(col), in.colptr(col), n_rows ); + for(uword col=0; col < n_cols; ++col) + { + arrayops::copy( out.colptr(col), in.colptr(col), n_rows ); + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.6.1/include/armadillo_bits/unwrap.hpp new/armadillo-10.6.2/include/armadillo_bits/unwrap.hpp --- old/armadillo-10.6.1/include/armadillo_bits/unwrap.hpp 2016-06-16 18:23:11.000000000 +0200 +++ new/armadillo-10.6.2/include/armadillo_bits/unwrap.hpp 2016-06-16 18:23:12.000000000 +0200 @@ -1502,6 +1502,33 @@ template<typename eT> +struct partial_unwrap< Op< subview<eT>, op_htrans> > + { + typedef Mat<eT> stored_type; + + inline + partial_unwrap(const Op< subview<eT>, op_htrans>& A) + : sv( A.m ) + , M ( A.m, ((A.m.aux_row1 == 0) && (A.m.n_rows == A.m.m.n_rows)) ) // reuse memory if the subview is a contiguous chunk + { + arma_extra_debug_sigprint(); + } + + constexpr eT get_val() const { return eT(1); } + + template<typename eT2> + arma_inline bool is_alias(const Mat<eT2>& X) const { return ( ((sv.aux_row1 == 0) && (sv.n_rows == sv.m.n_rows)) ? (void_ptr(&(sv.m)) == void_ptr(&X)) : false ); } + + static constexpr bool do_trans = true; + static constexpr bool do_times = false; + + const subview<eT>& sv; + const Mat<eT> M; + }; + + + +template<typename eT> struct partial_unwrap< Op< subview_col<eT>, op_htrans> > { typedef Col<eT> stored_type;
