From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Ry9w8-0006pz-Fe for garchives@archives.gentoo.org; Thu, 16 Feb 2012 22:36:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9841EE0F90; Thu, 16 Feb 2012 22:36:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5B5F8E0F90 for ; Thu, 16 Feb 2012 22:36:02 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 940681B4021 for ; Thu, 16 Feb 2012 22:36:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2F953E540A for ; Thu, 16 Feb 2012 22:35:59 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1329429059.30dd86ddc27c2973024acd298cce60627c4ae87e.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/mkl/ChangeLog sci-libs/mkl/mkl-10.3.7.256.ebuild X-VCS-Directories: sci-libs/mkl/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 30dd86ddc27c2973024acd298cce60627c4ae87e X-VCS-Branch: master Date: Thu, 16 Feb 2012 22:35:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b0fcbcbb-5136-4d04-b49f-7ef14cadbe28 X-Archives-Hash: 08556d2d812fb02a703fe1cb15f2ca6e commit: 30dd86ddc27c2973024acd298cce60627c4ae87e Author: S=C3=A9bastien Fabbro gmail com> AuthorDate: Thu Feb 16 21:50:59 2012 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Thu Feb 16 21:50:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D30dd86dd sci-libs/mkl: Version bump (Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit) --- sci-libs/mkl/ChangeLog | 7 ++- sci-libs/mkl/mkl-10.3.7.256.ebuild | 136 ++++++++++++++++++++++++++++++= ++++++ 2 files changed, 142 insertions(+), 1 deletions(-) diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog index 8d71418..487c897 100644 --- a/sci-libs/mkl/ChangeLog +++ b/sci-libs/mkl/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for sci-libs/mkl -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*mkl-10.3.7.256 (16 Feb 2012) + + 16 Feb 2012; S=C3=A9bastien Fabbro +mkl-10.3.7.2= 56.ebuild: + Version bump + *mkl-10.3.4.191 (22 Aug 2011) =20 22 Aug 2011; S=C3=A9bastien Fabbro +mkl-10.3.4.1= 91.ebuild, diff --git a/sci-libs/mkl/mkl-10.3.7.256.ebuild b/sci-libs/mkl/mkl-10.3.7= .256.ebuild new file mode 100644 index 0000000..a7be7b5 --- /dev/null +++ b/sci-libs/mkl/mkl-10.3.7.256.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D4 +INTEL_DPN=3Dparallel_studio_xe +INTEL_DID=3D2405 +INTEL_DPV=3D2011_sp1_update1 +INTEL_SUBDIR=3Dcomposerxe + +inherit intel-sdp multilib alternatives-2 + +DESCRIPTION=3D"Intel Math Kernel Library: linear algebra, fft, math func= tions" +HOMEPAGE=3D"http://software.intel.com/en-us/articles/intel-mkl/" + +IUSE=3D"" + +DEPEND=3D"" +RDEPEND=3D">=3Ddev-libs/intel-common-12" + +QA_PREBUILT=3D" + ${INTEL_SDP_DIR}/mkl/lib/*/* + ${INTEL_SDP_DIR}/mkl/examples/lapack/lib/* + ${INTEL_SDP_DIR}/mkl/tests/cblas/source/* + ${INTEL_SDP_DIR}/mkl/benchmarks/linpack/* + ${INTEL_SDP_DIR}/mkl/benchmarks/mp_linpack/*/*/*" + +CHECKREQS_DISK_BUILD=3D1536 + +INTEL_BIN_RPMS=3D"mkl-sp1 mkl-sp1-devel" +INTEL_DAT_RPMS=3D"mkl-sp1-common" + +src_prepare() { + chmod u+w -R opt +} + +mkl_add_prof() { + local pcname=3D${1} libs cflags x + shift + [[ ${pcname} =3D *int64* ]] && cflags=3D-DMKL_ILP64 + cat <<-EOF > ${pcname}.pc + prefix=3D${INTEL_SDP_EDIR}/mkl + libdir=3D\${prefix}/lib/${IARCH} + includedir=3D\${prefix}/include + Name: ${pcname} + Description: ${DESCRIPTION} + Version: ${PV} + URL: ${HOMEPAGE} + Libs: -L\${libdir} ${libs} + Cflags: -I\${includedir} ${cflags} + EOF + insinto /usr/$(get_libdir)/pkgconfig + doins ${pcname}.pc + for x in $*; do + alternatives_for ${x} ${pcname/-${x}} 0 \ + /usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc + done +} + +# mkl_prof [_ilp64 or _lp64] +# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-adv= isor/ +mkl_prof() { + local bits=3D"" + if [[ ${IARCH} =3D=3D intel64 ]]; then + bits=3D_lp64 + [[ ${1} =3D=3D int64 ]] && bits=3D_ilp64 + fi + local gf=3D"-Wl,--start-group -lmkl_gf${bits}" + local intel=3D"-Wl,--start-group -lmkl_intel${bits}" + local core=3D"-lmkl_core -Wl,--end-group" + local prof=3Dmkl${IARCH:((${#IARCH} - 2)):2} + [[ ${1} =3D=3D int64 ]] && prof=3D${prof}-int64 + local libs + + libs=3D"${gf} -lmkl_sequential ${core} -lpthread" \ + mkl_add_prof ${prof}-gfortran blas lapack + libs=3D"${intel} -lmkl_sequential ${core} -lpthread" \ + mkl_add_prof ${prof}-intel blas lapack cblas lapacke + libs=3D"${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + mkl_add_prof ${prof}-gfortran-openmp blas lapack + libs=3D"${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + mkl_add_prof ${prof}-gcc-openmp cblas lapacke + libs=3D"${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ + mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke + libs=3D"-lmkl_rt -lpthread" \ + mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke + libs=3D"-lmkl_rt -liomp5 -lpthread" \ + mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke + + # blacs and scalapack + local scal=3D"-lmkl_scalapack${bits:-_core}" + local blacs=3D"-lmkl_blacs_intelmpi${bits}" + core=3D"-lmkl_core ${blacs} -Wl,--end-group" + + libs=3D"${gf} -lmkl_sequential ${core} -lpthread" \ + mkl_add_prof ${prof}-gfortran-blacs blacs + libs=3D"${scal} ${gf} -lmkl_sequential ${core} -lpthread" \ + mkl_add_prof ${prof}-gfortran-scalapack scalapack + libs=3D"${intel} -lmkl_sequential ${core} -lpthread" \ + mkl_add_prof ${prof}-intel-blacs blacs + libs=3D"${scal} ${intel} -lmkl_sequential ${core} -lpthread" \ + mkl_add_prof ${prof}-intel-scalapack scalapack + libs=3D"${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + mkl_add_prof ${prof}-gfortran-openmp-blacs blacs + libs=3D"${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack + libs=3D"${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + mkl_add_prof ${prof}-gcc-openmp-blacs blacs + libs=3D"${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack + libs=3D"${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ + mkl_add_prof ${prof}-intel-openmp-blacs blacs + libs=3D"${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" = \ + mkl_add_prof ${prof}-intel-openmp-scalapack scalapack + libs=3D"-lmkl_rt ${blacs} -lpthread" \ + mkl_add_prof ${prof}-dynamic-blacs blacs + libs=3D"${scal} -lmkl_rt ${blacs} -lpthread" \ + mkl_add_prof ${prof}-dynamic-scalapack scalapack + libs=3D"-lmkl_rt ${blacs} -liomp5 -lpthread" \ + mkl_add_prof ${prof}-dynamic-openmp-blacs blacs + libs=3D"${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \ + mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack +} + +src_install() { + intel-sdp_src_install + echo -n > 35mkl "LDPATH=3D" + for IARCH in ${INTEL_ARCH}; do + mkl_prof + sed -i -e '/mkl/s/$/:/' 35mkl + echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}" + [[ ${IARCH} =3D=3D intel64 ]] && mkl_prof int64 + done + echo >> 35mkl + doenvd 35mkl +}