From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 625AA139401 for ; Sat, 25 Jul 2015 23:39:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 019B9E07E8; Sat, 25 Jul 2015 23:39:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5664DE07D4 for ; Sat, 25 Jul 2015 23:39:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F39B334091A for ; Sat, 25 Jul 2015 23:39:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 423D9BB for ; Sat, 25 Jul 2015 23:39:15 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1437816655.b84afcb2b666160d9f0b9caeffadbb78992e476f.bircoph@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/armadillo/ChangeLog sci-libs/armadillo/armadillo-5.200.2-r1.ebuild sci-libs/armadillo/metadata.xml X-VCS-Directories: sci-libs/armadillo/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: b84afcb2b666160d9f0b9caeffadbb78992e476f X-VCS-Branch: master Date: Sat, 25 Jul 2015 23:39:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e86d5c94-0f05-4412-9132-fc4df30b2e43 X-Archives-Hash: be4f876dd9c7a770b00c6ee7df044283 commit: b84afcb2b666160d9f0b9caeffadbb78992e476f Author: Marius Brehler linux sungazer de> AuthorDate: Sat Jul 25 09:29:38 2015 +0000 Commit: Andrew Savchenko gentoo org> CommitDate: Sat Jul 25 09:30:55 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b84afcb2 sci-libs/armadillo: Add superlu useflag Package-Manager: portage-2.2.20 sci-libs/armadillo/ChangeLog | 6 ++ sci-libs/armadillo/armadillo-5.200.2-r1.ebuild | 121 +++++++++++++++++++++++++ sci-libs/armadillo/metadata.xml | 4 + 3 files changed, 131 insertions(+) diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index ba91269..f38652d 100644 --- a/sci-libs/armadillo/ChangeLog +++ b/sci-libs/armadillo/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*armadillo-5.200.2-r1 (25 Jul 2015) + + 25 Jul 2015; Marius Brehler + +armadillo-5.200.2-r1.ebuild, metadata.xml: + sci-libs/armadillo: Add superlu useflag + 25 Jul 2015; Marius Brehler armadillo-5.100.2.ebuild, armadillo-5.200.1.ebuild, armadillo-5.200.2.ebuild: sci-libs/armadillo: Fix slots diff --git a/sci-libs/armadillo/armadillo-5.200.2-r1.ebuild b/sci-libs/armadillo/armadillo-5.200.2-r1.ebuild new file mode 100644 index 0000000..0f4f32e --- /dev/null +++ b/sci-libs/armadillo/armadillo-5.200.2-r1.ebuild @@ -0,0 +1,121 @@ +# 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/5" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 ) + superlu? ( sci-libs/superlu ) +" +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 + if use superlu; then + mycmakeargs+=( + -DSuperLU_FOUND=ON + -DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)" + ) + 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 index dfc8f30..af978f1 100644 --- a/sci-libs/armadillo/metadata.xml +++ b/sci-libs/armadillo/metadata.xml @@ -29,6 +29,10 @@ Use matrix allocation from the Threads Building Blocks dev-cpp/tbb + + Use SuperLU for sparse linear equation solving + sci-libs/superlu + arma