* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2013-02-14 10:35 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2013-02-14 10:35 UTC (permalink / raw
To: gentoo-commits
commit: a9325e2f11c5a2124524a69d4bc432c25b2404af
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 10:35:53 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 10:35:53 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a9325e2f
sci-libs/mkl: Add KEYWORDS, #342185
Package-Manager: portage-2.2.0_alpha162
---
sci-libs/mkl/ChangeLog | 6 +++++-
sci-libs/mkl/mkl-11.0.0.079.ebuild | 3 ++-
sci-libs/mkl/mkl-11.0.1.117.ebuild | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index e841b42..76d7c7f 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/mkl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Feb 2013; Justin Lecher <jlec@gentoo.org> mkl-11.0.0.079.ebuild,
+ mkl-11.0.1.117.ebuild:
+ Add KEYWORDS, #342185
+
*mkl-11.0.1.117 (10 Dec 2012)
10 Dec 2012; Justin Lecher <jlec@gentoo.org> +mkl-11.0.1.117.ebuild,
diff --git a/sci-libs/mkl/mkl-11.0.0.079.ebuild b/sci-libs/mkl/mkl-11.0.0.079.ebuild
index eaedbe3..4ef1967 100644
--- a/sci-libs/mkl/mkl-11.0.0.079.ebuild
+++ b/sci-libs/mkl/mkl-11.0.0.079.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -15,6 +15,7 @@ DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND=""
RDEPEND=">=dev-libs/intel-common-12"
diff --git a/sci-libs/mkl/mkl-11.0.1.117.ebuild b/sci-libs/mkl/mkl-11.0.1.117.ebuild
index 89a1f0b..5ec66b3 100644
--- a/sci-libs/mkl/mkl-11.0.1.117.ebuild
+++ b/sci-libs/mkl/mkl-11.0.1.117.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -15,6 +15,7 @@ DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND=""
RDEPEND=">=dev-libs/intel-common-13"
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2020-11-09 7:41 Benda XU
0 siblings, 0 replies; 32+ messages in thread
From: Benda XU @ 2020-11-09 7:41 UTC (permalink / raw
To: gentoo-commits
commit: 20c05ff28aa7deb559aa5d33196f29e07f39ddc6
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 9 07:39:17 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 07:39:17 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=20c05ff2
sci-libs/mkl: landed on to ::gentoo.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-libs/mkl/metadata.xml | 19 -------
sci-libs/mkl/mkl-18.0.2.199.ebuild | 108 -------------------------------------
sci-libs/mkl/mkl-19.0.4.243.ebuild | 105 ------------------------------------
sci-libs/mkl/mkl-2020.1.217.ebuild | 101 ----------------------------------
4 files changed, 333 deletions(-)
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
deleted file mode 100644
index 5d7029a9d..000000000
--- a/sci-libs/mkl/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
-The Intel(R) Math Kernel Library is a mathematical library mostly
-optimized for Intel processors (also works on AMDs). It contains BLAS
-and LAPACK implementations, Fast Fourier Transforms, a vector math
-library, and random number generators. It also has multiprocessor
-capacities. The package is installed as binary and has a restrictive
-license. Please see license terms and home page for proper use.
-</longdescription>
- <use>
- <flag name="int64">Build the 64 bits integer library</flag>
- </use>
-</pkgmetadata>
diff --git a/sci-libs/mkl/mkl-18.0.2.199.ebuild b/sci-libs/mkl/mkl-18.0.2.199.ebuild
deleted file mode 100644
index 26c8fd725..000000000
--- a/sci-libs/mkl/mkl-18.0.2.199.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-INTEL_DIST_SKU=3235
-INTEL_DIST_PV=2018_update2_professional_edition
-
-inherit alternatives-2 intel-sdp-r1 numeric-int64-multibuild
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE="doc int64"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND="~dev-libs/intel-common-${PV}[compiler]"
-
-CHECKREQS_DISK_BUILD=3500M
-
-INTEL_DIST_DAT_RPMS=(
- "mkl-cluster-c-2018.2-199-2018.2-199.noarch.rpm"
- "mkl-cluster-common-2018.2-199-2018.2-199.noarch.rpm"
- "mkl-cluster-f-2018.2-199-2018.2-199.noarch.rpm"
- "mkl-common-2018.2-199-2018.2-199.noarch.rpm"
- "mkl-common-c-2018.2-199-2018.2-199.noarch.rpm"
- "mkl-common-c-ps-2018.2-199-2018.2-199.noarch.rpm"
- "mkl-common-f-2018.2-199-2018.2-199.noarch.rpm"
- "mkl-common-ps-2018.2-199-2018.2-199.noarch.rpm"
- "mkl-f95-common-2018.2-199-2018.2-199.noarch.rpm")
-INTEL_DIST_AMD64_RPMS=(
- "mkl-cluster-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-cluster-rt-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-core-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-core-c-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-core-f-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-core-ps-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-core-rt-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-f95-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-c-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-f-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-f-rt-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-rt-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-pgi-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-pgi-c-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-pgi-f-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-pgi-rt-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-tbb-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-tbb-rt-2018.2-199-2018.2-199.x86_64.rpm")
-INTEL_DIST_X86_RPMS=(
- "mkl-core-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-core-c-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-core-f-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-core-ps-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-core-rt-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-f95-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-c-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-f-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-f-rt-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-gnu-rt-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-tbb-32bit-2018.2-199-2018.2-199.x86_64.rpm"
- "mkl-tbb-rt-32bit-2018.2-199-2018.2-199.x86_64.rpm")
-
-pkg_setup() {
- if use doc; then
- INTEL_DIST_DAT_RPMS+=(
- "mkl-doc-2018-2018.2-199.noarch.rpm"
- "mkl-doc-ps-2018-2018.2-199.noarch.rpm")
- fi
-}
-
-_mkl_add_alternative_provider() {
- local prov=$1; shift
- local alt
- for alt in $*; do
- NUMERIC_MODULE_NAME=${prov} \
- numeric-int64-multibuild_install_alternative ${alt} ${prov}
- done
-}
-
-src_install() {
- intel-sdp-r1_src_install
-
- sed -i -e "s#<INSTALLDIR>#$(isdp_get-sdp-edir)/linux#" \
- "${ED}"/opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/bin/pkgconfig/* \
- || die "sed failed"
-
- mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "mkdir failed"
- cp "${ED}"/opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/bin/pkgconfig/* \
- "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "cp failed"
-
- if use int64; then
- _mkl_add_alternative_provider mkl-dynamic-ilp64-seq blas lapack cblas lapacke scalapack
- _mkl_add_alternative_provider mkl-dynamic-ilp64-iomp blas lapack cblas lapacke scalapack
- else
- _mkl_add_alternative_provider mkl-dynamic-lp64-seq blas lapack cblas lapacke scalapack
- _mkl_add_alternative_provider mkl-dynamic-lp64-iomp blas lapack cblas lapacke scalapack
- fi
-
- local ldpath="LDPATH="
- use abi_x86_64 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
- use abi_x86_32 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_32)"
- echo "${ldpath}" > "${T}"/35mkl || die
- doenvd "${T}"/35mkl
-}
diff --git a/sci-libs/mkl/mkl-19.0.4.243.ebuild b/sci-libs/mkl/mkl-19.0.4.243.ebuild
deleted file mode 100644
index fcdcc6c9f..000000000
--- a/sci-libs/mkl/mkl-19.0.4.243.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-INTEL_DIST_PV=2019_update4_professional_edition
-
-inherit alternatives-2 intel-sdp-r1 numeric-int64-multibuild
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE="doc int64"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND="~dev-libs/intel-common-${PV}[compiler]"
-
-CHECKREQS_DISK_BUILD=3500M
-
-INTEL_DIST_DAT_RPMS=(
- "mkl-cluster-c-2019.4-243-2019.4-243.noarch.rpm"
- "mkl-cluster-f-2019.4-243-2019.4-243.noarch.rpm"
- "mkl-common-2019.4-243-2019.4-243.noarch.rpm"
- "mkl-common-c-2019.4-243-2019.4-243.noarch.rpm"
- "mkl-common-c-ps-2019.4-243-2019.4-243.noarch.rpm"
- "mkl-common-f-2019.4-243-2019.4-243.noarch.rpm"
- "mkl-common-ps-2019.4-243-2019.4-243.noarch.rpm"
- "mkl-f95-common-2019.4-243-2019.4-243.noarch.rpm")
-INTEL_DIST_AMD64_RPMS=(
- "mkl-cluster-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-cluster-rt-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-core-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-core-c-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-core-f-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-core-ps-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-core-rt-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-f95-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-c-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-f-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-f-rt-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-rt-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-pgi-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-pgi-c-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-pgi-rt-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-tbb-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-tbb-rt-2019.4-243-2019.4-243.x86_64.rpm")
-INTEL_DIST_X86_RPMS=(
- "mkl-core-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-core-c-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-core-f-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-core-ps-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-core-rt-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-f95-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-c-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-f-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-f-rt-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-gnu-rt-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-tbb-32bit-2019.4-243-2019.4-243.x86_64.rpm"
- "mkl-tbb-rt-32bit-2019.4-243-2019.4-243.x86_64.rpm")
-
-pkg_setup() {
- if use doc; then
- INTEL_DIST_DAT_RPMS+=(
- "mkl-doc-2019-2019.4-243.noarch.rpm"
- "mkl-doc-ps-2019-2019.4-243.noarch.rpm")
- fi
-}
-
-_mkl_add_alternative_provider() {
- local prov=$1; shift
- local alt
- for alt in $*; do
- NUMERIC_MODULE_NAME=${prov} \
- numeric-int64-multibuild_install_alternative ${alt} ${prov}
- done
-}
-
-src_install() {
- intel-sdp-r1_src_install
-
- sed -i -e "s#<INSTALLDIR>#$(isdp_get-sdp-edir)/linux#" \
- "${ED}"/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/bin/pkgconfig/* \
- || die "sed failed"
-
- mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "mkdir failed"
- cp "${ED}"/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/bin/pkgconfig/* \
- "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "cp failed"
-
- if use int64; then
- _mkl_add_alternative_provider mkl-dynamic-ilp64-seq blas lapack cblas lapacke scalapack
- _mkl_add_alternative_provider mkl-dynamic-ilp64-iomp blas lapack cblas lapacke scalapack
- else
- _mkl_add_alternative_provider mkl-dynamic-lp64-seq blas lapack cblas lapacke scalapack
- _mkl_add_alternative_provider mkl-dynamic-lp64-iomp blas lapack cblas lapacke scalapack
- fi
-
- local ldpath="LDPATH="
- use abi_x86_64 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
- use abi_x86_32 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_32)"
- echo "${ldpath}" > "${T}"/35mkl || die
- doenvd "${T}"/35mkl
-}
diff --git a/sci-libs/mkl/mkl-2020.1.217.ebuild b/sci-libs/mkl/mkl-2020.1.217.ebuild
deleted file mode 100644
index 2dd3799db..000000000
--- a/sci-libs/mkl/mkl-2020.1.217.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-INTEL_DIST_PV=2020_update1_professional_edition
-
-inherit intel-sdp-r1 numeric-int64-multibuild
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE="doc int64"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND="~dev-libs/intel-common-19.1.1.217[compiler]"
-
-CHECKREQS_DISK_BUILD=3500M
-
-MY_PV="$(ver_rs 2 '-')" # 2020.1-217
-
-QA_PREBUILT="*"
-
-INTEL_DIST_DAT_RPMS=(
- "mkl-cluster-c-${MY_PV}-${MY_PV}.noarch.rpm"
- "mkl-cluster-f-${MY_PV}-${MY_PV}.noarch.rpm"
- "mkl-common-${MY_PV}-${MY_PV}.noarch.rpm"
- "mkl-common-c-${MY_PV}-${MY_PV}.noarch.rpm"
- "mkl-common-c-ps-${MY_PV}-${MY_PV}.noarch.rpm"
- "mkl-common-f-${MY_PV}-${MY_PV}.noarch.rpm"
- "mkl-common-ps-${MY_PV}-${MY_PV}.noarch.rpm"
- "mkl-f95-common-${MY_PV}-${MY_PV}.noarch.rpm")
-INTEL_DIST_AMD64_RPMS=(
- "mkl-cluster-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-cluster-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-core-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-core-c-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-core-f-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-core-ps-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-core-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-f95-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-c-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-f-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-f-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-pgi-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-pgi-c-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-pgi-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-tbb-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-tbb-rt-${MY_PV}-${MY_PV}.x86_64.rpm")
-INTEL_DIST_X86_RPMS=(
- "mkl-core-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-core-c-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-core-f-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-core-ps-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-core-rt-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-f95-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-c-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-f-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-f-rt-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-gnu-rt-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-tbb-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
- "mkl-tbb-rt-32bit-${MY_PV}-${MY_PV}.x86_64.rpm")
-
-pkg_setup() {
- if use doc; then
- INTEL_DIST_DAT_RPMS+=(
- "mkl-doc-2020-${MY_PV}.noarch.rpm"
- "mkl-doc-ps-2020-${MY_PV}.noarch.rpm")
- fi
-}
-
-_mkl_add_alternative_provider() {
- local prov=$1; shift
- local alt
- for alt in $*; do
- NUMERIC_MODULE_NAME=${prov} \
- numeric-int64-multibuild_install_alternative ${alt} ${prov}
- done
-}
-
-src_install() {
- intel-sdp-r1_src_install
-
- sed -i -e "s#<INSTALLDIR>#$(isdp_get-sdp-edir)/linux#" \
- "${ED}"/opt/intel/compilers_and_libraries_2020.1.217/linux/mkl/bin/pkgconfig/* \
- || die "sed failed"
-
- mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "mkdir failed"
- cp "${ED}"/opt/intel/compilers_and_libraries_2020.1.217/linux/mkl/bin/pkgconfig/* \
- "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "cp failed"
-
- local ldpath="LDPATH="
- use abi_x86_64 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
- use abi_x86_32 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_32)"
- echo "${ldpath}" > "${T}"/35mkl || die
- doenvd "${T}"/35mkl
-}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2020-05-05 6:30 Matthias Maier
0 siblings, 0 replies; 32+ messages in thread
From: Matthias Maier @ 2020-05-05 6:30 UTC (permalink / raw
To: gentoo-commits
commit: ed47e6e4bb0282eb541890797441d142e16b7cc9
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue May 5 05:34:55 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue May 5 06:23:55 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ed47e6e4
sci-libs/mkl: version bump to 2020 update 1
- do not use alternatives-2
- TODO: port to new USE=eselect-ldso
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/mkl/mkl-2020.1.217.ebuild | 101 +++++++++++++++++++++++++++++++++++++
1 file changed, 101 insertions(+)
diff --git a/sci-libs/mkl/mkl-2020.1.217.ebuild b/sci-libs/mkl/mkl-2020.1.217.ebuild
new file mode 100644
index 000000000..2dd3799db
--- /dev/null
+++ b/sci-libs/mkl/mkl-2020.1.217.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+INTEL_DIST_PV=2020_update1_professional_edition
+
+inherit intel-sdp-r1 numeric-int64-multibuild
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE="doc int64"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND="~dev-libs/intel-common-19.1.1.217[compiler]"
+
+CHECKREQS_DISK_BUILD=3500M
+
+MY_PV="$(ver_rs 2 '-')" # 2020.1-217
+
+QA_PREBUILT="*"
+
+INTEL_DIST_DAT_RPMS=(
+ "mkl-cluster-c-${MY_PV}-${MY_PV}.noarch.rpm"
+ "mkl-cluster-f-${MY_PV}-${MY_PV}.noarch.rpm"
+ "mkl-common-${MY_PV}-${MY_PV}.noarch.rpm"
+ "mkl-common-c-${MY_PV}-${MY_PV}.noarch.rpm"
+ "mkl-common-c-ps-${MY_PV}-${MY_PV}.noarch.rpm"
+ "mkl-common-f-${MY_PV}-${MY_PV}.noarch.rpm"
+ "mkl-common-ps-${MY_PV}-${MY_PV}.noarch.rpm"
+ "mkl-f95-common-${MY_PV}-${MY_PV}.noarch.rpm")
+INTEL_DIST_AMD64_RPMS=(
+ "mkl-cluster-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-cluster-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-core-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-core-c-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-core-f-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-core-ps-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-core-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-f95-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-c-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-f-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-f-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-pgi-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-pgi-c-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-pgi-rt-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-tbb-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-tbb-rt-${MY_PV}-${MY_PV}.x86_64.rpm")
+INTEL_DIST_X86_RPMS=(
+ "mkl-core-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-core-c-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-core-f-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-core-ps-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-core-rt-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-f95-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-c-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-f-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-f-rt-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-gnu-rt-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-tbb-32bit-${MY_PV}-${MY_PV}.x86_64.rpm"
+ "mkl-tbb-rt-32bit-${MY_PV}-${MY_PV}.x86_64.rpm")
+
+pkg_setup() {
+ if use doc; then
+ INTEL_DIST_DAT_RPMS+=(
+ "mkl-doc-2020-${MY_PV}.noarch.rpm"
+ "mkl-doc-ps-2020-${MY_PV}.noarch.rpm")
+ fi
+}
+
+_mkl_add_alternative_provider() {
+ local prov=$1; shift
+ local alt
+ for alt in $*; do
+ NUMERIC_MODULE_NAME=${prov} \
+ numeric-int64-multibuild_install_alternative ${alt} ${prov}
+ done
+}
+
+src_install() {
+ intel-sdp-r1_src_install
+
+ sed -i -e "s#<INSTALLDIR>#$(isdp_get-sdp-edir)/linux#" \
+ "${ED}"/opt/intel/compilers_and_libraries_2020.1.217/linux/mkl/bin/pkgconfig/* \
+ || die "sed failed"
+
+ mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "mkdir failed"
+ cp "${ED}"/opt/intel/compilers_and_libraries_2020.1.217/linux/mkl/bin/pkgconfig/* \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "cp failed"
+
+ local ldpath="LDPATH="
+ use abi_x86_64 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
+ use abi_x86_32 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_32)"
+ echo "${ldpath}" > "${T}"/35mkl || die
+ doenvd "${T}"/35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2019-05-25 6:36 Matthias Maier
0 siblings, 0 replies; 32+ messages in thread
From: Matthias Maier @ 2019-05-25 6:36 UTC (permalink / raw
To: gentoo-commits
commit: eb8ecdd3e73fe175eee314ac14a89a15e4241e6a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 06:25:49 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat May 25 06:36:08 2019 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=eb8ecdd3
sci-libs/mkl: version bump to 19.0.4.243
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/mkl/mkl-19.0.4.243.ebuild | 105 +++++++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/sci-libs/mkl/mkl-19.0.4.243.ebuild b/sci-libs/mkl/mkl-19.0.4.243.ebuild
new file mode 100644
index 000000000..fcdcc6c9f
--- /dev/null
+++ b/sci-libs/mkl/mkl-19.0.4.243.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+INTEL_DIST_PV=2019_update4_professional_edition
+
+inherit alternatives-2 intel-sdp-r1 numeric-int64-multibuild
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE="doc int64"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND="~dev-libs/intel-common-${PV}[compiler]"
+
+CHECKREQS_DISK_BUILD=3500M
+
+INTEL_DIST_DAT_RPMS=(
+ "mkl-cluster-c-2019.4-243-2019.4-243.noarch.rpm"
+ "mkl-cluster-f-2019.4-243-2019.4-243.noarch.rpm"
+ "mkl-common-2019.4-243-2019.4-243.noarch.rpm"
+ "mkl-common-c-2019.4-243-2019.4-243.noarch.rpm"
+ "mkl-common-c-ps-2019.4-243-2019.4-243.noarch.rpm"
+ "mkl-common-f-2019.4-243-2019.4-243.noarch.rpm"
+ "mkl-common-ps-2019.4-243-2019.4-243.noarch.rpm"
+ "mkl-f95-common-2019.4-243-2019.4-243.noarch.rpm")
+INTEL_DIST_AMD64_RPMS=(
+ "mkl-cluster-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-cluster-rt-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-core-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-core-c-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-core-f-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-core-ps-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-core-rt-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-f95-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-c-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-f-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-f-rt-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-rt-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-pgi-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-pgi-c-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-pgi-rt-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-tbb-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-tbb-rt-2019.4-243-2019.4-243.x86_64.rpm")
+INTEL_DIST_X86_RPMS=(
+ "mkl-core-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-core-c-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-core-f-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-core-ps-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-core-rt-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-f95-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-c-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-f-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-f-rt-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-gnu-rt-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-tbb-32bit-2019.4-243-2019.4-243.x86_64.rpm"
+ "mkl-tbb-rt-32bit-2019.4-243-2019.4-243.x86_64.rpm")
+
+pkg_setup() {
+ if use doc; then
+ INTEL_DIST_DAT_RPMS+=(
+ "mkl-doc-2019-2019.4-243.noarch.rpm"
+ "mkl-doc-ps-2019-2019.4-243.noarch.rpm")
+ fi
+}
+
+_mkl_add_alternative_provider() {
+ local prov=$1; shift
+ local alt
+ for alt in $*; do
+ NUMERIC_MODULE_NAME=${prov} \
+ numeric-int64-multibuild_install_alternative ${alt} ${prov}
+ done
+}
+
+src_install() {
+ intel-sdp-r1_src_install
+
+ sed -i -e "s#<INSTALLDIR>#$(isdp_get-sdp-edir)/linux#" \
+ "${ED}"/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/bin/pkgconfig/* \
+ || die "sed failed"
+
+ mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "mkdir failed"
+ cp "${ED}"/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/bin/pkgconfig/* \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "cp failed"
+
+ if use int64; then
+ _mkl_add_alternative_provider mkl-dynamic-ilp64-seq blas lapack cblas lapacke scalapack
+ _mkl_add_alternative_provider mkl-dynamic-ilp64-iomp blas lapack cblas lapacke scalapack
+ else
+ _mkl_add_alternative_provider mkl-dynamic-lp64-seq blas lapack cblas lapacke scalapack
+ _mkl_add_alternative_provider mkl-dynamic-lp64-iomp blas lapack cblas lapacke scalapack
+ fi
+
+ local ldpath="LDPATH="
+ use abi_x86_64 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
+ use abi_x86_32 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_32)"
+ echo "${ldpath}" > "${T}"/35mkl || die
+ doenvd "${T}"/35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2018-04-03 16:44 Matthias Maier
0 siblings, 0 replies; 32+ messages in thread
From: Matthias Maier @ 2018-04-03 16:44 UTC (permalink / raw
To: gentoo-commits
commit: d7ecb866436c4daf1773aecc98eda97e6684370c
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 3 15:36:17 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Apr 3 16:44:50 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d7ecb866
sci-libs/mkl: drop old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-libs/mkl/metadata.xml | 1 -
sci-libs/mkl/mkl-11.3.2.181.ebuild | 196 -------------------------------------
2 files changed, 197 deletions(-)
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 1555184d5..5d7029a9d 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -15,6 +15,5 @@ license. Please see license terms and home page for proper use.
</longdescription>
<use>
<flag name="int64">Build the 64 bits integer library</flag>
- <flag name="mic">Install the libraries needed for supporting Intel Many Integrated Core (Xeon Phi)</flag>
</use>
</pkgmetadata>
diff --git a/sci-libs/mkl/mkl-11.3.2.181.ebuild b/sci-libs/mkl/mkl-11.3.2.181.ebuild
deleted file mode 100644
index b4b35f8b2..000000000
--- a/sci-libs/mkl/mkl-11.3.2.181.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-INTEL_DIST_SKU=8676
-INTEL_DIST_PV=2016_update2
-INTEL_SKIP_LICENSE=true
-
-NUMERIC_MODULE_NAME=${PN}
-
-inherit alternatives-2 intel-sdp-r1 numeric-int64-multibuild
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE="doc examples l10n_ja mic"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-16[${MULTILIB_USEDEP},mic?]"
-
-CHECKREQS_DISK_BUILD=3500M
-
-INTEL_DIST_BIN_RPMS=(
- "mkl"
- "mkl-devel"
- "mkl-gnu"
- "mkl-gnu-devel"
- "mkl-ps"
- "mkl-ps-f95-devel"
- "mkl-ps-gnu"
- "mkl-ps-gnu-devel"
- "mkl-ps-pgi"
- "mkl-ps-pgi-devel"
- "mkl-ps-ss-tbb"
- "mkl-ps-ss-tbb-devel")
-INTEL_DIST_X86_RPMS=()
-INTEL_DIST_AMD64_RPMS=(
- "mkl-ps-cluster"
- "mkl-ps-cluster-devel"
- "mkl-sp2dp"
- "mkl-sp2dp-devel")
-INTEL_DIST_DAT_RPMS=(
- "mkl-common"
- "mkl-ps-cluster-common"
- "mkl-ps-common"
- "mkl-ps-f95-common")
-
-pkg_setup() {
- if use doc; then
- INTEL_DIST_DAT_RPMS+=(
- "mkl-doc-11.3.2-181.noarch.rpm"
- "mkl-ps-doc-11.3.2-181.noarch.rpm")
-
- if use l10n_ja; then
- INTEL_DIST_DAT_RPMS+=(
- "mkl-ps-doc-jp-11.3.2-181.noarch.rpm")
- fi
- fi
-
- if use mic; then
- INTEL_DIST_AMD64_RPMS+=(
- "mkl-ps-mic"
- "mkl-ps-mic-devel"
- "mkl-ps-tbb-mic"
- "mkl-ps-tbb-mic-devel")
- fi
-
- if use l10n_ja; then
- INTEL_DIST_BIN_RPMS+=(
- "mkl-ps-jp")
-
- INTEL_DIST_DAT_RPMS+=(
- "mkl-ps-common-jp")
-
- if use mic; then
- INTEL_DIST_AMD64_RPMS+=(
- "mkl-ps-mic-jp")
- fi
- fi
-}
-
-src_prepare() {
- default
- chmod u+w -R opt || die
-}
-
-_mkl_add_pc_file() {
- local pcname=${1} cflags="" suffix=""
- shift
- numeric-int64_is_int64_build && cflags=-DMKL_ILP64 && suffix="-int64"
-
- local IARCH=$(isdp_convert2intel-arch ${MULTIBUILD_ID})
-
- create_pkgconfig \
- --prefix "$(isdp_get-sdp-edir)/linux/mkl" \
- --libdir "\${prefix}/lib/${IARCH}" \
- --includedir "\${prefix}/include" \
- --name ${pcname} \
- --libs "-L\${libdir} -L$(isdp_get-sdp-edir)/linux/compiler/lib/${IARCH} $* -lpthread -lm" \
- --cflags "-I\${includedir} ${cflags}" \
- ${pcname}${suffix}
-}
-
-_mkl_add_alternative_provider() {
- local prov=$1; shift
- local alt
- for alt in $*; do
- NUMERIC_MODULE_NAME=${prov} \
- numeric-int64-multibuild_install_alternative ${alt} ${prov}
- done
-}
-
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_add_pc_file() {
- local bits=""
- [[ ${MULTIBUILD_ID} =~ amd64 ]] && bits=_lp64
- numeric-int64_is_int64_build && bits=_ilp64
-
- local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
- local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
-
- # blas lapack cblas lapacke
- _mkl_add_pc_file mkl-gfortran ${gf} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-intel ${intel} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-gfortran-openmp ${gf} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-gcc-openmp ${gc} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-intel-openmp ${intel} -lmkl_intel_thread ${core} -openmp
- _mkl_add_pc_file mkl-dynamic -lmkl_rt
- _mkl_add_pc_file mkl-dynamic-openmp -lmkl_rt -liomp5
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- _mkl_add_pc_file mkl-gfortran-blacs ${gf} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-gfortran-scalapack ${scal} ${gf} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-intel-blacs ${intel} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-intel-scalapack ${scal} ${intel} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-gfortran-openmp-blacs ${gf} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-gfortran-openmp-scalapack ${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-gcc-openmp-blacs ${gc} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-gcc-openmp-scalapack ${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-intel-openmp-blacs ${intel} -lmkl_intel_thread ${core} -liomp5
- _mkl_add_pc_file mkl-intel-openmp-scalapack ${scal} ${intel} -lmkl_intel_thread ${core} -liomp5
- _mkl_add_pc_file mkl-dynamic-blacs -lmkl_rt ${blacs}
- _mkl_add_pc_file mkl-dynamic-scalapack ${scal} -lmkl_rt ${blacs}
- _mkl_add_pc_file mkl-dynamic-openmp-blacs -lmkl_rt ${blacs} -liomp5
- _mkl_add_pc_file mkl-dynamic-openmp-scalapack ${scal} -lmkl_rt ${blacs} -liomp5
-}
-
-mkl_add_alternative_provider() {
- # blas lapack cblas lapacke
- _mkl_add_alternative_provider mkl-gfortran blas lapack
- _mkl_add_alternative_provider mkl-intel blas lapack cblas lapacke
- _mkl_add_alternative_provider mkl-gfortran-openmp blas lapack
- _mkl_add_alternative_provider mkl-gcc-openmp cblas lapacke
- _mkl_add_alternative_provider mkl-intel-openmp blas lapack cblas lapacke
- _mkl_add_alternative_provider mkl-dynamic blas lapack cblas lapacke
- _mkl_add_alternative_provider mkl-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- _mkl_add_alternative_provider mkl-gfortran-blacs blacs
- _mkl_add_alternative_provider mkl-gfortran-scalapack scalapack
- _mkl_add_alternative_provider mkl-intel-blacs blacs
- _mkl_add_alternative_provider mkl-intel-scalapack scalapack
- _mkl_add_alternative_provider mkl-gfortran-openmp-blacs blacs
- _mkl_add_alternative_provider mkl-gfortran-openmp-scalapack scalapack
- _mkl_add_alternative_provider mkl-gcc-openmp-blacs blacs
- _mkl_add_alternative_provider mkl-gcc-openmp-scalapack scalapack
- _mkl_add_alternative_provider mkl-intel-openmp-blacs blacs
- _mkl_add_alternative_provider mkl-intel-openmp-scalapack scalapack
- _mkl_add_alternative_provider mkl-dynamic-blacs blacs
- _mkl_add_alternative_provider mkl-dynamic-scalapack scalapack
- _mkl_add_alternative_provider mkl-dynamic-openmp-blacs blacs
- _mkl_add_alternative_provider mkl-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- local IARCH
- local ldpath="LDPATH="
- intel-sdp-r1_src_install
-
- numeric-int64-multibuild_foreach_all_abi_variants mkl_add_pc_file
- mkl_add_alternative_provider
-
- use abi_x86_64 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
- use abi_x86_32 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_32)"
-
- echo "${ldpath}" > "${T}"/35mkl || die
- doenvd "${T}"/35mkl
-}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2018-04-03 16:44 Matthias Maier
0 siblings, 0 replies; 32+ messages in thread
From: Matthias Maier @ 2018-04-03 16:44 UTC (permalink / raw
To: gentoo-commits
commit: 3b7aff577379a8fdd3898e6e78248559ceceaa23
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 3 14:48:56 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Apr 3 16:44:50 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3b7aff57
sci-libs/mkl: version bump to 18.0.2.199
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-libs/mkl/mkl-18.0.2.199.ebuild | 108 +++++++++++++++++++++++++++++++++++++
1 file changed, 108 insertions(+)
diff --git a/sci-libs/mkl/mkl-18.0.2.199.ebuild b/sci-libs/mkl/mkl-18.0.2.199.ebuild
new file mode 100644
index 000000000..ad98b798f
--- /dev/null
+++ b/sci-libs/mkl/mkl-18.0.2.199.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+INTEL_DIST_SKU=3235
+INTEL_DIST_PV=2018_update2_professional_edition
+
+inherit alternatives-2 intel-sdp-r1 numeric-int64-multibuild
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE="doc int64"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND="~dev-libs/intel-common-${PV}[compiler]"
+
+CHECKREQS_DISK_BUILD=3500M
+
+INTEL_DIST_DAT_RPMS=(
+ "mkl-cluster-c-2018.2-199-2018.2-199.noarch.rpm"
+ "mkl-cluster-common-2018.2-199-2018.2-199.noarch.rpm"
+ "mkl-cluster-f-2018.2-199-2018.2-199.noarch.rpm"
+ "mkl-common-2018.2-199-2018.2-199.noarch.rpm"
+ "mkl-common-c-2018.2-199-2018.2-199.noarch.rpm"
+ "mkl-common-c-ps-2018.2-199-2018.2-199.noarch.rpm"
+ "mkl-common-f-2018.2-199-2018.2-199.noarch.rpm"
+ "mkl-common-ps-2018.2-199-2018.2-199.noarch.rpm"
+ "mkl-f95-common-2018.2-199-2018.2-199.noarch.rpm")
+INTEL_DIST_AMD64_RPMS=(
+ "mkl-cluster-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-cluster-rt-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-core-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-core-c-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-core-f-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-core-ps-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-core-rt-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-f95-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-c-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-f-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-f-rt-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-rt-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-pgi-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-pgi-c-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-pgi-f-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-pgi-rt-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-tbb-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-tbb-rt-2018.2-199-2018.2-199.x86_64.rpm")
+INTEL_DIST_X86_RPMS=(
+ "mkl-core-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-core-c-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-core-f-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-core-ps-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-core-rt-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-f95-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-c-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-f-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-f-rt-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-gnu-rt-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-tbb-32bit-2018.2-199-2018.2-199.x86_64.rpm"
+ "mkl-tbb-rt-32bit-2018.2-199-2018.2-199.x86_64.rpm")
+
+pkg_setup() {
+ if use doc; then
+ INTEL_DIST_DAT_RPMS+=(
+ "mkl-doc-2018-2018.2-199.noarch.rpm"
+ "mkl-doc-ps-2018-2018.2-199.noarch.rpm")
+ fi
+}
+
+_mkl_add_alternative_provider() {
+ local prov=$1; shift
+ local alt
+ for alt in $*; do
+ NUMERIC_MODULE_NAME=${prov} \
+ numeric-int64-multibuild_install_alternative ${alt} ${prov}
+ done
+}
+
+src_install() {
+ intel-sdp-r1_src_install
+
+ sed -i -e "s#<INSTALLDIR>#$(isdp_get-sdp-edir)/linux#" \
+ "${ED}"/opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/bin/pkgconfig/* \
+ || die "sed failed"
+
+ mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "mkdir failed"
+ cp "${ED}"/opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/bin/pkgconfig/* \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/ || die "cp failed"
+
+ if use int64; then
+ _mkl_add_alternative_provider mkl-dynamic-ilp64-seq blas lapack cblas lapacke scalapack
+ _mkl_add_alternative_provider mkl-dynamic-ilp64-iomp blas lapack cblas lapacke scalapack
+ else
+ _mkl_add_alternative_provider mkl-dynamic-lp64-seq blas lapack cblas lapacke scalapack
+ _mkl_add_alternative_provider mkl-dynamic-lp64-iomp blas lapack cblas lapacke scalapack
+ fi
+
+ local ldpath="LDPATH="
+ use abi_x86_64 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
+ use abi_x86_32 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_32)"
+ echo "${ldpath}" > "${T}"/35mkl || die
+ doenvd "${T}"/35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2018-01-27 13:57 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2018-01-27 13:57 UTC (permalink / raw
To: gentoo-commits
commit: 12f9dbe06930ec02e9628dd87ced2c138be755d1
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 13:57:25 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 13:57:25 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=12f9dbe0
sci-libs/mkl: Update to new localization handling
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.20, Repoman-2.3.6
sci-libs/mkl/mkl-11.1.3.174-r1.ebuild | 142 ------------------------------
sci-libs/mkl/mkl-11.2.4.233.ebuild | 160 ----------------------------------
sci-libs/mkl/mkl-11.3.2.181.ebuild | 8 +-
3 files changed, 4 insertions(+), 306 deletions(-)
diff --git a/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild
deleted file mode 100644
index a60b13dca..000000000
--- a/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4220
-INTEL_DPV=2013_sp1_update3
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-INTEL_SKIP_LICENSE=true
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
- mkl mkl-devel
- mkl-cluster mkl-cluster-devel
- mkl-f95-devel
- mkl-gnu mkl-gnu-devel
- mkl-pgi mkl-pgi-devel"
-# single arch packages
-# mkl-mic mkl-mic-devel
-# mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
- local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.2.4.233.ebuild b/sci-libs/mkl/mkl-11.2.4.233.ebuild
deleted file mode 100644
index d1968bda6..000000000
--- a/sci-libs/mkl/mkl-11.2.4.233.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=8470
-INTEL_DPV=2015_update6
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-INTEL_SKIP_LICENSE=true
-
-NUMERIC_MODULE_NAME=${PN}
-
-inherit alternatives-2 intel-sdp numeric-int64-multibuild
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-15[${MULTILIB_USEDEP}]"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS=(
- mkl mkl-devel
- mkl-cluster mkl-cluster-devel
- mkl-f95-devel
- mkl-gnu mkl-gnu-devel
- mkl-pgi mkl-pgi-devel
- )
-INTEL_AMD64_RPMS=(
- mkl-mic mkl-mic-devel
- mkl-sp2dp mkl-sp2dp-devel
- )
-INTEL_DAT_RPMS=(
- mkl-common
- mkl-cluster-common
- mkl-f95-common
- )
-
-pkg_setup() {
- intel-sdp_pkg_setup
-}
-
-src_prepare() {
- chmod u+w -R opt || die
-}
-
-_mkl_add_pc_file() {
- local pcname=${1} cflags="" suffix=""
- shift
- numeric-int64_is_int64_build && cflags=-DMKL_ILP64 && suffix="-int64"
-
- local IARCH=$(convert2intel_arch ${MULTIBUILD_ID})
-
- create_pkgconfig \
- --prefix "${INTEL_SDP_EDIR}/mkl" \
- --libdir "\${prefix}/lib/${IARCH}" \
- --includedir "\${prefix}/include" \
- --name ${pcname} \
- --libs "-L\${libdir} -L${INTEL_SDP_EDIR}/compiler/lib/${IARCH} $* -lpthread -lm" \
- --cflags "-I\${includedir} ${cflags}" \
- ${pcname}${suffix}
-}
-
-_mkl_add_alternative_provider() {
- local prov=$1; shift
- local alt
- for alt in $*; do
- NUMERIC_MODULE_NAME=${prov} \
- numeric-int64-multibuild_install_alternative ${alt} ${prov}
- done
-}
-
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_add_pc_file() {
- local bits=""
- [[ ${MULTIBUILD_ID} =~ amd64 ]] && bits=_lp64
- numeric-int64_is_int64_build && bits=_ilp64
-
- local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
- local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
-
- # blas lapack cblas lapacke
- _mkl_add_pc_file mkl-gfortran ${gf} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-intel ${intel} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-gfortran-openmp ${gf} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-gcc-openmp ${gc} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-intel-openmp ${intel} -lmkl_intel_thread ${core} -openmp
- _mkl_add_pc_file mkl-dynamic -lmkl_rt
- _mkl_add_pc_file mkl-dynamic-openmp -lmkl_rt -liomp5
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- _mkl_add_pc_file mkl-gfortran-blacs ${gf} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-gfortran-scalapack ${scal} ${gf} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-intel-blacs ${intel} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-intel-scalapack ${scal} ${intel} -lmkl_sequential ${core}
- _mkl_add_pc_file mkl-gfortran-openmp-blacs ${gf} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-gfortran-openmp-scalapack ${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-gcc-openmp-blacs ${gc} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-gcc-openmp-scalapack ${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp
- _mkl_add_pc_file mkl-intel-openmp-blacs ${intel} -lmkl_intel_thread ${core} -liomp5
- _mkl_add_pc_file mkl-intel-openmp-scalapack ${scal} ${intel} -lmkl_intel_thread ${core} -liomp5
- _mkl_add_pc_file mkl-dynamic-blacs -lmkl_rt ${blacs}
- _mkl_add_pc_file mkl-dynamic-scalapack ${scal} -lmkl_rt ${blacs}
- _mkl_add_pc_file mkl-dynamic-openmp-blacs -lmkl_rt ${blacs} -liomp5
- _mkl_add_pc_file mkl-dynamic-openmp-scalapack ${scal} -lmkl_rt ${blacs} -liomp5
-}
-
-mkl_add_alternative_provider() {
- # blas lapack cblas lapacke
- _mkl_add_alternative_provider mkl-gfortran blas lapack
- _mkl_add_alternative_provider mkl-intel blas lapack cblas lapacke
- _mkl_add_alternative_provider mkl-gfortran-openmp blas lapack
- _mkl_add_alternative_provider mkl-gcc-openmp cblas lapacke
- _mkl_add_alternative_provider mkl-intel-openmp blas lapack cblas lapacke
- _mkl_add_alternative_provider mkl-dynamic blas lapack cblas lapacke
- _mkl_add_alternative_provider mkl-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- _mkl_add_alternative_provider mkl-gfortran-blacs blacs
- _mkl_add_alternative_provider mkl-gfortran-scalapack scalapack
- _mkl_add_alternative_provider mkl-intel-blacs blacs
- _mkl_add_alternative_provider mkl-intel-scalapack scalapack
- _mkl_add_alternative_provider mkl-gfortran-openmp-blacs blacs
- _mkl_add_alternative_provider mkl-gfortran-openmp-scalapack scalapack
- _mkl_add_alternative_provider mkl-gcc-openmp-blacs blacs
- _mkl_add_alternative_provider mkl-gcc-openmp-scalapack scalapack
- _mkl_add_alternative_provider mkl-intel-openmp-blacs blacs
- _mkl_add_alternative_provider mkl-intel-openmp-scalapack scalapack
- _mkl_add_alternative_provider mkl-dynamic-blacs blacs
- _mkl_add_alternative_provider mkl-dynamic-scalapack scalapack
- _mkl_add_alternative_provider mkl-dynamic-openmp-blacs blacs
- _mkl_add_alternative_provider mkl-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- local IARCH
- local ldpath="LDPATH="
- intel-sdp_src_install
-
- numeric-int64-multibuild_foreach_all_abi_variants mkl_add_pc_file
- mkl_add_alternative_provider
-
- use abi_x86_64 && ldpath+=":${INTEL_SDP_EDIR}/mkl/lib/$(convert2intel_arch abi_x86_64)"
- use abi_x86_32 && ldpath+=":${INTEL_SDP_EDIR}/mkl/lib/$(convert2intel_arch abi_x86_32)"
-
- echo "${ldpath}" > "${T}"/35mkl || die
- doenvd "${T}"/35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.3.2.181.ebuild b/sci-libs/mkl/mkl-11.3.2.181.ebuild
index b4d1e6d39..b4b35f8b2 100644
--- a/sci-libs/mkl/mkl-11.3.2.181.ebuild
+++ b/sci-libs/mkl/mkl-11.3.2.181.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ inherit alternatives-2 intel-sdp-r1 numeric-int64-multibuild
DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-IUSE="doc examples linguas_ja mic"
+IUSE="doc examples l10n_ja mic"
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND=""
@@ -53,7 +53,7 @@ pkg_setup() {
"mkl-doc-11.3.2-181.noarch.rpm"
"mkl-ps-doc-11.3.2-181.noarch.rpm")
- if use linguas_ja; then
+ if use l10n_ja; then
INTEL_DIST_DAT_RPMS+=(
"mkl-ps-doc-jp-11.3.2-181.noarch.rpm")
fi
@@ -67,7 +67,7 @@ pkg_setup() {
"mkl-ps-tbb-mic-devel")
fi
- if use linguas_ja; then
+ if use l10n_ja; then
INTEL_DIST_BIN_RPMS+=(
"mkl-ps-jp")
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2016-07-18 11:23 Martin Mokrejs
0 siblings, 0 replies; 32+ messages in thread
From: Martin Mokrejs @ 2016-07-18 11:23 UTC (permalink / raw
To: gentoo-commits
commit: 407c00b518e4b4fcebed60aaf542c9877705a04d
Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Mon Jul 18 11:22:43 2016 +0000
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Mon Jul 18 11:22:43 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=407c00b5
sci-libs/mkl: non-maintainer commit, fixing issue #647
Package-Manager: portage-2.2.28
sci-libs/mkl/mkl-11.2.4.233.ebuild | 4 ++--
sci-libs/mkl/mkl-11.3.2.181.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/mkl/mkl-11.2.4.233.ebuild b/sci-libs/mkl/mkl-11.2.4.233.ebuild
index 8dd691d..0b65fc8 100644
--- a/sci-libs/mkl/mkl-11.2.4.233.ebuild
+++ b/sci-libs/mkl/mkl-11.2.4.233.ebuild
@@ -153,9 +153,9 @@ src_install() {
numeric-int64-multibuild_foreach_all_abi_variants mkl_add_pc_file
mkl_add_alternative_provider
- use abi_x86_64 && ldpath+="${INTEL_SDP_EDIR}/mkl/lib/$(convert2intel_arch abi_x86_64)"
+ use abi_x86_64 && ldpath+=":${INTEL_SDP_EDIR}/mkl/lib/$(convert2intel_arch abi_x86_64)"
use abi_x86_32 && ldpath+=":${INTEL_SDP_EDIR}/mkl/lib/$(convert2intel_arch abi_x86_32)"
- echo "${ldpath}" > "${T}"/35mkl || die
+ echo "${ldpath}" > "${T}"/35mkl || die
doenvd "${T}"/35mkl
}
diff --git a/sci-libs/mkl/mkl-11.3.2.181.ebuild b/sci-libs/mkl/mkl-11.3.2.181.ebuild
index 3584ed6..9504d44 100644
--- a/sci-libs/mkl/mkl-11.3.2.181.ebuild
+++ b/sci-libs/mkl/mkl-11.3.2.181.ebuild
@@ -189,9 +189,9 @@ src_install() {
numeric-int64-multibuild_foreach_all_abi_variants mkl_add_pc_file
mkl_add_alternative_provider
- use abi_x86_64 && ldpath+="$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
+ use abi_x86_64 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
use abi_x86_32 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_32)"
- echo "${ldpath}" > "${T}"/35mkl || die
+ echo "${ldpath}" > "${T}"/35mkl || die
doenvd "${T}"/35mkl
}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2016-02-22 8:10 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2016-02-22 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 4365a7e8057253240533488ba47502419d1488b6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 17:38:49 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 17:39:01 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4365a7e8
sci-libs/mkl: remove old 2015 ebuilds
Package-Manager: portage-2.2.27
sci-libs/mkl/mkl-11.2.0.090-r1.ebuild | 143 ---------------------------------
sci-libs/mkl/mkl-11.2.1.133-r1.ebuild | 145 ----------------------------------
sci-libs/mkl/mkl-11.2.2.164-r1.ebuild | 145 ----------------------------------
3 files changed, 433 deletions(-)
diff --git a/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild b/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild
deleted file mode 100644
index ee8fc54..0000000
--- a/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4584
-INTEL_DPV=2015
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-INTEL_SKIP_LICENSE=true
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
- mkl mkl-devel
- mkl-cluster mkl-cluster-devel
- mkl-f95-devel
- mkl-gnu mkl-gnu-devel
- mkl-pgi mkl-pgi-devel"
-# single arch packages
-# mkl-mic mkl-mic-devel
-# mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
- local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild b/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild
deleted file mode 100644
index 695a551..0000000
--- a/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4992
-INTEL_DPV=2015_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-INTEL_SKIP_LICENSE=true
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS=(
- mkl mkl-devel
- mkl-cluster mkl-cluster-devel
- mkl-f95-devel
- mkl-gnu mkl-gnu-devel
- mkl-pgi mkl-pgi-devel
- )
-INTEL_AMD64_RPMS=(
- mkl-mic mkl-mic-devel
- mkl-sp2dp mkl-sp2dp-devel
- )
-INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
- local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild b/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild
deleted file mode 100644
index 836b39d..0000000
--- a/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=5207
-INTEL_DPV=2015_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-INTEL_SKIP_LICENSE=true
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-15"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS=(
- mkl mkl-devel
- mkl-cluster mkl-cluster-devel
- mkl-f95-devel
- mkl-gnu mkl-gnu-devel
- mkl-pgi mkl-pgi-devel
- )
-INTEL_AMD64_RPMS=(
- mkl-mic mkl-mic-devel
- mkl-sp2dp mkl-sp2dp-devel
- )
-INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
- local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2016-02-22 8:10 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2016-02-22 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 88d2849dec7a6e6d712927c5d803bd452823afbb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 17:27:32 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 17:39:00 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=88d2849d
sci-libs/mkl: remove old 2013 SP1 ebuilds
Package-Manager: portage-2.2.27
sci-libs/mkl/mkl-11.1.0.080-r2.ebuild | 143 ----------------------------------
sci-libs/mkl/mkl-11.1.1.106-r1.ebuild | 143 ----------------------------------
sci-libs/mkl/mkl-11.1.2.144-r1.ebuild | 143 ----------------------------------
3 files changed, 429 deletions(-)
diff --git a/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild b/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild
deleted file mode 100644
index 2797c3b..0000000
--- a/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-INTEL_SKIP_LICENSE=true
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
- mkl mkl-devel
- mkl-cluster mkl-cluster-devel
- mkl-f95-devel
- mkl-gnu mkl-gnu-devel
- mkl-pgi mkl-pgi-devel"
-# single arch packages
-# mkl-mic mkl-mic-devel
-# mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
- local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild b/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild
deleted file mode 100644
index 9af2b40..0000000
--- a/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-INTEL_SKIP_LICENSE=true
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
- mkl mkl-devel
- mkl-cluster mkl-cluster-devel
- mkl-f95-devel
- mkl-gnu mkl-gnu-devel
- mkl-pgi mkl-pgi-devel"
-# single arch packages
-# mkl-mic mkl-mic-devel
-# mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
- local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild b/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild
deleted file mode 100644
index 713999d..0000000
--- a/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-INTEL_SKIP_LICENSE=true
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
- mkl mkl-devel
- mkl-cluster mkl-cluster-devel
- mkl-f95-devel
- mkl-gnu mkl-gnu-devel
- mkl-pgi mkl-pgi-devel"
-# single arch packages
-# mkl-mic mkl-mic-devel
-# mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
- local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2016-02-22 8:10 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2016-02-22 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 1389b7b08f7817bde5affa940d842ec4c67c1519
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 17:37:02 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 17:39:00 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1389b7b0
sci-libs/mkl: version bump to latest 2015 release
Package-Manager: portage-2.2.27
sci-libs/mkl/{mkl-11.2.3.187-r1.ebuild => mkl-11.2.4.233.ebuild} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild b/sci-libs/mkl/mkl-11.2.4.233.ebuild
similarity index 98%
rename from sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
rename to sci-libs/mkl/mkl-11.2.4.233.ebuild
index f92be09..8dd691d 100644
--- a/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
+++ b/sci-libs/mkl/mkl-11.2.4.233.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
INTEL_DPN=parallel_studio_xe
-INTEL_DID=7538
-INTEL_DPV=2015_update3
+INTEL_DID=8470
+INTEL_DPV=2015_update6
INTEL_SUBDIR=composerxe
INTEL_SINGLE_ARCH=false
INTEL_SKIP_LICENSE=true
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2016-02-19 10:12 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2016-02-19 10:12 UTC (permalink / raw
To: gentoo-commits
commit: 66ff6de2e71ced15a357e56c428c342b0a8af6bd
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 20:58:15 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 09:56:10 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=66ff6de2
sci-libs/mkl: version bump
* EAPI=6
* update to intel-sdp-r1.eclass
Package-Manager: portage-2.2.27
sci-libs/mkl/metadata.xml | 3 +
sci-libs/mkl/mkl-11.3.2.181.ebuild | 197 +++++++++++++++++++++++++++++++++++++
2 files changed, 200 insertions(+)
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 0fff21e..8e7ff6c 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -16,4 +16,7 @@
<use>
<flag name="int64">Build the 64 bits integer library</flag>
</use>
+ <use>
+ <flag name="mic">Install the libraries needed for supporting Intel Many Integrated Core (Xeon Phi)</flag>
+ </use>
</pkgmetadata>
diff --git a/sci-libs/mkl/mkl-11.3.2.181.ebuild b/sci-libs/mkl/mkl-11.3.2.181.ebuild
new file mode 100644
index 0000000..3584ed6
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.3.2.181.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+INTEL_DIST_SKU=8676
+INTEL_DIST_PV=2016_update2
+INTEL_SKIP_LICENSE=true
+
+NUMERIC_MODULE_NAME=${PN}
+
+inherit alternatives-2 intel-sdp-r1 numeric-int64-multibuild
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE="doc examples linguas_ja mic"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-16[${MULTILIB_USEDEP},mic?]"
+
+CHECKREQS_DISK_BUILD=3500M
+
+INTEL_DIST_BIN_RPMS=(
+ "mkl"
+ "mkl-devel"
+ "mkl-gnu"
+ "mkl-gnu-devel"
+ "mkl-ps"
+ "mkl-ps-f95-devel"
+ "mkl-ps-gnu"
+ "mkl-ps-gnu-devel"
+ "mkl-ps-pgi"
+ "mkl-ps-pgi-devel"
+ "mkl-ps-ss-tbb"
+ "mkl-ps-ss-tbb-devel")
+INTEL_DIST_X86_RPMS=()
+INTEL_DIST_AMD64_RPMS=(
+ "mkl-ps-cluster"
+ "mkl-ps-cluster-devel"
+ "mkl-sp2dp"
+ "mkl-sp2dp-devel")
+INTEL_DIST_DAT_RPMS=(
+ "mkl-common"
+ "mkl-ps-cluster-common"
+ "mkl-ps-common"
+ "mkl-ps-f95-common")
+
+pkg_setup() {
+ if use doc; then
+ INTEL_DIST_DAT_RPMS+=(
+ "mkl-doc-11.3.2-181.noarch.rpm"
+ "mkl-ps-doc-11.3.2-181.noarch.rpm")
+
+ if use linguas_ja; then
+ INTEL_DIST_DAT_RPMS+=(
+ "mkl-ps-doc-jp-11.3.2-181.noarch.rpm")
+ fi
+ fi
+
+ if use mic; then
+ INTEL_DIST_AMD64_RPMS+=(
+ "mkl-ps-mic"
+ "mkl-ps-mic-devel"
+ "mkl-ps-tbb-mic"
+ "mkl-ps-tbb-mic-devel")
+ fi
+
+ if use linguas_ja; then
+ INTEL_DIST_BIN_RPMS+=(
+ "mkl-ps-jp")
+
+ INTEL_DIST_DAT_RPMS+=(
+ "mkl-ps-common-jp")
+
+ if use mic; then
+ INTEL_DIST_AMD64_RPMS+=(
+ "mkl-ps-mic-jp")
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+ chmod u+w -R opt || die
+}
+
+_mkl_add_pc_file() {
+ local pcname=${1} cflags="" suffix=""
+ shift
+ numeric-int64_is_int64_build && cflags=-DMKL_ILP64 && suffix="-int64"
+
+ local IARCH=$(isdp_convert2intel-arch ${MULTIBUILD_ID})
+
+ create_pkgconfig \
+ --prefix "$(isdp_get-sdp-edir)/linux/mkl" \
+ --libdir "\${prefix}/lib/${IARCH}" \
+ --includedir "\${prefix}/include" \
+ --name ${pcname} \
+ --libs "-L\${libdir} -L$(isdp_get-sdp-edir)/linux/compiler/lib/${IARCH} $* -lpthread -lm" \
+ --cflags "-I\${includedir} ${cflags}" \
+ ${pcname}${suffix}
+}
+
+_mkl_add_alternative_provider() {
+ local prov=$1; shift
+ local alt
+ for alt in $*; do
+ NUMERIC_MODULE_NAME=${prov} \
+ numeric-int64-multibuild_install_alternative ${alt} ${prov}
+ done
+}
+
+# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
+mkl_add_pc_file() {
+ local bits=""
+ [[ ${MULTIBUILD_ID} =~ amd64 ]] && bits=_lp64
+ numeric-int64_is_int64_build && bits=_ilp64
+
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+
+ # blas lapack cblas lapacke
+ _mkl_add_pc_file mkl-gfortran ${gf} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-intel ${intel} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-gfortran-openmp ${gf} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-gcc-openmp ${gc} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-intel-openmp ${intel} -lmkl_intel_thread ${core} -openmp
+ _mkl_add_pc_file mkl-dynamic -lmkl_rt
+ _mkl_add_pc_file mkl-dynamic-openmp -lmkl_rt -liomp5
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ _mkl_add_pc_file mkl-gfortran-blacs ${gf} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-gfortran-scalapack ${scal} ${gf} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-intel-blacs ${intel} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-intel-scalapack ${scal} ${intel} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-gfortran-openmp-blacs ${gf} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-gfortran-openmp-scalapack ${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-gcc-openmp-blacs ${gc} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-gcc-openmp-scalapack ${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-intel-openmp-blacs ${intel} -lmkl_intel_thread ${core} -liomp5
+ _mkl_add_pc_file mkl-intel-openmp-scalapack ${scal} ${intel} -lmkl_intel_thread ${core} -liomp5
+ _mkl_add_pc_file mkl-dynamic-blacs -lmkl_rt ${blacs}
+ _mkl_add_pc_file mkl-dynamic-scalapack ${scal} -lmkl_rt ${blacs}
+ _mkl_add_pc_file mkl-dynamic-openmp-blacs -lmkl_rt ${blacs} -liomp5
+ _mkl_add_pc_file mkl-dynamic-openmp-scalapack ${scal} -lmkl_rt ${blacs} -liomp5
+}
+
+mkl_add_alternative_provider() {
+ # blas lapack cblas lapacke
+ _mkl_add_alternative_provider mkl-gfortran blas lapack
+ _mkl_add_alternative_provider mkl-intel blas lapack cblas lapacke
+ _mkl_add_alternative_provider mkl-gfortran-openmp blas lapack
+ _mkl_add_alternative_provider mkl-gcc-openmp cblas lapacke
+ _mkl_add_alternative_provider mkl-intel-openmp blas lapack cblas lapacke
+ _mkl_add_alternative_provider mkl-dynamic blas lapack cblas lapacke
+ _mkl_add_alternative_provider mkl-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ _mkl_add_alternative_provider mkl-gfortran-blacs blacs
+ _mkl_add_alternative_provider mkl-gfortran-scalapack scalapack
+ _mkl_add_alternative_provider mkl-intel-blacs blacs
+ _mkl_add_alternative_provider mkl-intel-scalapack scalapack
+ _mkl_add_alternative_provider mkl-gfortran-openmp-blacs blacs
+ _mkl_add_alternative_provider mkl-gfortran-openmp-scalapack scalapack
+ _mkl_add_alternative_provider mkl-gcc-openmp-blacs blacs
+ _mkl_add_alternative_provider mkl-gcc-openmp-scalapack scalapack
+ _mkl_add_alternative_provider mkl-intel-openmp-blacs blacs
+ _mkl_add_alternative_provider mkl-intel-openmp-scalapack scalapack
+ _mkl_add_alternative_provider mkl-dynamic-blacs blacs
+ _mkl_add_alternative_provider mkl-dynamic-scalapack scalapack
+ _mkl_add_alternative_provider mkl-dynamic-openmp-blacs blacs
+ _mkl_add_alternative_provider mkl-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ local IARCH
+ local ldpath="LDPATH="
+ intel-sdp-r1_src_install
+
+ numeric-int64-multibuild_foreach_all_abi_variants mkl_add_pc_file
+ mkl_add_alternative_provider
+
+ use abi_x86_64 && ldpath+="$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_64)"
+ use abi_x86_32 && ldpath+=":$(isdp_get-sdp-edir)/linux/mkl/lib/$(isdp_convert2intel-arch abi_x86_32)"
+
+ echo "${ldpath}" > "${T}"/35mkl || die
+ doenvd "${T}"/35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2015-12-27 16:19 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2015-12-27 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 1a7d2ff6d7c7473e44b2d76e954a4b279b083a09
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 16:15:52 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 16:15:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1a7d2ff6
sci-libs/mkl: Update link flags according to intel's suggestions
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=568826
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../{mkl-11.1.0.080-r1.ebuild => mkl-11.1.0.080-r2.ebuild} | 11 ++++++-----
.../mkl/{mkl-11.1.1.106.ebuild => mkl-11.1.1.106-r1.ebuild} | 11 ++++++-----
.../mkl/{mkl-11.1.2.144.ebuild => mkl-11.1.2.144-r1.ebuild} | 11 ++++++-----
.../mkl/{mkl-11.1.3.174.ebuild => mkl-11.1.3.174-r1.ebuild} | 11 ++++++-----
.../mkl/{mkl-11.2.0.090.ebuild => mkl-11.2.0.090-r1.ebuild} | 11 ++++++-----
.../mkl/{mkl-11.2.1.133.ebuild => mkl-11.2.1.133-r1.ebuild} | 11 ++++++-----
.../mkl/{mkl-11.2.2.164.ebuild => mkl-11.2.2.164-r1.ebuild} | 9 +++++----
.../mkl/{mkl-11.2.3.187.ebuild => mkl-11.2.3.187-r1.ebuild} | 9 +++++----
8 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild b/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild
similarity index 92%
rename from sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
rename to sci-libs/mkl/mkl-11.1.0.080-r2.ebuild
index 8b879a7..a3aa36a 100644
--- a/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
+++ b/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -70,7 +70,8 @@ mkl_prof() {
bits=_lp64
[[ ${1} == int64 ]] && bits=_ilp64
fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
local intel="-Wl,--start-group -lmkl_intel${bits}"
local core="-lmkl_core -Wl,--end-group"
local prof=mkl${IARCH:((${#IARCH} - 2)):2}
@@ -83,7 +84,7 @@ mkl_prof() {
mkl_add_prof ${prof}-intel blas lapack cblas lapacke
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp cblas lapacke
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
@@ -109,9 +110,9 @@ mkl_prof() {
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
mkl_add_prof ${prof}-intel-openmp-blacs blacs
diff --git a/sci-libs/mkl/mkl-11.1.1.106.ebuild b/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild
similarity index 92%
rename from sci-libs/mkl/mkl-11.1.1.106.ebuild
rename to sci-libs/mkl/mkl-11.1.1.106-r1.ebuild
index 4597661..305bd04 100644
--- a/sci-libs/mkl/mkl-11.1.1.106.ebuild
+++ b/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -70,7 +70,8 @@ mkl_prof() {
bits=_lp64
[[ ${1} == int64 ]] && bits=_ilp64
fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
local intel="-Wl,--start-group -lmkl_intel${bits}"
local core="-lmkl_core -Wl,--end-group"
local prof=mkl${IARCH:((${#IARCH} - 2)):2}
@@ -83,7 +84,7 @@ mkl_prof() {
mkl_add_prof ${prof}-intel blas lapack cblas lapacke
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp cblas lapacke
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
@@ -109,9 +110,9 @@ mkl_prof() {
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
mkl_add_prof ${prof}-intel-openmp-blacs blacs
diff --git a/sci-libs/mkl/mkl-11.1.2.144.ebuild b/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild
similarity index 92%
rename from sci-libs/mkl/mkl-11.1.2.144.ebuild
rename to sci-libs/mkl/mkl-11.1.2.144-r1.ebuild
index dfc9397..a02e270 100644
--- a/sci-libs/mkl/mkl-11.1.2.144.ebuild
+++ b/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -70,7 +70,8 @@ mkl_prof() {
bits=_lp64
[[ ${1} == int64 ]] && bits=_ilp64
fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
local intel="-Wl,--start-group -lmkl_intel${bits}"
local core="-lmkl_core -Wl,--end-group"
local prof=mkl${IARCH:((${#IARCH} - 2)):2}
@@ -83,7 +84,7 @@ mkl_prof() {
mkl_add_prof ${prof}-intel blas lapack cblas lapacke
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp cblas lapacke
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
@@ -109,9 +110,9 @@ mkl_prof() {
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
mkl_add_prof ${prof}-intel-openmp-blacs blacs
diff --git a/sci-libs/mkl/mkl-11.1.3.174.ebuild b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild
similarity index 92%
rename from sci-libs/mkl/mkl-11.1.3.174.ebuild
rename to sci-libs/mkl/mkl-11.1.3.174-r1.ebuild
index 48b7d8d..8bb1117 100644
--- a/sci-libs/mkl/mkl-11.1.3.174.ebuild
+++ b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -70,7 +70,8 @@ mkl_prof() {
bits=_lp64
[[ ${1} == int64 ]] && bits=_ilp64
fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
local intel="-Wl,--start-group -lmkl_intel${bits}"
local core="-lmkl_core -Wl,--end-group"
local prof=mkl${IARCH:((${#IARCH} - 2)):2}
@@ -83,7 +84,7 @@ mkl_prof() {
mkl_add_prof ${prof}-intel blas lapack cblas lapacke
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp cblas lapacke
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
@@ -109,9 +110,9 @@ mkl_prof() {
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
mkl_add_prof ${prof}-intel-openmp-blacs blacs
diff --git a/sci-libs/mkl/mkl-11.2.0.090.ebuild b/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild
similarity index 92%
rename from sci-libs/mkl/mkl-11.2.0.090.ebuild
rename to sci-libs/mkl/mkl-11.2.0.090-r1.ebuild
index 2197e24..6143bdb 100644
--- a/sci-libs/mkl/mkl-11.2.0.090.ebuild
+++ b/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -70,7 +70,8 @@ mkl_prof() {
bits=_lp64
[[ ${1} == int64 ]] && bits=_ilp64
fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
local intel="-Wl,--start-group -lmkl_intel${bits}"
local core="-lmkl_core -Wl,--end-group"
local prof=mkl${IARCH:((${#IARCH} - 2)):2}
@@ -83,7 +84,7 @@ mkl_prof() {
mkl_add_prof ${prof}-intel blas lapack cblas lapacke
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp cblas lapacke
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
@@ -109,9 +110,9 @@ mkl_prof() {
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
mkl_add_prof ${prof}-intel-openmp-blacs blacs
diff --git a/sci-libs/mkl/mkl-11.2.1.133.ebuild b/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild
similarity index 92%
rename from sci-libs/mkl/mkl-11.2.1.133.ebuild
rename to sci-libs/mkl/mkl-11.2.1.133-r1.ebuild
index 8899ce5..6b1187a 100644
--- a/sci-libs/mkl/mkl-11.2.1.133.ebuild
+++ b/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -72,7 +72,8 @@ mkl_prof() {
bits=_lp64
[[ ${1} == int64 ]] && bits=_ilp64
fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
local intel="-Wl,--start-group -lmkl_intel${bits}"
local core="-lmkl_core -Wl,--end-group"
local prof=mkl${IARCH:((${#IARCH} - 2)):2}
@@ -85,7 +86,7 @@ mkl_prof() {
mkl_add_prof ${prof}-intel blas lapack cblas lapacke
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp cblas lapacke
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
@@ -111,9 +112,9 @@ mkl_prof() {
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
mkl_add_prof ${prof}-intel-openmp-blacs blacs
diff --git a/sci-libs/mkl/mkl-11.2.2.164.ebuild b/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild
similarity index 93%
rename from sci-libs/mkl/mkl-11.2.2.164.ebuild
rename to sci-libs/mkl/mkl-11.2.2.164-r1.ebuild
index 8ead60b..c8281f3 100644
--- a/sci-libs/mkl/mkl-11.2.2.164.ebuild
+++ b/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild
@@ -72,7 +72,8 @@ mkl_prof() {
bits=_lp64
[[ ${1} == int64 ]] && bits=_ilp64
fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
local intel="-Wl,--start-group -lmkl_intel${bits}"
local core="-lmkl_core -Wl,--end-group"
local prof=mkl${IARCH:((${#IARCH} - 2)):2}
@@ -85,7 +86,7 @@ mkl_prof() {
mkl_add_prof ${prof}-intel blas lapack cblas lapacke
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp cblas lapacke
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
@@ -111,9 +112,9 @@ mkl_prof() {
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
mkl_add_prof ${prof}-intel-openmp-blacs blacs
diff --git a/sci-libs/mkl/mkl-11.2.3.187.ebuild b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
similarity index 93%
rename from sci-libs/mkl/mkl-11.2.3.187.ebuild
rename to sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
index 66b8ce6..77a85b5 100644
--- a/sci-libs/mkl/mkl-11.2.3.187.ebuild
+++ b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
@@ -72,7 +72,8 @@ mkl_prof() {
bits=_lp64
[[ ${1} == int64 ]] && bits=_ilp64
fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
local intel="-Wl,--start-group -lmkl_intel${bits}"
local core="-lmkl_core -Wl,--end-group"
local prof=mkl${IARCH:((${#IARCH} - 2)):2}
@@ -85,7 +86,7 @@ mkl_prof() {
mkl_add_prof ${prof}-intel blas lapack cblas lapacke
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp cblas lapacke
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
@@ -111,9 +112,9 @@ mkl_prof() {
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
mkl_add_prof ${prof}-intel-openmp-blacs blacs
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2015-12-27 16:19 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2015-12-27 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 869afac343923dc6dda4ec194dea7e43e28b8213
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 16:19:43 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 16:19:43 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=869afac3
sci-libs/mkl: Use numeric eclasses
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/mkl/metadata.xml | 3 +
sci-libs/mkl/mkl-11.2.3.187-r1.ebuild | 184 ++++++++++++++++++----------------
2 files changed, 103 insertions(+), 84 deletions(-)
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index cb75c05..a5d2014 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -10,4 +10,7 @@
capacities. The package is installed as binary and has a restrictive
license. Please see license terms and home page for proper use.
</longdescription>
+ <use>
+ <flag name="int64">Build the 64 bits integer library</flag>
+ </use>
</pkgmetadata>
diff --git a/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
index 77a85b5..59efa7b 100644
--- a/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
+++ b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
@@ -10,7 +10,9 @@ INTEL_DPV=2015_update3
INTEL_SUBDIR=composerxe
INTEL_SINGLE_ARCH=false
-inherit intel-sdp multilib alternatives-2
+NUMERIC_MODULE_NAME=${PN}
+
+inherit alternatives-2 intel-sdp numeric-int64-multibuild
DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
@@ -34,111 +36,125 @@ INTEL_AMD64_RPMS=(
mkl-mic mkl-mic-devel
mkl-sp2dp mkl-sp2dp-devel
)
-INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
+INTEL_DAT_RPMS=(
+ mkl-common
+ mkl-cluster-common
+ mkl-f95-common
+ )
+
+pkg_setup() {
+ intel-sdp_pkg_setup
+}
src_prepare() {
- chmod u+w -R opt
+ chmod u+w -R opt || die
}
-mkl_add_prof() {
- local pcname=${1} libs cflags x
+_mkl_add_pc_file() {
+ local pcname=${1} cflags="" suffix=""
shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -L\${libdir_comp} ${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
+ numeric-int64_is_int64_build && cflags=-DMKL_ILP64 && suffix="-int64"
+
+ local IARCH=$(convert2intel_arch ${MULTIBUILD_ID})
+
+ create_pkgconfig \
+ --prefix "${INTEL_SDP_EDIR}/mkl" \
+ --libdir "\${prefix}/lib/${IARCH}" \
+ --includedir "\${prefix}/include" \
+ --name ${pcname} \
+ --libs "-L\${libdir} -L${INTEL_SDP_EDIR}/compiler/lib/${IARCH} $* -lpthread -lm" \
+ --cflags "-I\${includedir} ${cflags}" \
+ ${pcname}${suffix}
+}
+
+_mkl_add_alternative_provider() {
+ local prov=$1; shift
+ local alt
+ for alt in $*; do
+ NUMERIC_MODULE_NAME=${prov} \
+ numeric-int64-multibuild_install_alternative ${alt} ${prov}
done
}
-# mkl_prof [_ilp64 or _lp64]
# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
+mkl_add_pc_file() {
local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
+ [[ ${MULTIBUILD_ID} =~ amd64 ]] && bits=_lp64
+ numeric-int64_is_int64_build && bits=_ilp64
+
local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
local intel="-Wl,--start-group -lmkl_intel${bits}"
local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blas lapack cblas lapacke
+ _mkl_add_pc_file mkl-gfortran ${gf} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-intel ${intel} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-gfortran-openmp ${gf} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-gcc-openmp ${gc} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-intel-openmp ${intel} -lmkl_intel_thread ${core} -openmp
+ _mkl_add_pc_file mkl-dynamic -lmkl_rt
+ _mkl_add_pc_file mkl-dynamic-openmp -lmkl_rt -liomp5
# blacs and scalapack
local scal="-lmkl_scalapack${bits:-_core}"
local blacs="-lmkl_blacs_intelmpi${bits}"
core="-lmkl_core ${blacs} -Wl,--end-group"
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+ _mkl_add_pc_file mkl-gfortran-blacs ${gf} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-gfortran-scalapack ${scal} ${gf} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-intel-blacs ${intel} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-intel-scalapack ${scal} ${intel} -lmkl_sequential ${core}
+ _mkl_add_pc_file mkl-gfortran-openmp-blacs ${gf} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-gfortran-openmp-scalapack ${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-gcc-openmp-blacs ${gc} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-gcc-openmp-scalapack ${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp
+ _mkl_add_pc_file mkl-intel-openmp-blacs ${intel} -lmkl_intel_thread ${core} -liomp5
+ _mkl_add_pc_file mkl-intel-openmp-scalapack ${scal} ${intel} -lmkl_intel_thread ${core} -liomp5
+ _mkl_add_pc_file mkl-dynamic-blacs -lmkl_rt ${blacs}
+ _mkl_add_pc_file mkl-dynamic-scalapack ${scal} -lmkl_rt ${blacs}
+ _mkl_add_pc_file mkl-dynamic-openmp-blacs -lmkl_rt ${blacs} -liomp5
+ _mkl_add_pc_file mkl-dynamic-openmp-scalapack ${scal} -lmkl_rt ${blacs} -liomp5
+}
+
+mkl_add_alternative_provider() {
+ # blas lapack cblas lapacke
+ _mkl_add_alternative_provider mkl-gfortran blas lapack
+ _mkl_add_alternative_provider mkl-intel blas lapack cblas lapacke
+ _mkl_add_alternative_provider mkl-gfortran-openmp blas lapack
+ _mkl_add_alternative_provider mkl-gcc-openmp cblas lapacke
+ _mkl_add_alternative_provider mkl-intel-openmp blas lapack cblas lapacke
+ _mkl_add_alternative_provider mkl-dynamic blas lapack cblas lapacke
+ _mkl_add_alternative_provider mkl-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ _mkl_add_alternative_provider mkl-gfortran-blacs blacs
+ _mkl_add_alternative_provider mkl-gfortran-scalapack scalapack
+ _mkl_add_alternative_provider mkl-intel-blacs blacs
+ _mkl_add_alternative_provider mkl-intel-scalapack scalapack
+ _mkl_add_alternative_provider mkl-gfortran-openmp-blacs blacs
+ _mkl_add_alternative_provider mkl-gfortran-openmp-scalapack scalapack
+ _mkl_add_alternative_provider mkl-gcc-openmp-blacs blacs
+ _mkl_add_alternative_provider mkl-gcc-openmp-scalapack scalapack
+ _mkl_add_alternative_provider mkl-intel-openmp-blacs blacs
+ _mkl_add_alternative_provider mkl-intel-openmp-scalapack scalapack
+ _mkl_add_alternative_provider mkl-dynamic-blacs blacs
+ _mkl_add_alternative_provider mkl-dynamic-scalapack scalapack
+ _mkl_add_alternative_provider mkl-dynamic-openmp-blacs blacs
+ _mkl_add_alternative_provider mkl-dynamic-openmp-scalapack scalapack
}
src_install() {
+ local IARCH
+ local ldpath="LDPATH="
intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
+
+ numeric-int64-multibuild_foreach_all_abi_variants mkl_add_pc_file
+ mkl_add_alternative_provider
+
+ use abi_x86_64 && ldpath+="${INTEL_SDP_EDIR}/mkl/lib/$(convert2intel_arch abi_x86_64)"
+ use abi_x86_32 && ldpath+=":${INTEL_SDP_EDIR}/mkl/lib/$(convert2intel_arch abi_x86_32)"
+
+ echo "${ldpath}" > "${T}"/35mkl || die
+ doenvd "${T}"/35mkl
}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2015-06-24 9:51 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2015-06-24 9:51 UTC (permalink / raw
To: gentoo-commits
commit: 44261c7ef62679b231e17d42e64d9734ba8f2bf6
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 09:44:33 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 09:51:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=44261c7e
sci-libs/mkl: Version Bump, bug #552296
Package-Manager: portage-2.2.20
sci-libs/mkl/ChangeLog | 5 ++
sci-libs/mkl/mkl-11.2.3.187.ebuild | 143 +++++++++++++++++++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 15a1473..d7ad029 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.2.3.187 (24 Jun 2015)
+
+ 24 Jun 2015; Justin Lecher <jlec@gentoo.org> +mkl-11.2.3.187.ebuild:
+ sci-libs/mkl: Version Bump, bug #552296
+
*mkl-11.2.2.164 (12 Feb 2015)
12 Feb 2015; Justin Lecher <jlec@gentoo.org> +mkl-11.2.2.164.ebuild:
diff --git a/sci-libs/mkl/mkl-11.2.3.187.ebuild b/sci-libs/mkl/mkl-11.2.3.187.ebuild
new file mode 100644
index 0000000..a890016
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.2.3.187.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=7538
+INTEL_DPV=2015_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-15"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS=(
+ mkl mkl-devel
+ mkl-cluster mkl-cluster-devel
+ mkl-f95-devel
+ mkl-gnu mkl-gnu-devel
+ mkl-pgi mkl-pgi-devel
+ )
+INTEL_AMD64_RPMS=(
+ mkl-mic mkl-mic-devel
+ mkl-sp2dp mkl-sp2dp-devel
+ )
+INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+ includedir=\${prefix}/include
+ Name: ${pcname}
+ Description: ${DESCRIPTION}
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2015-02-12 8:51 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2015-02-12 8:51 UTC (permalink / raw
To: gentoo-commits
commit: f2e4307235ee0ba095c4214c2551c2d2cf18f4a0
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 12 08:55:33 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 12 08:55:33 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f2e43072
sci-libs/mkl: Version Bump
Package-Manager: portage-2.2.17
---
sci-libs/mkl/ChangeLog | 7 +-
sci-libs/mkl/mkl-11.2.2.164.ebuild | 143 +++++++++++++++++++++++++++++++++++++
2 files changed, 149 insertions(+), 1 deletion(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 1b3083e..6d2a9a9 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for sci-libs/mkl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.2.2.164 (12 Feb 2015)
+
+ 12 Feb 2015; Justin Lecher <jlec@gentoo.org> +mkl-11.2.2.164.ebuild:
+ sci-libs/mkl: Version Bump
+
*mkl-11.2.1.133 (02 Dec 2014)
02 Dec 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.2.1.133.ebuild:
diff --git a/sci-libs/mkl/mkl-11.2.2.164.ebuild b/sci-libs/mkl/mkl-11.2.2.164.ebuild
new file mode 100644
index 0000000..3707c39
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.2.2.164.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=5207
+INTEL_DPV=2015_update2
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-15"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS=(
+ mkl mkl-devel
+ mkl-cluster mkl-cluster-devel
+ mkl-f95-devel
+ mkl-gnu mkl-gnu-devel
+ mkl-pgi mkl-pgi-devel
+ )
+INTEL_AMD64_RPMS=(
+ mkl-mic mkl-mic-devel
+ mkl-sp2dp mkl-sp2dp-devel
+ )
+INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+ includedir=\${prefix}/include
+ Name: ${pcname}
+ Description: ${DESCRIPTION}
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2014-12-02 15:36 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2014-12-02 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 59d6e547b5d17fe1df8d4282165acecd9ab9c66e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 2 15:35:40 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 2 15:35:40 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=59d6e547
sci-libs/mkl: Version BUmp
Package-Manager: portage-2.2.14
---
sci-libs/mkl/ChangeLog | 5 ++
sci-libs/mkl/mkl-11.2.1.133.ebuild | 143 +++++++++++++++++++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index c3073a9..1b3083e 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.2.1.133 (02 Dec 2014)
+
+ 02 Dec 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.2.1.133.ebuild:
+ Version BUmp
+
*mkl-11.2.0.090 (15 Sep 2014)
15 Sep 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.2.0.090.ebuild:
diff --git a/sci-libs/mkl/mkl-11.2.1.133.ebuild b/sci-libs/mkl/mkl-11.2.1.133.ebuild
new file mode 100644
index 0000000..758d040
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.2.1.133.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=4992
+INTEL_DPV=2015_update1
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS=(
+ mkl mkl-devel
+ mkl-cluster mkl-cluster-devel
+ mkl-f95-devel
+ mkl-gnu mkl-gnu-devel
+ mkl-pgi mkl-pgi-devel
+ )
+INTEL_AMD64_RPMS=(
+ mkl-mic mkl-mic-devel
+ mkl-sp2dp mkl-sp2dp-devel
+ )
+INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+ includedir=\${prefix}/include
+ Name: ${pcname}
+ Description: ${DESCRIPTION}
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2014-09-16 8:28 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2014-09-16 8:28 UTC (permalink / raw
To: gentoo-commits
commit: 06acda4893972f9c2979a60fb773e52c685e8034
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 15 18:10:34 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 07:53:42 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=06acda48
sci-libs/mkl: Version Bump
Package-Manager: portage-2.2.12
---
sci-libs/mkl/ChangeLog | 5 ++
sci-libs/mkl/mkl-11.2.0.090.ebuild | 141 +++++++++++++++++++++++++++++++++++++
2 files changed, 146 insertions(+)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 839e6eb..c3073a9 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.2.0.090 (15 Sep 2014)
+
+ 15 Sep 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.2.0.090.ebuild:
+ Version Bump
+
*mkl-11.1.3.174 (02 Jun 2014)
02 Jun 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.1.3.174.ebuild:
diff --git a/sci-libs/mkl/mkl-11.2.0.090.ebuild b/sci-libs/mkl/mkl-11.2.0.090.ebuild
new file mode 100644
index 0000000..a8298e4
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.2.0.090.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=4584
+INTEL_DPV=2015
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+ mkl mkl-devel
+ mkl-cluster mkl-cluster-devel
+ mkl-f95-devel
+ mkl-gnu mkl-gnu-devel
+ mkl-pgi mkl-pgi-devel"
+# single arch packages
+# mkl-mic mkl-mic-devel
+# mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+ includedir=\${prefix}/include
+ Name: ${pcname}
+ Description: ${DESCRIPTION}
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2014-06-03 7:06 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2014-06-03 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 104b8024a37672dd91774c7aeb7b743196b6cb78
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 2 11:33:44 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 3 06:19:01 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=104b8024
sci-libs/mkl: Version Bump
Package-Manager: portage-2.2.10
---
sci-libs/mkl/ChangeLog | 5 ++
sci-libs/mkl/mkl-11.1.3.174.ebuild | 141 +++++++++++++++++++++++++++++++++++++
2 files changed, 146 insertions(+)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 5d8927c..839e6eb 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.1.3.174 (02 Jun 2014)
+
+ 02 Jun 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.1.3.174.ebuild:
+ Version Bump
+
*mkl-11.1.2.144 (24 Mar 2014)
24 Mar 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.1.2.144.ebuild:
diff --git a/sci-libs/mkl/mkl-11.1.3.174.ebuild b/sci-libs/mkl/mkl-11.1.3.174.ebuild
new file mode 100644
index 0000000..b4dd5d3
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.1.3.174.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=4220
+INTEL_DPV=2013_sp1_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+ mkl mkl-devel
+ mkl-cluster mkl-cluster-devel
+ mkl-f95-devel
+ mkl-gnu mkl-gnu-devel
+ mkl-pgi mkl-pgi-devel"
+# single arch packages
+# mkl-mic mkl-mic-devel
+# mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+ includedir=\${prefix}/include
+ Name: ${pcname}
+ Description: ${DESCRIPTION}
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2014-03-24 18:19 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2014-03-24 18:19 UTC (permalink / raw
To: gentoo-commits
commit: 1df79bc3b7be7fe913d5d223616b3a88603b1554
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 24 18:14:25 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar 24 18:14:25 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1df79bc3
sci-libs/mkl: Version Bump
Package-Manager: portage-2.2.9-r1
---
sci-libs/mkl/ChangeLog | 5 ++
sci-libs/mkl/mkl-11.1.2.144.ebuild | 141 +++++++++++++++++++++++++++++++++++++
2 files changed, 146 insertions(+)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 230741e..5d8927c 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.1.2.144 (24 Mar 2014)
+
+ 24 Mar 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.1.2.144.ebuild:
+ Version Bump
+
*mkl-11.1.1.106 (21 Feb 2014)
21 Feb 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.1.1.106.ebuild:
diff --git a/sci-libs/mkl/mkl-11.1.2.144.ebuild b/sci-libs/mkl/mkl-11.1.2.144.ebuild
new file mode 100644
index 0000000..e78e1b1
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.1.2.144.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3949
+INTEL_DPV=2013_sp1_update2
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+ mkl mkl-devel
+ mkl-cluster mkl-cluster-devel
+ mkl-f95-devel
+ mkl-gnu mkl-gnu-devel
+ mkl-pgi mkl-pgi-devel"
+# single arch packages
+# mkl-mic mkl-mic-devel
+# mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+ includedir=\${prefix}/include
+ Name: ${pcname}
+ Description: ${DESCRIPTION}
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2014-02-21 16:19 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2014-02-21 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 567d134fd96c6186a454c998dcac4d3c8c3a3125
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 16:18:11 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 16:18:11 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=567d134f
sci-libs/mkl: Version Bump, #500386
Package-Manager: portage-2.2.8-r1
---
sci-libs/mkl/ChangeLog | 7 +-
sci-libs/mkl/mkl-11.1.1.106.ebuild | 141 +++++++++++++++++++++++++++++++++++++
2 files changed, 147 insertions(+), 1 deletion(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index c5a87f8..230741e 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for sci-libs/mkl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.1.1.106 (21 Feb 2014)
+
+ 21 Feb 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.1.1.106.ebuild:
+ Version Bump, #500386
+
08 Dec 2013; Justin Lecher <jlec@gentoo.org> -mkl-11.0.3.163.ebuild,
-mkl-11.0.5.192.ebuild, -mkl-11.1.0.080.ebuild, +mkl-11.1.0.080-r1.ebuild:
Fix linking problems with openmp support, #492802; thanks Andrew Savchenko
diff --git a/sci-libs/mkl/mkl-11.1.1.106.ebuild b/sci-libs/mkl/mkl-11.1.1.106.ebuild
new file mode 100644
index 0000000..bb977cb
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.1.1.106.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3644
+INTEL_DPV=2013_sp1_update1
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+ mkl mkl-devel
+ mkl-cluster mkl-cluster-devel
+ mkl-f95-devel
+ mkl-gnu mkl-gnu-devel
+ mkl-pgi mkl-pgi-devel"
+# single arch packages
+# mkl-mic mkl-mic-devel
+# mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+ includedir=\${prefix}/include
+ Name: ${pcname}
+ Description: ${DESCRIPTION}
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -L\${libdir_comp} ${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2013-12-08 17:31 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2013-12-08 17:31 UTC (permalink / raw
To: gentoo-commits
commit: 4bb5bbc94c8fb5ee9e69843bae39435b709348db
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 8 13:36:46 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 8 13:36:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4bb5bbc9
sci-libs/mkl: Fix linking problems with openmp support, #492802; thanks Andrew Savchenko for the patch
Package-Manager: portage-2.2.7
---
sci-libs/mkl/ChangeLog | 5 +
sci-libs/mkl/mkl-11.0.3.163.ebuild | 131 ---------------------
sci-libs/mkl/mkl-11.0.5.192.ebuild | 131 ---------------------
...-11.1.0.080.ebuild => mkl-11.1.0.080-r1.ebuild} | 3 +-
4 files changed, 7 insertions(+), 263 deletions(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index ce281d4..907a304 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Dec 2013; Justin Lecher <jlec@gentoo.org> -mkl-11.0.3.163.ebuild,
+ -mkl-11.0.5.192.ebuild, -mkl-11.1.0.080.ebuild, +mkl-11.1.0.080-r1.ebuild:
+ Fix linking problems with openmp support, #492802; thanks Andrew Savchenko
+ for the patch
+
*mkl-11.1.0.080 (02 Oct 2013)
02 Oct 2013; Justin Lecher <jlec@gentoo.org> +mkl-11.1.0.080.ebuild:
diff --git a/sci-libs/mkl/mkl-11.0.3.163.ebuild b/sci-libs/mkl/mkl-11.0.3.163.ebuild
deleted file mode 100644
index fee4df0..0000000
--- a/sci-libs/mkl/mkl-11.0.3.163.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="mkl mkl-devel"
-INTEL_DAT_RPMS="mkl-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- includedir=\${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.0.5.192.ebuild b/sci-libs/mkl/mkl-11.0.5.192.ebuild
deleted file mode 100644
index 8476f94..0000000
--- a/sci-libs/mkl/mkl-11.0.5.192.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3266
-INTEL_DPV=2013_update4
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="mkl mkl-devel"
-INTEL_DAT_RPMS="mkl-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- includedir=\${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.1.0.080.ebuild b/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
similarity index 97%
rename from sci-libs/mkl/mkl-11.1.0.080.ebuild
rename to sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
index c674527..7f8eb07 100644
--- a/sci-libs/mkl/mkl-11.1.0.080.ebuild
+++ b/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
@@ -45,12 +45,13 @@ mkl_add_prof() {
cat <<-EOF > ${pcname}.pc
prefix=${INTEL_SDP_EDIR}/mkl
libdir=\${prefix}/lib/${IARCH}
+ libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
includedir=\${prefix}/include
Name: ${pcname}
Description: ${DESCRIPTION}
Version: ${PV}
URL: ${HOMEPAGE}
- Libs: -L\${libdir} ${libs}
+ Libs: -L\${libdir} -L\${libdir_comp} ${libs}
Cflags: -I\${includedir} ${cflags}
EOF
insinto /usr/$(get_libdir)/pkgconfig
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2013-10-02 14:26 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2013-10-02 14:26 UTC (permalink / raw
To: gentoo-commits
commit: 2cc9d558f938e76e75c7576f48276542a5a40286
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 2 14:13:57 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Oct 2 14:26:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2cc9d558
sci-libs/mkl: Version Bump
Package-Manager: portage-2.2.7
---
sci-libs/mkl/ChangeLog | 5 ++
sci-libs/mkl/mkl-11.1.0.080.ebuild | 140 +++++++++++++++++++++++++++++++++++++
2 files changed, 145 insertions(+)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 627b3ef..ce281d4 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.1.0.080 (02 Oct 2013)
+
+ 02 Oct 2013; Justin Lecher <jlec@gentoo.org> +mkl-11.1.0.080.ebuild:
+ Version Bump
+
*mkl-11.0.5.192 (14 Jul 2013)
14 Jul 2013; Justin Lecher <jlec@gentoo.org> +mkl-11.0.5.192.ebuild,
diff --git a/sci-libs/mkl/mkl-11.1.0.080.ebuild b/sci-libs/mkl/mkl-11.1.0.080.ebuild
new file mode 100644
index 0000000..c674527
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.1.0.080.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3447
+INTEL_DPV=2013_sp1
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+ mkl mkl-devel
+ mkl-cluster mkl-cluster-devel
+ mkl-f95-devel
+ mkl-gnu mkl-gnu-devel
+ mkl-pgi mkl-pgi-devel"
+# single arch packages
+# mkl-mic mkl-mic-devel
+# mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ includedir=\${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2013-05-25 4:40 Sebastien Fabbro
0 siblings, 0 replies; 32+ messages in thread
From: Sebastien Fabbro @ 2013-05-25 4:40 UTC (permalink / raw
To: gentoo-commits
commit: f196902d41eda6af3d346303a76957bdb4e49cc8
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 03:48:30 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat May 25 03:48:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f196902d
removed old
---
sci-libs/mkl/metadata.xml | 4 +-
sci-libs/mkl/mkl-11.0.0.079.ebuild | 131 ------------------------------------
sci-libs/mkl/mkl-11.0.2.146.ebuild | 131 ------------------------------------
3 files changed, 2 insertions(+), 264 deletions(-)
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index cb75c05..89e096c 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
The Intel(R) Math Kernel Library is a mathematical library mostly
optimized for Intel processors (also works on AMDs). It contains BLAS
and LAPACK implementations, Fast Fourier Transforms, a vector math
diff --git a/sci-libs/mkl/mkl-11.0.0.079.ebuild b/sci-libs/mkl/mkl-11.0.0.079.ebuild
deleted file mode 100644
index 4ef1967..0000000
--- a/sci-libs/mkl/mkl-11.0.0.079.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-12"
-
-CHECKREQS_DISK_BUILD=2300M
-
-INTEL_BIN_RPMS="mkl mkl-devel"
-INTEL_DAT_RPMS="mkl-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- includedir=\${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.0.2.146.ebuild b/sci-libs/mkl/mkl-11.0.2.146.ebuild
deleted file mode 100644
index 2408ad7..0000000
--- a/sci-libs/mkl/mkl-11.0.2.146.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2987
-INTEL_DPV=2013_update2
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="mkl mkl-devel"
-INTEL_DAT_RPMS="mkl-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- includedir=\${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2013-05-02 14:19 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2013-05-02 14:19 UTC (permalink / raw
To: gentoo-commits
commit: 04367338fa5cd12484d39c5d91162f2820db28ff
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 14:19:39 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu May 2 14:19:39 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=04367338
sci-libs/mkl: Version Bump
Package-Manager: portage-2.2.0_alpha173
---
sci-libs/mkl/ChangeLog | 5 ++
sci-libs/mkl/mkl-11.0.3.163.ebuild | 131 ++++++++++++++++++++++++++++++++++++
2 files changed, 136 insertions(+), 0 deletions(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 83c216d..72df03b 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.0.3.163 (02 May 2013)
+
+ 02 May 2013; Justin Lecher <jlec@gentoo.org> +mkl-11.0.3.163.ebuild:
+ Version Bump
+
*mkl-11.0.2.146 (14 Feb 2013)
14 Feb 2013; Justin Lecher <jlec@gentoo.org> -mkl-11.0.1.117.ebuild,
diff --git a/sci-libs/mkl/mkl-11.0.3.163.ebuild b/sci-libs/mkl/mkl-11.0.3.163.ebuild
new file mode 100644
index 0000000..fee4df0
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.0.3.163.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3078
+INTEL_DPV=2013_update3
+INTEL_SUBDIR=composerxe
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="mkl mkl-devel"
+INTEL_DAT_RPMS="mkl-common"
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ includedir=\${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2013-02-14 16:37 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2013-02-14 16:37 UTC (permalink / raw
To: gentoo-commits
commit: d2c9596e23b19479b16f30befa055d38aa269452
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 16:37:45 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 16:37:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2c9596e
sci-libs/mkl: Version Bump
Package-Manager: portage-2.2.0_alpha163
---
sci-libs/mkl/ChangeLog | 6 ++++++
...mkl-11.0.1.117.ebuild => mkl-11.0.2.146.ebuild} | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 76d7c7f..83c216d 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.0.2.146 (14 Feb 2013)
+
+ 14 Feb 2013; Justin Lecher <jlec@gentoo.org> -mkl-11.0.1.117.ebuild,
+ +mkl-11.0.2.146.ebuild:
+ Version Bump
+
14 Feb 2013; Justin Lecher <jlec@gentoo.org> mkl-11.0.0.079.ebuild,
mkl-11.0.1.117.ebuild:
Add KEYWORDS, #342185
diff --git a/sci-libs/mkl/mkl-11.0.1.117.ebuild b/sci-libs/mkl/mkl-11.0.2.146.ebuild
similarity index 98%
rename from sci-libs/mkl/mkl-11.0.1.117.ebuild
rename to sci-libs/mkl/mkl-11.0.2.146.ebuild
index 5ec66b3..2408ad7 100644
--- a/sci-libs/mkl/mkl-11.0.1.117.ebuild
+++ b/sci-libs/mkl/mkl-11.0.2.146.ebuild
@@ -2,11 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
INTEL_DPN=parallel_studio_xe
-INTEL_DID=2872
-INTEL_DPV=2013_update1
+INTEL_DID=2987
+INTEL_DPV=2013_update2
INTEL_SUBDIR=composerxe
inherit intel-sdp multilib alternatives-2
@@ -20,7 +20,7 @@ KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND=""
RDEPEND=">=dev-libs/intel-common-13"
-CHECKREQS_DISK_BUILD=2300M
+CHECKREQS_DISK_BUILD=2500M
INTEL_BIN_RPMS="mkl mkl-devel"
INTEL_DAT_RPMS="mkl-common"
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2012-12-10 21:29 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2012-12-10 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 024746b53a5a6e1f003924e5de925275ecf0574c
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 10 19:22:58 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Dec 10 19:22:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=024746b5
sci-libs/mkl: Version BUmp
Package-Manager: portage-2.2.0_alpha144
---
sci-libs/mkl/ChangeLog | 6 ++
sci-libs/mkl/metadata.xml | 4 +-
sci-libs/mkl/mkl-11.0.1.117.ebuild | 130 ++++++++++++++++++++++++++++++++++++
3 files changed, 138 insertions(+), 2 deletions(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 89747cf..e841b42 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.0.1.117 (10 Dec 2012)
+
+ 10 Dec 2012; Justin Lecher <jlec@gentoo.org> +mkl-11.0.1.117.ebuild,
+ metadata.xml:
+ Version BUmp
+
27 Oct 2012; Justin Lecher <jlec@gentoo.org> mkl-11.0.0.079.ebuild,
metadata.xml:
Fix size of builddir
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 784a7cb..cb75c05 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
The Intel(R) Math Kernel Library is a mathematical library mostly
optimized for Intel processors (also works on AMDs). It contains BLAS
and LAPACK implementations, Fast Fourier Transforms, a vector math
diff --git a/sci-libs/mkl/mkl-11.0.1.117.ebuild b/sci-libs/mkl/mkl-11.0.1.117.ebuild
new file mode 100644
index 0000000..89a1f0b
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.0.1.117.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=2872
+INTEL_DPV=2013_update1
+INTEL_SUBDIR=composerxe
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2300M
+
+INTEL_BIN_RPMS="mkl mkl-devel"
+INTEL_DAT_RPMS="mkl-common"
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ includedir=\${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2012-10-27 9:04 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2012-10-27 9:04 UTC (permalink / raw
To: gentoo-commits
commit: 07e7c873ae052571ed3348954af797c32fc0224c
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 09:03:45 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 09:03:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=07e7c873
sci-libs/mkl: Fix size of builddir
Package-Manager: portage-2.2.0_alpha142
---
sci-libs/mkl/ChangeLog | 4 ++++
sci-libs/mkl/metadata.xml | 4 ++--
sci-libs/mkl/mkl-11.0.0.079.ebuild | 9 +--------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index f298a3f..89747cf 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 27 Oct 2012; Justin Lecher <jlec@gentoo.org> mkl-11.0.0.079.ebuild,
+ metadata.xml:
+ Fix size of builddir
+
*mkl-11.0.0.079 (29 Sep 2012)
29 Sep 2012; Sébastien Fabbro <bicatali@gentoo.org> +mkl-11.0.0.079.ebuild,
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 89e096c..784a7cb 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
The Intel(R) Math Kernel Library is a mathematical library mostly
optimized for Intel processors (also works on AMDs). It contains BLAS
and LAPACK implementations, Fast Fourier Transforms, a vector math
diff --git a/sci-libs/mkl/mkl-11.0.0.079.ebuild b/sci-libs/mkl/mkl-11.0.0.079.ebuild
index 54aa193..eaedbe3 100644
--- a/sci-libs/mkl/mkl-11.0.0.079.ebuild
+++ b/sci-libs/mkl/mkl-11.0.0.079.ebuild
@@ -19,14 +19,7 @@ IUSE=""
DEPEND=""
RDEPEND=">=dev-libs/intel-common-12"
-QA_PREBUILT="
- ${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=1536M
+CHECKREQS_DISK_BUILD=2300M
INTEL_BIN_RPMS="mkl mkl-devel"
INTEL_DAT_RPMS="mkl-common"
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2012-09-29 23:23 Sebastien Fabbro
0 siblings, 0 replies; 32+ messages in thread
From: Sebastien Fabbro @ 2012-09-29 23:23 UTC (permalink / raw
To: gentoo-commits
commit: 66c3fb0e158b26528698505e080e9b0bb11e6924
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 29 23:21:34 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Sep 29 23:21:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=66c3fb0e
sci-libs/mkl: Version bump
(Portage version: 2.2.0_alpha133/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/mkl/ChangeLog | 7 +-
sci-libs/mkl/mkl-10.3.7.256.ebuild | 136 --------------------
...mkl-10.3.4.191.ebuild => mkl-11.0.0.079.ebuild} | 9 +-
3 files changed, 11 insertions(+), 141 deletions(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 487c897..f298a3f 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mkl-11.0.0.079 (29 Sep 2012)
+
+ 29 Sep 2012; Sébastien Fabbro <bicatali@gentoo.org> +mkl-11.0.0.079.ebuild,
+ -mkl-10.3.4.191.ebuild, -mkl-10.3.7.256.ebuild:
+ sci-libs/mkl: Version bump
+
*mkl-10.3.7.256 (16 Feb 2012)
16 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> +mkl-10.3.7.256.ebuild:
@@ -24,4 +30,3 @@
03 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> mkl-10.3.0.084.ebuild:
Version bump. refactored ebuilds
-
diff --git a/sci-libs/mkl/mkl-10.3.7.256.ebuild b/sci-libs/mkl/mkl-10.3.7.256.ebuild
deleted file mode 100644
index 2e5cb62..0000000
--- a/sci-libs/mkl/mkl-10.3.7.256.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2405
-INTEL_DPV=2011_sp1_update1
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-12"
-
-QA_PREBUILT="
- ${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=1536M
-
-INTEL_BIN_RPMS="mkl-sp1 mkl-sp1-devel"
-INTEL_DAT_RPMS="mkl-sp1-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- includedir=\${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-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-10.3.4.191.ebuild b/sci-libs/mkl/mkl-11.0.0.079.ebuild
similarity index 97%
rename from sci-libs/mkl/mkl-10.3.4.191.ebuild
rename to sci-libs/mkl/mkl-11.0.0.079.ebuild
index a2634cf..54aa193 100644
--- a/sci-libs/mkl/mkl-10.3.4.191.ebuild
+++ b/sci-libs/mkl/mkl-11.0.0.079.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
+
INTEL_DPN=parallel_studio_xe
-INTEL_DID=2158
-INTEL_DPV=2011_update2
+INTEL_DID=2749
+INTEL_DPV=2013
INTEL_SUBDIR=composerxe
inherit intel-sdp multilib alternatives-2
@@ -25,7 +26,7 @@ QA_PREBUILT="
${INTEL_SDP_DIR}/mkl/benchmarks/linpack/*
${INTEL_SDP_DIR}/mkl/benchmarks/mp_linpack/*/*/*"
-CHECKREQS_DISK_BUILD=1536
+CHECKREQS_DISK_BUILD=1536M
INTEL_BIN_RPMS="mkl mkl-devel"
INTEL_DAT_RPMS="mkl-common"
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2012-02-16 22:35 Sebastien Fabbro
0 siblings, 0 replies; 32+ messages in thread
From: Sebastien Fabbro @ 2012-02-16 22:35 UTC (permalink / raw
To: gentoo-commits
commit: d88ce5b1da1076c390b541e5babd03de220dd7b7
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Thu Feb 16 21:57:43 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 21:57:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d88ce5b1
add units
---
sci-libs/mkl/mkl-10.3.7.256.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sci-libs/mkl/mkl-10.3.7.256.ebuild b/sci-libs/mkl/mkl-10.3.7.256.ebuild
index a7be7b5..2e5cb62 100644
--- a/sci-libs/mkl/mkl-10.3.7.256.ebuild
+++ b/sci-libs/mkl/mkl-10.3.7.256.ebuild
@@ -25,7 +25,7 @@ QA_PREBUILT="
${INTEL_SDP_DIR}/mkl/benchmarks/linpack/*
${INTEL_SDP_DIR}/mkl/benchmarks/mp_linpack/*/*/*"
-CHECKREQS_DISK_BUILD=1536
+CHECKREQS_DISK_BUILD=1536M
INTEL_BIN_RPMS="mkl-sp1 mkl-sp1-devel"
INTEL_DAT_RPMS="mkl-sp1-common"
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2012-02-16 22:35 Sebastien Fabbro
0 siblings, 0 replies; 32+ messages in thread
From: Sebastien Fabbro @ 2012-02-16 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 30dd86ddc27c2973024acd298cce60627c4ae87e
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Thu Feb 16 21:50:59 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 21:50:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=30dd86dd
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: $
+*mkl-10.3.7.256 (16 Feb 2012)
+
+ 16 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> +mkl-10.3.7.256.ebuild:
+ Version bump
+
*mkl-10.3.4.191 (22 Aug 2011)
22 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> +mkl-10.3.4.191.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=4
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=2405
+INTEL_DPV=2011_sp1_update1
+INTEL_SUBDIR=composerxe
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-12"
+
+QA_PREBUILT="
+ ${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=1536
+
+INTEL_BIN_RPMS="mkl-sp1 mkl-sp1-devel"
+INTEL_DAT_RPMS="mkl-sp1-common"
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ includedir=\${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
@ 2011-08-22 19:26 Sebastien Fabbro
0 siblings, 0 replies; 32+ messages in thread
From: Sebastien Fabbro @ 2011-08-22 19:26 UTC (permalink / raw
To: gentoo-commits
commit: c64ec5ef4c3b2bd84a69bdf5958299984ce2916a
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Mon Aug 22 18:52:06 2011 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 18:52:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c64ec5ef
added mkl
---
sci-libs/mkl/ChangeLog | 22 ++++++
sci-libs/mkl/metadata.xml | 13 ++++
sci-libs/mkl/mkl-10.3.4.191.ebuild | 136 ++++++++++++++++++++++++++++++++++++
3 files changed, 171 insertions(+), 0 deletions(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
new file mode 100644
index 0000000..8d71418
--- /dev/null
+++ b/sci-libs/mkl/ChangeLog
@@ -0,0 +1,22 @@
+# ChangeLog for sci-libs/mkl
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mkl-10.3.4.191 (22 Aug 2011)
+
+ 22 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> +mkl-10.3.4.191.ebuild,
+ +metadata.xml:
+ Imported from bicatali overlay
+
+ 06 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> mkl-10.3.4.191.ebuild:
+ Reworked all profile generation
+
+ 30 May 2011; Sébastien Fabbro <bicatali@gentoo.org> mkl-10.3.4.191.ebuild:
+ Bump
+
+ 23 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> mkl-10.3.2.137.ebuild:
+ Bump and switched to alternatives-2 framework
+
+ 03 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> mkl-10.3.0.084.ebuild:
+ Version bump. refactored ebuilds
+
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
new file mode 100644
index 0000000..89e096c
--- /dev/null
+++ b/sci-libs/mkl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+ The Intel(R) Math Kernel Library is a mathematical library mostly
+ optimized for Intel processors (also works on AMDs). It contains BLAS
+ and LAPACK implementations, Fast Fourier Transforms, a vector math
+ library, and random number generators. It also has multiprocessor
+ capacities. The package is installed as binary and has a restrictive
+ license. Please see license terms and home page for proper use.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-libs/mkl/mkl-10.3.4.191.ebuild b/sci-libs/mkl/mkl-10.3.4.191.ebuild
new file mode 100644
index 0000000..a2634cf
--- /dev/null
+++ b/sci-libs/mkl/mkl-10.3.4.191.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=2158
+INTEL_DPV=2011_update2
+INTEL_SUBDIR=composerxe
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-12"
+
+QA_PREBUILT="
+ ${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=1536
+
+INTEL_BIN_RPMS="mkl mkl-devel"
+INTEL_DAT_RPMS="mkl-common"
+
+src_prepare() {
+ chmod u+w -R opt
+}
+
+mkl_add_prof() {
+ local pcname=${1} libs cflags x
+ shift
+ [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+ cat <<-EOF > ${pcname}.pc
+ prefix=${INTEL_SDP_EDIR}/mkl
+ libdir=\${prefix}/lib/${IARCH}
+ includedir=\${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-advisor/
+mkl_prof() {
+ local bits=""
+ if [[ ${IARCH} == intel64 ]]; then
+ bits=_lp64
+ [[ ${1} == int64 ]] && bits=_ilp64
+ fi
+ local gf="-Wl,--start-group -lmkl_gf${bits}"
+ local intel="-Wl,--start-group -lmkl_intel${bits}"
+ local core="-lmkl_core -Wl,--end-group"
+ local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+ [[ ${1} == int64 ]] && prof=${prof}-int64
+ local libs
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran blas lapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp blas lapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+ libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+ libs="-lmkl_rt -lpthread" \
+ mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+ libs="-lmkl_rt -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+ # blacs and scalapack
+ local scal="-lmkl_scalapack${bits:-_core}"
+ local blacs="-lmkl_blacs_intelmpi${bits}"
+ core="-lmkl_core ${blacs} -Wl,--end-group"
+
+ libs="${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-blacs blacs
+ libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-gfortran-scalapack scalapack
+ libs="${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-blacs blacs
+ libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+ mkl_add_prof ${prof}-intel-scalapack scalapack
+ libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+ libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+ libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+ libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-blacs blacs
+ libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+ mkl_add_prof ${prof}-dynamic-scalapack scalapack
+ libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+ libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+ mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+ intel-sdp_src_install
+ echo -n > 35mkl "LDPATH="
+ for IARCH in ${INTEL_ARCH}; do
+ mkl_prof
+ sed -i -e '/mkl/s/$/:/' 35mkl
+ echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+ [[ ${IARCH} == intel64 ]] && mkl_prof int64
+ done
+ echo >> 35mkl
+ doenvd 35mkl
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread
end of thread, other threads:[~2020-11-09 7:41 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-14 10:35 [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2020-11-09 7:41 Benda XU
2020-05-05 6:30 Matthias Maier
2019-05-25 6:36 Matthias Maier
2018-04-03 16:44 Matthias Maier
2018-04-03 16:44 Matthias Maier
2018-01-27 13:57 Justin Lecher
2016-07-18 11:23 Martin Mokrejs
2016-02-22 8:10 Justin Lecher
2016-02-22 8:10 Justin Lecher
2016-02-22 8:10 Justin Lecher
2016-02-19 10:12 Justin Lecher
2015-12-27 16:19 Justin Lecher
2015-12-27 16:19 Justin Lecher
2015-06-24 9:51 Justin Lecher
2015-02-12 8:51 Justin Lecher
2014-12-02 15:36 Justin Lecher
2014-09-16 8:28 Justin Lecher
2014-06-03 7:06 Justin Lecher
2014-03-24 18:19 Justin Lecher
2014-02-21 16:19 Justin Lecher
2013-12-08 17:31 Justin Lecher
2013-10-02 14:26 Justin Lecher
2013-05-25 4:40 Sebastien Fabbro
2013-05-02 14:19 Justin Lecher
2013-02-14 16:37 Justin Lecher
2012-12-10 21:29 Justin Lecher
2012-10-27 9:04 Justin Lecher
2012-09-29 23:23 Sebastien Fabbro
2012-02-16 22:35 Sebastien Fabbro
2012-02-16 22:35 Sebastien Fabbro
2011-08-22 19:26 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox