commit: 46b621eaf7754b5de756502b55fc85c155df03bf Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> AuthorDate: Sun Apr 26 10:03:48 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> CommitDate: Sun Apr 26 10:03:48 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=46b621ea
Revert "In CVS": Ebuilds in tree have no atlas support (#541524) This reverts commit 4502854392f11b7e90b1d2c60c72c15602c81f80. sci-libs/armadillo/ChangeLog | 159 ++++++++++++++++++++++++++++ sci-libs/armadillo/armadillo-4.650.4.ebuild | 112 ++++++++++++++++++++ sci-libs/armadillo/metadata.xml | 33 ++++++ 3 files changed, 304 insertions(+) diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog new file mode 100644 index 0000000..fcab445 --- /dev/null +++ b/sci-libs/armadillo/ChangeLog @@ -0,0 +1,159 @@ +# ChangeLog for sci-libs/armadillo +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 03 Apr 2015; Marius Brehler <mar...@linux.sungazer.de> + -armadillo-4.600.2.ebuild, -armadillo-4.600.4.ebuild, + -armadillo-4.650.2.ebuild: + Moved to tree; Drop old + +*armadillo-4.650.4 (24 Mar 2015) + + 24 Mar 2015; Marius Brehler <mar...@linux.sungazer.de> + +armadillo-4.650.4.ebuild: + Version bump + +*armadillo-4.650.2 (08 Mar 2015) + + 08 Mar 2015; Marius Brehler <mar...@linux.sungazer.de> + +armadillo-4.650.2.ebuild: + Version bump + + 27 Feb 2015; Andreas K. Huettel <dilfri...@gentoo.org> + -armadillo-4.200.0.ebuild, -armadillo-4.300.8.ebuild, + -armadillo-4.300.9.ebuild, -files/armadillo-3.820.1-example-makefile.patch, + -files/armadillo-4.000.3-hdf5.patch: + Remove old + +*armadillo-4.600.4 (27 Jan 2015) + + 27 Jan 2015; Marius Brehler <mar...@linux.sungazer.de> + +armadillo-4.600.4.ebuild: + Version bump + +*armadillo-4.600.2 (11 Jan 2015) + + 11 Jan 2015; Marius Brehler <mar...@linux.sungazer.de> + +armadillo-4.600.2.ebuild: + Version bump, fix examples install location + +*armadillo-4.300.9 (28 Jun 2014) + + 28 Jun 2014; Jauhien Piatlicki <jauh...@gentoo.org> + +armadillo-4.300.9.ebuild, metadata.xml: + version bump, see bug #515624 + +*armadillo-4.300.8 (02 Jun 2014) + + 02 Jun 2014; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-4.300.8.ebuild, + -armadillo-3.930.0.ebuild, -armadillo-4.100.2.ebuild, + -armadillo-4.300.0.ebuild, -files/armadillo-3.820.1-hdf5.patch: + Version bump + +*armadillo-4.300.0 (06 May 2014) + + 06 May 2014; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-4.300.0.ebuild: + sci-libs/armadillo: Version bump + +*armadillo-4.200.0 (22 Apr 2014) + + 22 Apr 2014; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-4.200.0.ebuild, + -armadillo-4.000.4.ebuild: + sci-libs/armadillo: Version bump + +*armadillo-4.100.2 (19 Mar 2014) + + 19 Mar 2014; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-4.100.2.ebuild, + -armadillo-4.000.3.ebuild: + sci-libs/armadillo: Version bump + +*armadillo-4.000.4 (16 Feb 2014) + + 16 Feb 2014; Reinis Danne <rei4...@gmail.com> +armadillo-4.000.4.ebuild: + Bump to version 4.000.4. + + 10 Feb 2014; Sébastien Fabbro <bicat...@gentoo.org> armadillo-4.000.3.ebuild: + sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time + + 09 Feb 2014; Sébastien Fabbro <bicat...@gentoo.org> metadata.xml: + sci-libs/armadillo: add use flag description + +*armadillo-4.000.3 (09 Feb 2014) + + 09 Feb 2014; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-4.000.3.ebuild, + +files/armadillo-4.000.3-hdf5.patch: + sci-libs/armadillo: Version bump + + 08 Feb 2014; Reinis Danne <rei4...@gmail.com> armadillo-3.930.0.ebuild: + Fix cblas, clapack include dir. + +*armadillo-3.930.0 (07 Dec 2013) + + 07 Dec 2013; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-3.930.0.ebuild, + -armadillo-3.910.0.ebuild: + sci-libs/armadillo: Version bump + +*armadillo-3.910.0 (19 Aug 2013) + + 19 Aug 2013; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-3.910.0.ebuild, + -armadillo-3.900.6.ebuild: + sci-libs/armadillo: Version bump + +*armadillo-3.900.6 (03 Jul 2013) + + 03 Jul 2013; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-3.900.6.ebuild, + -armadillo-3.820.1.ebuild: + sci-libs/armadillo: Version bump + +*armadillo-3.820.1 (25 May 2013) + + 25 May 2013; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-3.820.1.ebuild, + +files/armadillo-3.820.1-example-makefile.patch, + +files/armadillo-3.820.1-hdf5.patch, -armadillo-3.810.2.ebuild, + -files/armadillo-3.810.2-example-makefile.patch, + -files/armadillo-3.810.2-hdf5.patch: + sci-libs/armadillo: Version bump + +*armadillo-3.810.2 (29 Apr 2013) + + 29 Apr 2013; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-3.810.2.ebuild, + +files/armadillo-3.810.2-example-makefile.patch, + +files/armadillo-3.810.2-hdf5.patch, -armadillo-3.6.3-r1.ebuild, metadata.xml: + sci-libs/armadillo: Version bump + + 28 Feb 2013; Sébastien Fabbro <bicat...@gentoo.org> armadillo-3.6.3-r1.ebuild: + sci-libs/armadillo: Small prefix fix + +*armadillo-3.6.3-r1 (25 Feb 2013) + + 25 Feb 2013; Sébastien Fabbro <bicat...@gentoo.org> + +armadillo-3.6.3-r1.ebuild, -armadillo-3.6.2-r1.ebuild: + sci-libs/armadillo: Version bump. Respect libdir + + 22 Feb 2013; Justin Lecher <j...@gentoo.org> armadillo-3.6.2-r1.ebuild, + metadata.xml: + Correct USE dependency for virtual/pkgconfig + +*armadillo-3.6.2-r1 (07 Feb 2013) + + 07 Feb 2013; Sébastien Fabbro <bicat...@gentoo.org> + +armadillo-3.6.2-r1.ebuild, -armadillo-3.6.1-r1.ebuild: + sci-libs/armadillo: Version bump + +*armadillo-3.6.1-r1 (24 Jan 2013) + + 24 Jan 2013; Sébastien Fabbro <bicat...@gentoo.org> + +armadillo-3.6.1-r1.ebuild, -armadillo-3.6.0-r1.ebuild: + sci-libs/armadillo: Version bump + +*armadillo-3.6.0-r1 (12 Dec 2012) + + 12 Dec 2012; Sébastien Fabbro <bicat...@gentoo.org> + +armadillo-3.6.0-r1.ebuild, -armadillo-3.2.4-r1.ebuild, metadata.xml: + sci-libs/armadillo: Version bump + +*armadillo-3.2.4-r1 (20 Jul 2012) + + 20 Jul 2012; Sébastien Fabbro <bicat...@gentoo.org> + +armadillo-3.2.4-r1.ebuild, +metadata.xml: + sci-libs/armadillo: Adapted for new atlas diff --git a/sci-libs/armadillo/armadillo-4.650.4.ebuild b/sci-libs/armadillo/armadillo-4.650.4.ebuild new file mode 100644 index 0000000..35856d7 --- /dev/null +++ b/sci-libs/armadillo/armadillo-4.650.4.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +CMAKE_IN_SOURCE_BUILD=1 + +inherit cmake-utils toolchain-funcs multilib eutils + +DESCRIPTION="Streamlined C++ linear algebra library" +HOMEPAGE="http://arma.sourceforge.net/"; +SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0/4" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" +REQUIRED_USE="test? ( lapack )" + +RDEPEND=" + dev-libs/boost + arpack? ( sci-libs/arpack ) + atlas? ( sci-libs/atlas[lapack] ) + blas? ( virtual/blas ) + lapack? ( virtual/lapack )" +DEPEND="${RDEPEND} + arpack? ( virtual/pkgconfig ) + atlas? ( virtual/pkgconfig ) + blas? ( virtual/pkgconfig ) + hdf5? ( sci-libs/hdf5 ) + lapack? ( virtual/pkgconfig ) + mkl? ( sci-libs/mkl ) + tbb? ( dev-cpp/tbb )" +PDEPEND="${RDEPEND} + hdf5? ( sci-libs/hdf5 ) + mkl? ( sci-libs/mkl ) + tbb? ( dev-cpp/tbb )" + +src_prepare() { + # avoid the automagic cmake macros + sed -i -e '/ARMA_Find/d' CMakeLists.txt || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + $(cmake-utils_use debug ARMA_EXTRA_DEBUG) + $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) + $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) + ) + if use arpack; then + mycmakeargs+=( + -DARPACK_FOUND=ON + -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" + ) + fi + if use atlas; then + local c=atlas-cblas l=atlas-clapack + $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads + $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads + mycmakeargs+=( + -DCBLAS_FOUND=ON + -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" + -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" + -DCLAPACK_FOUND=ON + -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" + -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" + ) + fi + if use blas; then + mycmakeargs+=( + -DBLAS_FOUND=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + ) + fi + if use hdf5; then + mycmakeargs+=( + -DHDF5_FOUND=ON + -DHDF5_LIBRARIES="-lhdf5" + ) + fi + if use lapack; then + mycmakeargs+=( + -DLAPACK_FOUND=ON + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + fi + cmake-utils_src_configure +} + +src_test() { + pushd examples > /dev/null + emake \ + CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ + EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)" + LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die + LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die + emake clean + popd > /dev/null +} + +src_install() { + cmake-utils_src_install + dodoc README.txt + use doc && dodoc *pdf && dohtml *html + if use examples; then + insinto /usr/share/examples/${PF} + doins -r examples/* + fi +} diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml new file mode 100644 index 0000000..385357d --- /dev/null +++ b/sci-libs/armadillo/metadata.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> +<herd>sci</herd> +<longdescription lang="en"> + Armadillo is a C++ linear algebra library (matrix maths) aiming + towards a good balance between speed and ease of use. Integer, + floating point and complex numbers are supported, as well as a + subset of trigonometric and statistics functions. Various matrix + decompositions are provided through optional integration with LAPACK + and ATLAS libraries. + A delayed evaluation approach is employed (during compile time) to + combine several operations into one and reduce (or eliminate) the + need for temporaries. This is accomplished through recursive + templates and template meta-programming. +</longdescription> +<use> + <flag name="atlas"> + Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and + clapack + </flag> + <flag name="arpack"> + Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition + </flag> + <flag name='mkl'> + Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg> + </flag> + <flag name='tbb'> + Use matrix allocation from the Threads Building Blocks + <pkg>dev-cpp/tbb</pkg> + </flag> +</use> +</pkgmetadata>
