From: Sebastien Fabbro Date: Sat, 6 Aug 2011 20:28:31 +0000 (+0000) Subject: Fixed mkl flag for x86 temporarily. Verbosed metadata X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=21919ed03d639314752756f9b1d8fe57579d9027;p=gentoo.git Fixed mkl flag for x86 temporarily. Verbosed metadata Package-Manager: portage-2.1.10.10/cvs/Linux x86_64 --- diff --git a/dev-python/numexpr/ChangeLog b/dev-python/numexpr/ChangeLog index e07606daba60..f60c2f4cd545 100644 --- a/dev-python/numexpr/ChangeLog +++ b/dev-python/numexpr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/numexpr # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/ChangeLog,v 1.4 2011/01/29 09:36:37 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/ChangeLog,v 1.5 2011/08/06 20:28:31 bicatali Exp $ + + 06 Aug 2011; Sébastien Fabbro numexpr-1.4.2.ebuild, + metadata.xml: + Fixed mkl flag for x86 temporarily. Verbosed metadata *numexpr-1.4.2 (29 Jan 2011) diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest index 5b42d42f9704..037bdd786b59 100644 --- a/dev-python/numexpr/Manifest +++ b/dev-python/numexpr/Manifest @@ -2,15 +2,13 @@ Hash: SHA1 DIST numexpr-1.4.2.tar.gz 64172 RMD160 30528db9e097632fe4350d0eb677298317ba72fa SHA1 9874be16e404d1d8550c2fd14b61a4520a387153 SHA256 38f73f0402bca52566186dbeca586989617c02f8f23a31085cf27eb5fd654967 -EBUILD numexpr-1.4.2.ebuild 1201 RMD160 08ba4b6be013410a30a9ba91d6c4321f89743200 SHA1 b1ab40472ee5936bc1a66bc40b29da14a9d6dee1 SHA256 bdd501bd8f81eed252aa70c3fbe17bbb7c75bca62c2136049e6d1dc55aa9f7b9 -MISC ChangeLog 926 RMD160 cb4c8de94e9942813b1e3cb33b9dd623cf1297e7 SHA1 2074e3f841a16852d6995a5ccfe604250ff238be SHA256 bb9f013f89062dee30ef7c1fd77b4aaa3a091a0073a15d34d7952a8150c617d0 -MISC metadata.xml 495 RMD160 50be19d26d92cde0030750eeb32e9bdea9ae9e54 SHA1 57cb461967831f2d029c0179a70791c3bea198d2 SHA256 20bcf74b336f0713e25e03cd431d70bb4b5b8c5b7b3c8d9f5ee02a55cfe31678 +EBUILD numexpr-1.4.2.ebuild 1236 RMD160 d01292772c6b853711c330fde8509b54ad80e9b3 SHA1 b53076a19aac251493f5387324207ecad5977e4e SHA256 1ef45cd495709efe98fd1c15a2baa226fcc97e5c71da8ca2a0cd4c66c3c1debb +MISC ChangeLog 1074 RMD160 25447a93484d9c4dc70c4013e293d0f37d771031 SHA1 d2c51781c570c21e8f50eeff36219aac6736d556 SHA256 b93e9cf09f7e70113965b344a39b8a3e58a316de772dabf66eb7e14f29994f9a +MISC metadata.xml 848 RMD160 d84291f282435fe33cfa450a70428e61295615f6 SHA1 50f20f72ee160883d6a1bcc3495c96c84c79c2c6 SHA256 5728f3498740e605636316fe6dd7277aa226f6a4cd2970b7ead5992087884f5f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQECAAYFAk1D36wACgkQIiMqcbOVdxSQdwP/TmbbvhKwiLcgwwEPLXlDubE7 -I8Hm+3n6nGruMOI9s69Vh2s3hQRSIeAX1G83ymTLrZ8oG/I+sOhM9JuGsHv0VctP -ENEGCX7Oj9FC0g2wMOP81JBM+aFtEIzSzOfpB/1jlojfNicjcJ1/lFvdqH4RUae0 -c4hgyDUH+zhf/CxAKzc= -=Vh8q +iEYEARECAAYFAk49o/cACgkQ1ycZbhPLE2A6mwCgsoIRCM9NtFE/dDZrHtNOEBlW +FNoAnRVlH/Jl6nwXHKLpM8fPnocKu+wV +=d6BV -----END PGP SIGNATURE----- diff --git a/dev-python/numexpr/metadata.xml b/dev-python/numexpr/metadata.xml index a1e5d4df1333..af01364bb90d 100644 --- a/dev-python/numexpr/metadata.xml +++ b/dev-python/numexpr/metadata.xml @@ -4,14 +4,20 @@ python sci - timcera@earthlink.net - Tim Cera + timcera@earthlink.net + Tim Cera - Fast numerical array expression evaluator for Python and NumPy. + The numexpr package evaluates multiple-operator array expressions + many times faster than NumPy can. It accepts the expression as a + string, analyzes it, rewrites it more efficiently, and compiles it + to faster Python code on the fly. It's the next best thing to + writing the expression in C and compiling it with a specialized + just-in-time (JIT) compiler, i.e. it does not require a compiler at + runtime. - Enable support for Intel Vector Math Library, part of - sci-libs/mkl. + Enable support for Intel Vector Math Library, part of + sci-libs/mkl. diff --git a/dev-python/numexpr/numexpr-1.4.2.ebuild b/dev-python/numexpr/numexpr-1.4.2.ebuild index 945fb5f88d92..b4059ec383d8 100644 --- a/dev-python/numexpr/numexpr-1.4.2.ebuild +++ b/dev-python/numexpr/numexpr-1.4.2.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-1.4.2.ebuild,v 1.1 2011/01/29 09:36:37 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-1.4.2.ebuild,v 1.2 2011/08/06 20:28:31 bicatali Exp $ -EAPI=2 +EAPI=3 PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" inherit distutils @@ -18,22 +19,22 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="mkl" -RDEPEND=">=dev-python/numpy-1.3.1 +RDEPEND="dev-python/numpy mkl? ( sci-libs/mkl )" DEPEND="${RDEPEND} - >=dev-python/setuptools-0.6_rc3 - >=dev-util/scons-1.2.0-r1" - -RESTRICT_PYTHON_ABIS="3.*" + dev-python/setuptools" src_prepare() { - # TODO: alternatively icc's mkl can be used but it fails for me + # TODO: mkl can be used but it fails for me + # only works with mkl in tree. newer mkl will use pkgconfig if use mkl; then + local ext + use amd64 && ext=_lp64 cat <<- EOF > "${S}"/site.cfg [mkl] library_dirs = ${MKLROOT}/lib/em64t include_dirs = ${MKLROOT}/include - mkl_libs = mkl_solver_ilp64, mkl_intel_ilp64, \ + mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \ mkl_intel_thread, mkl_core, iomp5 EOF fi @@ -41,7 +42,8 @@ src_prepare() { src_test() { testing() { - PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" ${PN}/tests/test_${PN}.py + PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \ + "$(PYTHON)" ${PN}/tests/test_${PN}.py } python_execute_function testing }