Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2014-11-19 20:26:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-31 19:58:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2014-11-19 20:30:58.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 3 17:51:28 UTC 2014 - [email protected] + +- Update to version 4.500.1: + + List of changes not documented upstream. + +------------------------------------------------------------------- Old: ---- armadillo-4.500.0.tar.gz New: ---- armadillo-4.500.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.pLLcbq/_old 2014-11-19 20:31:00.000000000 +0100 +++ /var/tmp/diff_new_pack.pLLcbq/_new 2014-11-19 20:31:00.000000000 +0100 @@ -19,7 +19,7 @@ %define soname libarmadillo4 Name: armadillo -Version: 4.500.0 +Version: 4.500.1 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: MPL-2.0 ++++++ armadillo-4.500.0.tar.gz -> armadillo-4.500.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-4.500.0/CMakeLists.txt new/armadillo-4.500.1/CMakeLists.txt --- old/armadillo-4.500.0/CMakeLists.txt 2014-10-30 05:32:38.000000000 +0100 +++ new/armadillo-4.500.1/CMakeLists.txt 2014-11-17 09:41:54.000000000 +0100 @@ -1,8 +1,8 @@ # Copyright (C) 2008-2014 Conrad Sanderson # Copyright (C) 2008-2014 NICTA (www.nicta.com.au) +# Copyright (C) 2013-2014 Ryan Curtin # Copyright (C) 2011 Clement Creusot -# Copyright (C) 2013 Ryan Curtin # # 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 @@ -14,7 +14,7 @@ set(ARMA_MAJOR 4) set(ARMA_MINOR 500) -set(ARMA_PATCH 0) +set(ARMA_PATCH 1) set(ARMADILLO_VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}) message(STATUS "Configuring Armadillo ${ARMADILLO_VERSION}") @@ -233,14 +233,41 @@ ## cmake -D DETECT_HDF5=true . if(DETECT_HDF5) - find_package(HDF5) - message(STATUS "HDF5_FOUND = ${HDF5_FOUND}") + find_package(HDF5 QUIET) + + if(NOT HDF5_FOUND) + # On Debian systems, the HDF5 package has been split into multiple packages + # so that it is co-installable. But this may mean that the include files + # are hidden somewhere very odd that the FindHDF5.cmake script will not + # find. Thus, we'll also quickly check pkgconfig to see if there is + # information on what to use there. + find_package(PkgConfig) + if (PKG_CONFIG_FOUND) + pkg_check_modules(HDF5 hdf5) + # But using pkgconfig is a little weird because HDF5_LIBRARIES won't be + # filled with exact library paths, like the other scripts. So instead + # what we get is HDF5_LIBRARY_DIRS which is the equivalent of what we'd + # pass to -L. So we have to add those... + if (HDF5_FOUND) + link_directories("${HDF5_LIBRARY_DIRS}") + endif() + endif() + endif() + message(STATUS "HDF5_FOUND = ${HDF5_FOUND}") if(HDF5_FOUND) set(ARMA_USE_HDF5_ALT true) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) - set(ARMA_HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS}) + # Since we called HDF5 with no arguments, the script will find only the C + # bindings. So HDF5_INCLUDE_DIRS may now contain one or two elements; if it + # contains two, the first is what the user passed as HDF5_INCLUDE_DIR and we + # should use that as ARMA_HDF5_INCLUDE_DIR. Otherwise, the one entry in + # HDF5_INCLUDE_DIRS is the correct include directory. So, in either case we + # can use the first element in the list. Issue a status message, too, just + # for good measure. + list(GET HDF5_INCLUDE_DIRS 0 ARMA_HDF5_INCLUDE_DIR) + message(STATUS "Set ARMA_HDF5_INCLUDE_DIR to ${ARMA_HDF5_INCLUDE_DIR}") endif() endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-4.500.0/README.txt new/armadillo-4.500.1/README.txt --- old/armadillo-4.500.0/README.txt 2014-10-30 05:32:38.000000000 +0100 +++ new/armadillo-4.500.1/README.txt 2014-11-17 09:50:18.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.500.0/include -DARMA_DONT_USE_WRAPPER -lblas -llapack + g++ example1.cpp -o example1 -O2 -I /home/blah/armadillo-4.500.1/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, @@ -263,13 +263,12 @@ http://www.netlib.org/lapack/ 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/ -The MKL, ACML and OpenBLAS libraries are generally the fastest. +The OpenBLAS, MKL and ACML libraries are generally the fastest. See section 8 for more info on making Armadillo use these libraries. For better performance, we recommend the following high-quality C++ compilers: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-4.500.0/include/armadillo_bits/arma_version.hpp new/armadillo-4.500.1/include/armadillo_bits/arma_version.hpp --- old/armadillo-4.500.0/include/armadillo_bits/arma_version.hpp 2014-10-30 05:32:38.000000000 +0100 +++ new/armadillo-4.500.1/include/armadillo_bits/arma_version.hpp 2014-11-17 09:41:54.000000000 +0100 @@ -13,7 +13,7 @@ #define ARMA_VERSION_MAJOR 4 #define ARMA_VERSION_MINOR 500 -#define ARMA_VERSION_PATCH 0 +#define ARMA_VERSION_PATCH 1 #define ARMA_VERSION_NAME "Singapore Sling" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-4.500.0/include/armadillo_bits/config.hpp new/armadillo-4.500.1/include/armadillo_bits/config.hpp --- old/armadillo-4.500.0/include/armadillo_bits/config.hpp 2014-10-19 17:34:05.000000000 +0200 +++ new/armadillo-4.500.1/include/armadillo_bits/config.hpp 2014-11-02 02:47:17.000000000 +0100 @@ -157,6 +157,7 @@ #if defined(ARMA_DONT_USE_WRAPPER) #undef ARMA_USE_WRAPPER + #undef ARMA_USE_HDF5_ALT #endif #if defined(ARMA_DONT_USE_CXX11) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-4.500.0/include/armadillo_bits/config.hpp.cmake new/armadillo-4.500.1/include/armadillo_bits/config.hpp.cmake --- old/armadillo-4.500.0/include/armadillo_bits/config.hpp.cmake 2014-10-19 17:34:05.000000000 +0200 +++ new/armadillo-4.500.1/include/armadillo_bits/config.hpp.cmake 2014-11-02 02:47:17.000000000 +0100 @@ -84,7 +84,7 @@ #endif #if !defined(ARMA_USE_HDF5) -#cmakedefine ARMA_USE_HDF5 +// #define ARMA_USE_HDF5 //// Uncomment the above line to allow the ability to save and load matrices stored in HDF5 format; //// the hdf5.h header file must be available on your system, //// and you will need to link with the hdf5 library (eg. -lhdf5) @@ -157,6 +157,7 @@ #if defined(ARMA_DONT_USE_WRAPPER) #undef ARMA_USE_WRAPPER + #undef ARMA_USE_HDF5_ALT #endif #if defined(ARMA_DONT_USE_CXX11) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
