* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2015-12-29 10:02 Justin Lecher
0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2015-12-29 10:02 UTC (permalink / raw
To: gentoo-commits
commit: 0684bbcc349805c36386ba78ac688882a4b6d7c3
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 09:12:54 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 10:01:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0684bbcc
sci-libs/mkl: Bump to EAPI=5
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/mkl/mkl-10.0.5.025.ebuild | 61 ++++++++++++++++++++------------------
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild
index 794d067..4978b61 100644
--- a/sci-libs/mkl/mkl-10.0.5.025.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025.ebuild
@@ -2,7 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-inherit eutils fortran-2 multilib toolchain-funcs check-reqs
+EAPI=5
+
+inherit check-reqs eutils fortran-2 multilib toolchain-funcs
PID=1232
PB=${PN}
@@ -11,10 +13,11 @@ DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, math functions"
HOMEPAGE="http://developer.intel.com/software/products/mkl/"
SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/l_${PN}_p_${PV}.tgz"
-KEYWORDS="-* amd64 ~ia64 x86"
SLOT="0"
LICENSE="Intel-SDP"
+KEYWORDS="-* amd64 ~ia64 x86"
IUSE="doc fftw fortran95 int64 mpi"
+
RESTRICT="strip mirror"
DEPEND="
@@ -28,8 +31,7 @@ RDEPEND="${DEPEND}
MKL_DIR=/opt/intel/${PN}/${PV}
INTEL_LIC_DIR=/opt/intel/licenses
-QA_EXECSTACK="opt/intel/${PN}/${PV}/*"
-QA_TEXTRELS="opt/intel/${PN}/${PV}/*"
+QA_PREBUILT="opt/intel/${PN}/${PV}/*"
get_fcomp() {
case $(tc-getFC) in
@@ -86,12 +88,10 @@ pkg_setup() {
get_fcomp
}
-src_unpack() {
-
- unpack ${A}
- cd l_${PN}_*_${PV}/install
+src_prepare() {
+ cd l_${PN}_*_${PV}/install || die
- cp ${MKL_LICENSE} "${WORKDIR}"/
+ cp ${MKL_LICENSE} "${WORKDIR}"/ || die
MKL_LIC="$(basename ${MKL_LICENSE})"
# binary blob extractor installs rpm leftovers in /opt/intel
@@ -123,12 +123,12 @@ src_unpack() {
die "extracting failed"
fi
# remove left over
- rm -f /opt/intel/.*mkl*.log /opt/intel/intel_sdp_products.db
+ rm -f /opt/intel/.*mkl*.log /opt/intel/intel_sdp_products.db || die
# remove unused stuff and set up intel names
- rm -rf "${WORKDIR}"/l_*
+ rm -rf "${WORKDIR}"/l_* || die
- cd "${S}"
+ cd "${S}" || die
# allow openmpi to work
epatch "${FILESDIR}"/${PN}-10.0.2.018-openmpi.patch
# make scalapack tests work for gfortran
@@ -136,17 +136,17 @@ src_unpack() {
case ${ARCH} in
x86) MKL_ARCH=32
MKL_KERN=ia32
- rm -rf lib*/{em64t,64}
+ rm -rf lib*/{em64t,64} || die
;;
amd64) MKL_ARCH=em64t
MKL_KERN=em64t
- rm -rf lib*/{32,64}
+ rm -rf lib*/{32,64} || die
;;
ia64) MKL_ARCH=64
MKL_KERN=ipf
- rm -rf lib*/{32,em64t}
+ rm -rf lib*/{32,em64t} || die
;;
esac
MKL_LIBDIR=${MKL_DIR}/lib/${MKL_ARCH}
@@ -157,7 +157,7 @@ src_unpack() {
}
src_compile() {
- cd "${S}"/interfaces
+ cd "${S}"/interfaces || die
if use fortran95; then
einfo "Compiling fortan95 static lib wrappers"
local myconf="lib${MKL_ARCH}"
@@ -168,10 +168,11 @@ src_compile() {
[[ $(tc-getFC) =~ gfortran ]] && \
myconf="${myconf} FOPTS=-fdefault-integer-8"
fi
+ local x
for x in blas95 lapack95; do
- pushd ${x}
- emake ${myconf} || die "emake ${x} failed"
- popd
+ pushd ${x} > /dev/null || die
+ emake ${myconf}
+ popd > /dev/null || die
done
fi
@@ -183,10 +184,11 @@ src_compile() {
myconf="${myconf} mpi=${MKL_MPI}"
fi
einfo "Compiling fftw static lib wrappers"
+ local x
for x in ${fftwdirs}; do
- pushd ${x}
- emake ${myconf} || die "emake ${x} failed"
- popd
+ pushd ${x} > /dev/null || die
+ emake ${myconf}
+ popd > /dev/null || die
done
fi
}
@@ -214,7 +216,7 @@ src_test() {
}
mkl_make_generic_profile() {
- cd "${S}"
+ cd "${S}" || die
# produce eselect files
# don't make them in FILESDIR, it changes every major version
cat > eselect.blas <<-EOF
@@ -237,8 +239,9 @@ mkl_make_generic_profile() {
# usage: mkl_add_profile <profile> <interface_lib> <thread_lib> <rtl_lib>
mkl_add_profile() {
- cd "${S}"
+ cd "${S}" || die
local prof=${1}
+ local x
for x in blas cblas lapack; do
cat > ${x}-${prof}.pc <<-EOF
prefix=${MKL_DIR}
@@ -265,7 +268,7 @@ mkl_add_profile() {
insinto ${MKL_LIBDIR}
for x in blas cblas lapack; do
doins ${x}-${prof}.pc
- cp eselect.${x} eselect.${x}.${prof}
+ cp eselect.${x} eselect.${x}.${prof} || die
echo "${MKL_LIBDIR}/${x}-${prof}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc" \
>> eselect.${x}.${prof}
eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
@@ -273,12 +276,12 @@ mkl_add_profile() {
}
mkl_make_profiles() {
- local clib
- has_version 'dev-lang/ifc' && clib="intel"
- built_with_use sys-devel/gcc fortran && clib="${clib} gf"
+ local clib="gf"
+ has_version 'dev-lang/ifc' && clib+=" intel"
local slib="-lmkl_sequential"
local rlib="-liomp5"
local pbase=${PN}
+ local c
for c in ${clib}; do
local ilib="-lmkl_${c}_lp64"
use x86 && ilib="-lmkl_${c}"
@@ -324,7 +327,7 @@ src_install() {
LDPATH=${MKL_LIBDIR}
MANPATH=${MKL_DIR}/man
EOF
- doenvd 35mkl || die "doenvd failed"
+ doenvd 35mkl
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2016-03-02 20:44 Justin Lecher
0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2016-03-02 20:44 UTC (permalink / raw
To: gentoo-commits
commit: 392cd06ebc6ac9fc6a93f70e975b39c51f039a8e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 20:16:22 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 20:44:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=392cd06e
sci-libs/mkl: Properly check for free disk space
Gentoo-Bugs: https://bugs.gentoo.org/show_bug.cgi?id=576044
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/mkl/mkl-10.0.5.025.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild
index 4978b61..f49e232 100644
--- a/sci-libs/mkl/mkl-10.0.5.025.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025.ebuild
@@ -31,6 +31,8 @@ RDEPEND="${DEPEND}
MKL_DIR=/opt/intel/${PN}/${PV}
INTEL_LIC_DIR=/opt/intel/licenses
+CHECKREQS_DISK_BUILD=3500M
+
QA_PREBUILT="opt/intel/${PN}/${PV}/*"
get_fcomp() {
@@ -45,6 +47,7 @@ get_fcomp() {
}
pkg_setup() {
+ check-reqs_pkg_setup
fortran-2_pkg_setup
# Check the license
if [[ -z ${MKL_LICENSE} ]]; then
@@ -89,6 +92,8 @@ pkg_setup() {
}
src_prepare() {
+ check-reqs_src_prepare
+
cd l_${PN}_*_${PV}/install || die
cp ${MKL_LICENSE} "${WORKDIR}"/ || die
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2016-08-23 8:44 David Seifert
0 siblings, 0 replies; 19+ messages in thread
From: David Seifert @ 2016-08-23 8:44 UTC (permalink / raw
To: gentoo-commits
commit: f01785c65dbcc8af9a890b335be4baaaaed6df03
Author: Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Mon Aug 22 09:55:07 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 08:43:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f01785c6
sci-libs/mkl: revbump: Ported EAPI from 5 to 6
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2095
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/mkl/mkl-10.0.5.025-r1.ebuild | 367 ++++++++++++++++++++++++++++++++++
1 file changed, 367 insertions(+)
diff --git a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
new file mode 100644
index 0000000..5fba1a1
--- /dev/null
+++ b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit check-reqs fortran-2 toolchain-funcs
+
+PID=1232
+PB=${PN}
+P_ARCHIVE=l_${PN}_p_${PV}
+
+DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://developer.intel.com/software/products/mkl/"
+SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${P_ARCHIVE}.tgz"
+
+SLOT="0"
+LICENSE="Intel-SDP"
+KEYWORDS="-* ~amd64 ~ia64 ~x86"
+IUSE="doc fftw fortran95 int64 mpi"
+
+RESTRICT="strip mirror"
+
+DEPEND="
+ app-eselect/eselect-blas
+ app-eselect/eselect-cblas
+ app-eselect/eselect-lapack"
+RDEPEND="${DEPEND}
+ doc? ( app-doc/blas-docs app-doc/lapack-docs )
+ mpi? ( virtual/mpi )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0.2.018-openmpi.patch # allow openmpi to work
+)
+
+MKL_DIR=/opt/intel/${PN}/${PV}
+INTEL_LIC_DIR=/opt/intel/licenses
+
+CHECKREQS_DISK_BUILD=3500M
+
+QA_PREBUILT="opt/intel/${PN}/${PV}/*"
+
+get_fcomp() {
+ case $(tc-getFC) in
+ *gfortran* )
+ FCOMP="gfortran" ;;
+ ifort )
+ FCOMP="ifc" ;;
+ * )
+ FCOMP=$(tc-getFC) ;;
+ esac
+}
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ fortran-2_pkg_setup
+ # Check the license
+ if [[ -z ${MKL_LICENSE} ]]; then
+ MKL_LICENSE="$(grep -ls MKern ${ROOT}${INTEL_LIC_DIR}/* | tail -n 1)"
+ MKL_LICENSE=${MKL_LICENSE/${ROOT}/}
+ fi
+ if [[ -z ${MKL_LICENSE} ]]; then
+ eerror "Did not find any valid mkl license."
+ eerror "Register at ${HOMEPAGE} to receive a license"
+ eerror "and place it in ${INTEL_LIC_DIR} or run:"
+ eerror "export MKL_LICENSE=/my/license/file emerge mkl"
+ die "license setup failed"
+ fi
+
+ # Check if we have enough free diskspace to install
+ CHECKREQS_DISK_BUILD="1100M"
+ check-reqs_pkg_setup
+
+ # Check and setup fortran
+ if use fortran95; then
+ # blas95 and lapack95 don't compile with gfortran < 4.2
+ [[ $(tc-getFC) =~ (gfortran|g77) ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] &&
+ die "blas95 and lapack95 don't compile with gfortran < 4.2"
+ fi
+ MKL_FC="gnu"
+ [[ $(tc-getFC) =~ if ]] && MKL_FC="intel"
+
+ # build profiles according to what compiler is installed
+ MKL_CC="gnu"
+ [[ $(tc-getCC) == icc ]] && MKL_CC="intel"
+
+ if has_version sys-cluster/mpich; then
+ MKL_MPI=mpich
+ elif has_version sys-cluster/mpich2; then
+ MKL_MPI=mpich2
+ elif has_version sys-cluster/openmpi; then
+ MKL_MPI=openmpi
+ else
+ MKL_MPI=intelmpi
+ fi
+ get_fcomp
+}
+
+src_unpack () {
+ default
+ cd "${WORKDIR}/${P_ARCHIVE}"/install || die
+
+ cp ${MKL_LICENSE} "${WORKDIR}"/ || die
+ MKL_LIC="$(basename ${MKL_LICENSE})"
+
+ # binary blob extractor installs rpm leftovers in /opt/intel
+ addwrite /opt/intel
+ # undocumented features: INSTALLMODE_mkl=NONRPM
+
+ # We need to install mkl non-interactively.
+ # If things change between versions, first do it interactively:
+ # tar xf l_*; ./install.sh --duplicate mkl.ini;
+ # The file will be instman/mkl.ini
+ # Then check it and modify the ebuild-created one below
+ # --norpm is required to be able to install 10.x
+ cat > mkl.ini <<-EOF || die
+ [MKL]
+ EULA_ACCEPT_REJECT=ACCEPT
+ FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
+ INSTALLMODE_mkl=NONRPM
+ INSTALL_DESTINATION=${S}
+ EOF
+ einfo "Extracting ..."
+ ./install \
+ --silent ./mkl.ini \
+ --installpath "${S}" \
+ --log log.txt &> /dev/null \
+ || die
+
+ if [[ -z $(find "${S}" -name libmkl.so) ]]; then
+ eerror "Could not find extracted files"
+ eerror "See ${PWD}/log.txt to see why"
+ die "extracting failed"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove left over
+ rm -f /opt/intel/.*mkl*.log /opt/intel/intel_sdp_products.db || die
+
+ # remove unused stuff and set up intel names
+ rm -rf "${WORKDIR}"/l_* || die
+
+ case ${ARCH} in
+ x86) MKL_ARCH=32
+ MKL_KERN=ia32
+ rm -rf lib*/{em64t,64} || die
+ ;;
+
+ amd64) MKL_ARCH=em64t
+ MKL_KERN=em64t
+ rm -rf lib*/{32,64} || die
+ ;;
+
+ ia64) MKL_ARCH=64
+ MKL_KERN=ipf
+ rm -rf lib*/{32,em64t} || die
+ ;;
+ esac
+ MKL_LIBDIR=${MKL_DIR}/lib/${MKL_ARCH}
+ # fix env scripts
+ sed -i \
+ -e "s:${S}:${MKL_DIR}:g" \
+ tools/environment/*sh || die "sed support file failed"
+}
+
+src_compile() {
+ cd "${S}"/interfaces || die
+ if use fortran95; then
+ einfo "Compiling fortan95 static lib wrappers"
+ local myconf="lib${MKL_ARCH}"
+ [[ $(tc-getFC) =~ gfortran ]] && \
+ myconf="${myconf} FC=gfortran"
+ if use int64; then
+ myconf="${myconf} interface=ilp64"
+ [[ $(tc-getFC) =~ gfortran ]] && \
+ myconf="${myconf} FOPTS=-fdefault-integer-8"
+ fi
+ local x
+ for x in blas95 lapack95; do
+ emake -C ${x} ${myconf}
+ done
+ fi
+
+ if use fftw; then
+ local fftwdirs="fftw2xc fftw2xf fftw3xc fftw3xf"
+ local myconf="lib${MKL_ARCH} compiler=${MKL_CC}"
+ if use mpi; then
+ fftwdirs="${fftwdirs} fftw2x_cdft"
+ myconf="${myconf} mpi=${MKL_MPI}"
+ fi
+ einfo "Compiling fftw static lib wrappers"
+ local x
+ for x in ${fftwdirs}; do
+ emake -C ${x} ${myconf}
+ done
+ fi
+}
+
+src_test() {
+ cd "${S}"/tests
+ local myconf
+ local testdirs="blas cblas"
+ local x
+ use int64 && myconf="${myconf} interface=ilp64"
+ # buggy with g77 and gfortran
+ #if use mpi; then
+ # testdirs="${testdirs} scalapack"
+ # myconf="${myconf} mpi=${MKL_MPI}"
+ #fi
+ for x in ${testdirs}; do
+ einfo "Testing ${x}"
+ emake -C ${x} \
+ compiler=${MKL_FC} \
+ ${myconf} \
+ so${MKL_ARCH}
+ done
+}
+
+mkl_make_generic_profile() {
+ cd "${S}" || die
+ # produce eselect files
+ # don't make them in FILESDIR, it changes every major version
+ cat > eselect.blas <<-EOF || die
+ ${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libblas.a
+ ${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so
+ ${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so.0
+ EOF
+ cat > eselect.cblas <<-EOF || die
+ ${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libcblas.a
+ ${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so
+ ${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so.0
+ ${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h
+ EOF
+ cat > eselect.lapack <<-EOF || die
+ ${MKL_LIBDIR}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
+ ${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
+ ${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
+ EOF
+}
+
+# usage: mkl_add_profile <profile> <interface_lib> <thread_lib> <rtl_lib>
+mkl_add_profile() {
+ cd "${S}" || die
+ local prof=${1}
+ local x
+ for x in blas cblas lapack; do
+ cat > ${x}-${prof}.pc <<-EOF || die
+ prefix=${MKL_DIR}
+ libdir=${MKL_LIBDIR}
+ includedir=\${prefix}/include
+ Name: ${x}
+ Description: Intel(R) Math Kernel Library implementation of ${x}
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ EOF
+ done
+ cat >> blas-${prof}.pc <<-EOF || die
+ Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core ${4} -lpthread
+ EOF
+ cat >> cblas-${prof}.pc <<-EOF || die
+ Requires: blas
+ Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core ${4} -lpthread
+ Cflags: -I\${includedir}
+ EOF
+ cat >> lapack-${prof}.pc <<-EOF || die
+ Requires: blas
+ Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core -lmkl_lapack ${4} -lpthread
+ EOF
+ insinto ${MKL_LIBDIR}
+ for x in blas cblas lapack; do
+ doins ${x}-${prof}.pc
+ cp eselect.${x} eselect.${x}.${prof} || die
+ echo "${MKL_LIBDIR}/${x}-${prof}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc" \
+ >> eselect.${x}.${prof} || die
+ eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
+ done
+}
+
+mkl_make_profiles() {
+ local clib="gf"
+ has_version 'dev-lang/ifc' && clib+=" intel"
+ local slib="-lmkl_sequential"
+ local rlib="-liomp5"
+ local pbase=${PN}
+ local c
+ for c in ${clib}; do
+ local ilib="-lmkl_${c}_lp64"
+ use x86 && ilib="-lmkl_${c}"
+ local tlib="-lmkl_${c/gf/gnu}_thread"
+ local comp="${c/gf/gfortran}"
+ comp="${comp/intel/ifort}"
+ mkl_add_profile ${pbase}-${comp} ${ilib} ${slib}
+ mkl_add_profile ${pbase}-${comp}-threads ${ilib} ${tlib} ${rlib}
+ if use int64; then
+ ilib="-lmkl_${c}_ilp64"
+ mkl_add_profile ${pbase}-${comp}-int64 ${ilib} ${slib}
+ mkl_add_profile ${pbase}-${comp}-threads-int64 ${ilib} ${tlib} ${rlib}
+ fi
+ done
+}
+
+src_install() {
+ dodir ${MKL_DIR}
+
+ # install license
+ if [[ ! -f ${INTEL_LIC_DIR}/${MKL_LIC} ]]; then
+ insinto ${INTEL_LIC_DIR}
+ doins "${WORKDIR}"/${MKL_LIC} || die "install license failed"
+ fi
+
+ # install main stuff: cp faster than doins
+ einfo "Installing files..."
+ local cpdirs="benchmarks doc examples include interfaces lib man tests"
+ local doinsdirs="tools"
+ cp -pPR ${cpdirs} "${D}"${MKL_DIR} \
+ || die "installing mkl failed"
+ insinto ${MKL_DIR}
+ doins -r ${doinsdirs} || die "doins ${doinsdirs} failed"
+ dosym mkl_cblas.h ${MKL_DIR}/include/cblas.h
+
+ # install blas/lapack profiles
+ mkl_make_generic_profile
+ mkl_make_profiles
+
+ # install env variables
+ cat > 35mkl <<-EOF || die
+ MKLROOT=${MKL_DIR}
+ LDPATH=${MKL_LIBDIR}
+ MANPATH=${MKL_DIR}/man
+ EOF
+ doenvd 35mkl
+}
+
+pkg_postinst() {
+ # if blas profile is mkl, set lapack and cblas profiles as mkl
+ local blas_prof=$(eselect blas show | cut -d' ' -f2)
+ local def_prof="mkl-gfortran-threads"
+ local x
+ has_version 'dev-lang/ifc' && def_prof="mkl-ifort-threads"
+ use int64 && def_prof="${def_prof}-int64"
+ for x in blas cblas lapack; do
+ local cur_prof=$(eselect ${x} show | cut -d' ' -f2)
+ if [[ -z ${cur_prof} || ${cur_prof} == ${def_prof} ]]; then
+ # work around eselect bug #189942
+ local configfile="${ROOT}"/etc/env.d/${x}/$(get_libdir)/config
+ rm -f ${configfile} || die
+ eselect ${x} set ${def_prof}
+ elog "${x} has been eselected to ${def_prof}"
+ else
+ elog "Current eselected ${x} is ${current_lib}"
+ elog "To use one of mkl profiles, issue (as root):"
+ elog "\t eselect ${x} set <profile>"
+ fi
+ if [[ ${blas_prof} == mkl* && ${cur_prof} != ${blas_prof} ]]; then
+ eselect blas set ${def_prof}
+ elog "${x} is now set to ${def_prof} for consistency"
+ fi
+ done
+ if [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]]; then
+ elog "Multi-threading OpenMP for GNU compilers only available"
+ elog "with gcc >= 4.2. Make sure you have a compatible version"
+ elog "and select it with gcc-config before selecting gnu profiles"
+ fi
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2016-08-23 8:44 David Seifert
0 siblings, 0 replies; 19+ messages in thread
From: David Seifert @ 2016-08-23 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 525b7acb483107106e4e3109bc1216809bc17175
Author: Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Tue Aug 16 15:08:55 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 08:43:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=525b7acb
sci-libs/mkl: Fixed ebuild
Gentoo-bug: #589610
Reported-by: masum.habib <AT> gmail.com
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2095
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/mkl/mkl-10.0.5.025.ebuild | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild
index f49e232..7a9cc2e 100644
--- a/sci-libs/mkl/mkl-10.0.5.025.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,10 +8,11 @@ inherit check-reqs eutils fortran-2 multilib toolchain-funcs
PID=1232
PB=${PN}
+P_ARCHIVE=l_${PN}_p_${PV}
DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, math functions"
HOMEPAGE="http://developer.intel.com/software/products/mkl/"
-SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/l_${PN}_p_${PV}.tgz"
+SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${P_ARCHIVE}.tgz"
SLOT="0"
LICENSE="Intel-SDP"
@@ -91,10 +92,9 @@ pkg_setup() {
get_fcomp
}
-src_prepare() {
- check-reqs_src_prepare
-
- cd l_${PN}_*_${PV}/install || die
+src_unpack () {
+ default
+ cd "${WORKDIR}/${P_ARCHIVE}"/install || die
cp ${MKL_LICENSE} "${WORKDIR}"/ || die
MKL_LIC="$(basename ${MKL_LICENSE})"
@@ -127,13 +127,15 @@ src_prepare() {
eerror "See ${PWD}/log.txt to see why"
die "extracting failed"
fi
+}
+
+src_prepare() {
# remove left over
rm -f /opt/intel/.*mkl*.log /opt/intel/intel_sdp_products.db || die
# remove unused stuff and set up intel names
rm -rf "${WORKDIR}"/l_* || die
- cd "${S}" || die
# allow openmpi to work
epatch "${FILESDIR}"/${PN}-10.0.2.018-openmpi.patch
# make scalapack tests work for gfortran
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2017-12-10 21:41 Michał Górny
0 siblings, 0 replies; 19+ messages in thread
From: Michał Górny @ 2017-12-10 21:41 UTC (permalink / raw
To: gentoo-commits
commit: fc4836a9e0601f99955ce2b6354015c35adb4f78
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 17:49:30 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 21:41:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc4836a9
sci-libs/mkl: Update Manifest hashes
sci-libs/mkl/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 4f160bc69e2..015a339f3b9 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1 +1 @@
-DIST l_mkl_p_10.0.5.025.tgz 230389719 SHA256 c98f2c5c652c02ac7200cba40d996b1f11b567278d849016b7ee3b0320e26e3c SHA512 621c3bfdecb57313e375424e391c0630a29efd70196e3e4bfc5b4ddd03aa45fda4761523652d875f2e60d466a0010c06659306b11f20966fba4943c308fa6f84 WHIRLPOOL 6c96123254aebd897e061ee971f487bd5d51586e74572da18bb5461ab8f7fb2cbb34e5f782c11712a7ece8b58b348554c07a68dd91ff5fc9771894e3aef04352
+DIST l_mkl_p_10.0.5.025.tgz 230389719 BLAKE2B 622dd0076c8e6d747f170685b6a378db95aa2453d15a53c93ef863729bb8dc76409d7bf72f8bab8ef9a07d8efe1e448cb9e7fc8e6f0c0b2cbbf0a0f6944e2a86 SHA512 621c3bfdecb57313e375424e391c0630a29efd70196e3e4bfc5b4ddd03aa45fda4761523652d875f2e60d466a0010c06659306b11f20966fba4943c308fa6f84
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2018-05-11 21:56 Patrice Clement
0 siblings, 0 replies; 19+ messages in thread
From: Patrice Clement @ 2018-05-11 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 1fdf609eaa478fdd301d03f4e1cce82b8a949061
Author: Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Fri May 11 14:04:48 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri May 11 21:56:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fdf609e
sci-libs/mkl: update HOMEPAGE.
Closes: https://bugs.gentoo.org/651026
Closes: https://github.com/gentoo/gentoo/pull/8347
sci-libs/mkl/mkl-10.0.5.025-r1.ebuild | 4 ++--
sci-libs/mkl/mkl-10.0.5.025.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
index ed1c3a7da3f..b2d8507670c 100644
--- a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025-r1.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
@@ -10,7 +10,7 @@ PB=${PN}
P_ARCHIVE=l_${PN}_p_${PV}
DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://developer.intel.com/software/products/mkl/"
+HOMEPAGE="https://software.intel.com/en-us/mkl"
SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${P_ARCHIVE}.tgz"
SLOT="0"
diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild
index dc66e4a23e9..00dff8ae6b2 100644
--- a/sci-libs/mkl/mkl-10.0.5.025.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025.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=5
@@ -10,7 +10,7 @@ PB=${PN}
P_ARCHIVE=l_${PN}_p_${PV}
DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://developer.intel.com/software/products/mkl/"
+HOMEPAGE="https://software.intel.com/en-us/mkl"
SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${P_ARCHIVE}.tgz"
SLOT="0"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2019-09-23 17:16 Michał Górny
0 siblings, 0 replies; 19+ messages in thread
From: Michał Górny @ 2019-09-23 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 40f98893483108c298c721520647844a77ef6ee9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 17:11:30 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 17:16:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f98893
sci-libs/mkl: Add RESTRICT=bindist
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/mkl/mkl-10.0.5.025-r1.ebuild | 4 ++--
sci-libs/mkl/mkl-10.0.5.025.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
index b2d8507670c..0a4d33acc08 100644
--- a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ LICENSE="Intel-SDP"
KEYWORDS="-* ~amd64 ~ia64 ~x86"
IUSE="doc fftw fortran95 int64 mpi"
-RESTRICT="strip mirror"
+RESTRICT="bindist strip mirror"
DEPEND="
app-eselect/eselect-blas
diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild
index 00dff8ae6b2..4de67341b9e 100644
--- a/sci-libs/mkl/mkl-10.0.5.025.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ LICENSE="Intel-SDP"
KEYWORDS="-* amd64 ~ia64 x86"
IUSE="doc fftw fortran95 int64 mpi"
-RESTRICT="strip mirror"
+RESTRICT="bindist strip mirror"
DEPEND="
app-eselect/eselect-blas
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2020-11-09 7:38 Benda XU
0 siblings, 0 replies; 19+ messages in thread
From: Benda XU @ 2020-11-09 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 56846e03ed7c84387775b9ef6b99f8fdf65add10
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Nov 5 13:47:11 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 07:38:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56846e03
sci-libs/mkl: version bump to 2020.4.304
Use eselect-ldso mechanism.
Respect Prefix.
Closes: https://bugs.gentoo.org/587338
Closes: https://bugs.gentoo.org/592662
Closes: https://bugs.gentoo.org/747304
Closes: https://bugs.gentoo.org/260810
Closes: https://bugs.gentoo.org/715548
Closes: https://bugs.gentoo.org/719976
Reported-by: Juergen Rose, François Bissey, Florian D., Martin Mokrejš
Reported-by: Michel Lang, juantxorena <AT> gmail.com, Chris Larson, jorge
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-libs/mkl/Manifest | 1 +
sci-libs/mkl/mkl-2020.4.304.ebuild | 230 +++++++++++++++++++++++++++++++++++++
2 files changed, 231 insertions(+)
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 015a339f3b9..78d062bccf5 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1 +1,2 @@
DIST l_mkl_p_10.0.5.025.tgz 230389719 BLAKE2B 622dd0076c8e6d747f170685b6a378db95aa2453d15a53c93ef863729bb8dc76409d7bf72f8bab8ef9a07d8efe1e448cb9e7fc8e6f0c0b2cbbf0a0f6944e2a86 SHA512 621c3bfdecb57313e375424e391c0630a29efd70196e3e4bfc5b4ddd03aa45fda4761523652d875f2e60d466a0010c06659306b11f20966fba4943c308fa6f84
+DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7
diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild
new file mode 100644
index 00000000000..ed552ffeb60
--- /dev/null
+++ b/sci-libs/mkl/mkl-2020.4.304.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit multilib-build
+
+MAGIC=16917 # from registration center
+MY_P=${P/-/_} # mkl_2020.4.304
+MY_PV=$(ver_rs 2 '-') # 2020.4-304
+
+DESCRIPTION="Intel Math Kernel Library"
+HOMEPAGE="https://software.intel.com/en-us/intel-mkl"
+SRC_URI="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/${MAGIC}/l_${MY_P}.tgz -> ${P}.tar.gz"
+S="${WORKDIR}"/l_${MY_P}
+
+LICENSE="ISSL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+RESTRICT="strip"
+
+# MKL uses Intel/LLVM OpenMP by default.
+# One can change the threadding layer to "gnu" or "tbb"
+# through the MKL_THREADING_LAYER env var.
+RDEPEND="
+ app-eselect/eselect-blas
+ app-eselect/eselect-lapack
+ sys-libs/libomp[${MULTILIB_USEDEP}]
+"
+
+QA_PREBUILT="*"
+QA_TEXTRELS="*"
+QA_SONAME="*"
+
+# first unpack all rpms
+# find folders containing header like, static and dynamic lib files
+# these are the only folders we care about
+# find "${S}"/rpm -type f \( -name "*.a" -o -name "*.so" -o -wholename "*mkl/include*" \) \
+# | tr '/' ' ' | awk '{ print $2 }' | sort | uniq
+
+# ignore all conda-* rpms
+# ignore all empty rpms
+# information about rest:
+#
+# mkl-core-ps-32bit-2020.3-279-2020.3-279.x86_64.rpm | some prebuilt benchmark executables
+# psxe-common-2020.3-111-2020.3-111.noarch.rpm
+# comp-l-all-vars-19.1.2-279-19.1.2-279.noarch.rpm
+# comp-nomcu-vars-19.1.2-279-19.1.2-279.noarch.rpm
+# mkl-cluster-c-2020.3-279-2020.3-279.noarch.rpm
+# mkl-cluster-f-2020.3-279-2020.3-279.noarch.rpm
+# mkl-doc-2020-2020.3-279.noarch.rpm
+# mkl-common-ps-2020.3-279-2020.3-279.noarch.rpm | only contains benchmarks
+# compxe-pset-2020.3-111-2020.3-111.noarch.rpm | only contains benchmarks
+# mkl-doc-ps-2020-2020.3-279.noarch.rpm
+# mkl-common-2020.3-279-2020.3-279.noarch.rpm | setting up environment vars (might be needed for parallel studio)
+# mkl-installer-license-2020.3-279-2020.3-279.noarch.rpm | already have license
+# mkl-psxe-2020.3-111-2020.3-111.noarch.rpm | useless files
+# mkl-common-c-ps-2020.3-279-2020.3-279.noarch.rpm | contained in common-c
+
+INTEL_DIST_X86_RPMS=(
+ mkl-core-32bit
+ mkl-core-rt-32bit
+ mkl-f95-32bit
+ mkl-gnu-32bit
+ mkl-gnu-f-32bit
+ mkl-gnu-f-rt-32bit
+ mkl-gnu-rt-32bit
+ mkl-tbb-32bit
+ mkl-tbb-rt
+ intel-openmp-32bit-19.1.3-304-19.1.3-304.x86_64.rpm
+)
+INTEL_DIST_AMD64_RPMS=(
+ mkl-cluster
+ mkl-cluster-rt
+ mkl-core
+ mkl-core-ps
+ mkl-core-rt
+ mkl-f95
+ mkl-gnu
+ mkl-gnu-f
+ mkl-gnu-rt
+ mkl-gnu-f-rt
+ mkl-pgi
+ mkl-pgi-rt
+ mkl-tbb
+ mkl-tbb-rt
+ intel-openmp-19.1.3-304-19.1.3-304.x86_64.rpm
+)
+INTEL_DIST_DAT_RPMS=(
+ mkl-common-c
+ mkl-common-f
+ mkl-f95-common
+)
+
+rpm_dirname() {
+ local rpm="${1}" suffix="x86_64"
+ if [[ $# -eq 2 ]]; then
+ suffix="$2"
+ fi
+ if [[ ! ${rpm} =~ "rpm" ]] ; then
+ rpm="intel-${rpm}-${MY_PV}-${MY_PV}.${suffix}"
+ fi
+ printf '%s\n' "${rpm%%.rpm}"
+}
+
+rpm_unpack() {
+ local rpm="$1" suffix="x86_64"
+ if [[ $# -eq 2 ]]; then
+ suffix="$2"
+ fi
+ rpm="$(rpm_dirname $rpm $suffix)"
+ elog "Unpacking - ${rpm}.rpm"
+ rpmunpack "${rpm}.rpm" || die
+}
+
+src_unpack() {
+ default
+ cd "${S}"/rpm
+ local rpm
+ for rpm in ${INTEL_DIST_DAT_RPMS[@]}; do
+ rpm_unpack ${rpm} noarch
+ done
+ if use abi_x86_64 ; then
+ for rpm in ${INTEL_DIST_AMD64_RPMS[@]}; do
+ rpm_unpack ${rpm}
+ done
+ fi
+ if use abi_x86_32 ; then
+ for rpm in ${INTEL_DIST_X86_RPMS[@]}; do
+ rpm_unpack ${rpm}
+ done
+ fi
+}
+
+multilib_src_install() {
+ cd "${S}"/rpm
+ elog "current variant - ${MULTIBUILD_VARIANT}"
+ local rpm rpm_list libdir=$(get_libdir)
+ if [[ ${MULTIBUILD_VARIANT} =~ 'amd64' ]] ; then
+ rpm_list="${INTEL_DIST_AMD64_RPMS[@]}"
+ else
+ rpm_list="${INTEL_DIST_X86_RPMS[@]}"
+ fi
+ for rpm in ${rpm_list} ; do
+ rpm=$(rpm_dirname ${rpm})
+ elog "installing libs from - ${rpm}"
+ local libso liba
+ for libso in $(find "${S}"/rpm/${rpm} -name "*.so") ; do
+ dolib.so "${libso}"
+ done
+ use static-libs && \
+ for liba in $(find "${S}"/rpm/${rpm} -name "*.a") ; do
+ dolib.a "${liba}"
+ done
+ done
+
+ dodir /usr/$(get_libdir)/blas/mkl
+ dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so
+ dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so.3
+ dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so
+ dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so.3
+ dodir /usr/$(get_libdir)/lapack/mkl
+ dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so
+ dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so.3
+ dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so
+ dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so.3
+
+ # for some reason pkgconfig files are only for amd64
+ [[ ${MULTIBUILD_VARIANT} =~ 'amd64' ]] || return
+ local pc_files=( "${FILESDIR}"/*.pc )
+ insinto /usr/$(get_libdir)/pkgconfig
+ for pc in "${pc_files[@]}" ; do
+ doins "${pc}"
+ sed -e "s:@PREFIX@:${EPREFIX}/usr:" \
+ -i "${ED}"/usr/$(get_libdir)/pkgconfig/${pc##*/} || die
+ done
+}
+
+src_install() {
+ # install bunch of header like files
+ dodir /usr/include/mkl
+ for idir in $(find "${S}"/rpm -type d -wholename "*mkl/include"); do
+ cp -a "${idir}"/. "${ED}"/usr/include/mkl || die
+ done
+
+ multilib_foreach_abi multilib_src_install
+}
+
+library-provider_pkg_postinst() {
+ local libdir=$(get_libdir) me="mkl"
+
+ # check blas
+ eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+ local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+ eselect blas set ${libdir} ${me}
+ elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+ else
+ elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+ elog "To use blas [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect blas set ${libdir} ${me}"
+ fi
+
+ # check lapack
+ eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+ local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+ eselect lapack set ${libdir} ${me}
+ elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+ else
+ elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+ elog "To use lapack [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect lapack set ${libdir} ${me}"
+ fi
+}
+
+pkg_postinst() {
+ multilib_foreach_abi library-provider_pkg_postinst
+}
+
+library-provider_pkg_postrm() {
+ eselect blas validate
+ eselect lapack validate
+}
+
+pkg_postrm() {
+ multilib_foreach_abi library-provider_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2020-11-09 7:38 Benda XU
0 siblings, 0 replies; 19+ messages in thread
From: Benda XU @ 2020-11-09 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 3020504e452e37e5304dd8465aed9c9040edc3db
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Nov 5 13:47:39 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 07:38:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3020504e
sci-libs/mkl: drop really old version.
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-libs/mkl/Manifest | 1 -
sci-libs/mkl/metadata.xml | 4 -
sci-libs/mkl/mkl-10.0.5.025-r1.ebuild | 366 ----------------------------------
3 files changed, 371 deletions(-)
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 78d062bccf5..42f2d6c292c 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,2 +1 @@
-DIST l_mkl_p_10.0.5.025.tgz 230389719 BLAKE2B 622dd0076c8e6d747f170685b6a378db95aa2453d15a53c93ef863729bb8dc76409d7bf72f8bab8ef9a07d8efe1e448cb9e7fc8e6f0c0b2cbbf0a0f6944e2a86 SHA512 621c3bfdecb57313e375424e391c0630a29efd70196e3e4bfc5b4ddd03aa45fda4761523652d875f2e60d466a0010c06659306b11f20966fba4943c308fa6f84
DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 446435794d0..59fd7e51f0f 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -13,8 +13,4 @@
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="fortran95">Installs the BLAS/LAPACK FORTRAN95 static libraries</flag>
- <flag name="int64">Installs the 64 bits integer libraries</flag>
- </use>
</pkgmetadata>
diff --git a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
deleted file mode 100644
index bd88e59f5c5..00000000000
--- a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs fortran-2 toolchain-funcs
-
-PID=1232
-PB=${PN}
-P_ARCHIVE=l_${PN}_p_${PV}
-
-DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="https://software.intel.com/en-us/mkl"
-SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${P_ARCHIVE}.tgz"
-
-SLOT="0"
-LICENSE="Intel-SDP"
-KEYWORDS="-* ~amd64 ~ia64 ~x86"
-IUSE="doc fftw fortran95 int64 mpi"
-
-RESTRICT="bindist strip mirror"
-
-DEPEND="
- app-eselect/eselect-blas
- app-eselect/eselect-cblas
- app-eselect/eselect-lapack"
-RDEPEND="${DEPEND}
- doc? ( app-doc/blas-docs app-doc/lapack-docs )
- mpi? ( virtual/mpi )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-10.0.2.018-openmpi.patch # allow openmpi to work
-)
-
-MKL_DIR=/opt/intel/${PN}/${PV}
-INTEL_LIC_DIR=/opt/intel/licenses
-
-CHECKREQS_DISK_BUILD=3500M
-
-QA_PREBUILT="opt/intel/${PN}/${PV}/*"
-
-get_fcomp() {
- case $(tc-getFC) in
- *gfortran* )
- FCOMP="gfortran" ;;
- ifort )
- FCOMP="ifc" ;;
- * )
- FCOMP=$(tc-getFC) ;;
- esac
-}
-
-pkg_setup() {
- check-reqs_pkg_setup
- fortran-2_pkg_setup
- # Check the license
- if [[ -z ${MKL_LICENSE} ]]; then
- MKL_LICENSE="$(grep -ls MKern ${ROOT}${INTEL_LIC_DIR}/* | tail -n 1)"
- MKL_LICENSE=${MKL_LICENSE/${ROOT}/}
- fi
- if [[ -z ${MKL_LICENSE} ]]; then
- eerror "Did not find any valid mkl license."
- eerror "Register at ${HOMEPAGE} to receive a license"
- eerror "and place it in ${INTEL_LIC_DIR} or run:"
- eerror "export MKL_LICENSE=/my/license/file emerge mkl"
- die "license setup failed"
- fi
-
- # Check if we have enough free diskspace to install
- CHECKREQS_DISK_BUILD="1100M"
- check-reqs_pkg_setup
-
- # Check and setup fortran
- if use fortran95; then
- # blas95 and lapack95 don't compile with gfortran < 4.2
- [[ $(tc-getFC) =~ (gfortran|g77) ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] &&
- die "blas95 and lapack95 don't compile with gfortran < 4.2"
- fi
- MKL_FC="gnu"
- [[ $(tc-getFC) =~ if ]] && MKL_FC="intel"
-
- # build profiles according to what compiler is installed
- MKL_CC="gnu"
- [[ $(tc-getCC) == icc ]] && MKL_CC="intel"
-
- if has_version sys-cluster/mpich; then
- MKL_MPI=mpich
- elif has_version sys-cluster/mpich2; then
- MKL_MPI=mpich2
- elif has_version sys-cluster/openmpi; then
- MKL_MPI=openmpi
- else
- MKL_MPI=intelmpi
- fi
- get_fcomp
-}
-
-src_unpack() {
- default
- cd "${WORKDIR}/${P_ARCHIVE}"/install || die
-
- cp ${MKL_LICENSE} "${WORKDIR}"/ || die
- MKL_LIC="$(basename ${MKL_LICENSE})"
-
- # binary blob extractor installs rpm leftovers in /opt/intel
- addwrite /opt/intel
- # undocumented features: INSTALLMODE_mkl=NONRPM
-
- # We need to install mkl non-interactively.
- # If things change between versions, first do it interactively:
- # tar xf l_*; ./install.sh --duplicate mkl.ini;
- # The file will be instman/mkl.ini
- # Then check it and modify the ebuild-created one below
- # --norpm is required to be able to install 10.x
- cat > mkl.ini <<-EOF || die
- [MKL]
- EULA_ACCEPT_REJECT=ACCEPT
- FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
- INSTALLMODE_mkl=NONRPM
- INSTALL_DESTINATION=${S}
- EOF
- einfo "Extracting ..."
- ./install \
- --silent ./mkl.ini \
- --installpath "${S}" \
- --log log.txt &> /dev/null \
- || die
-
- if [[ -z $(find "${S}" -name libmkl.so) ]]; then
- eerror "Could not find extracted files"
- eerror "See ${PWD}/log.txt to see why"
- die "extracting failed"
- fi
-}
-
-src_prepare() {
- default
-
- # remove left over
- rm -f /opt/intel/.*mkl*.log /opt/intel/intel_sdp_products.db || die
-
- # remove unused stuff and set up intel names
- rm -rf "${WORKDIR}"/l_* || die
-
- case ${ARCH} in
- x86) MKL_ARCH=32
- MKL_KERN=ia32
- rm -rf lib*/{em64t,64} || die
- ;;
-
- amd64) MKL_ARCH=em64t
- MKL_KERN=em64t
- rm -rf lib*/{32,64} || die
- ;;
-
- ia64) MKL_ARCH=64
- MKL_KERN=ipf
- rm -rf lib*/{32,em64t} || die
- ;;
- esac
- MKL_LIBDIR=${MKL_DIR}/lib/${MKL_ARCH}
- # fix env scripts
- sed -i \
- -e "s:${S}:${MKL_DIR}:g" \
- tools/environment/*sh || die "sed support file failed"
-}
-
-src_compile() {
- cd "${S}"/interfaces || die
- if use fortran95; then
- einfo "Compiling fortan95 static lib wrappers"
- local myconf="lib${MKL_ARCH}"
- [[ $(tc-getFC) =~ gfortran ]] && \
- myconf="${myconf} FC=gfortran"
- if use int64; then
- myconf="${myconf} interface=ilp64"
- [[ $(tc-getFC) =~ gfortran ]] && \
- myconf="${myconf} FOPTS=-fdefault-integer-8"
- fi
- local x
- for x in blas95 lapack95; do
- emake -C ${x} ${myconf}
- done
- fi
-
- if use fftw; then
- local fftwdirs="fftw2xc fftw2xf fftw3xc fftw3xf"
- local myconf="lib${MKL_ARCH} compiler=${MKL_CC}"
- if use mpi; then
- fftwdirs="${fftwdirs} fftw2x_cdft"
- myconf="${myconf} mpi=${MKL_MPI}"
- fi
- einfo "Compiling fftw static lib wrappers"
- local x
- for x in ${fftwdirs}; do
- emake -C ${x} ${myconf}
- done
- fi
-}
-
-src_test() {
- cd "${S}"/tests
- local myconf
- local testdirs="blas cblas"
- local x
- use int64 && myconf="${myconf} interface=ilp64"
- # buggy with g77 and gfortran
- #if use mpi; then
- # testdirs="${testdirs} scalapack"
- # myconf="${myconf} mpi=${MKL_MPI}"
- #fi
- for x in ${testdirs}; do
- einfo "Testing ${x}"
- emake -C ${x} \
- compiler=${MKL_FC} \
- ${myconf} \
- so${MKL_ARCH}
- done
-}
-
-mkl_make_generic_profile() {
- cd "${S}" || die
- # produce eselect files
- # don't make them in FILESDIR, it changes every major version
- cat > eselect.blas <<-EOF || die
- ${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libblas.a
- ${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so
- ${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so.0
- EOF
- cat > eselect.cblas <<-EOF || die
- ${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libcblas.a
- ${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so
- ${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so.0
- ${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h
- EOF
- cat > eselect.lapack <<-EOF || die
- ${MKL_LIBDIR}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
- ${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
- ${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
- EOF
-}
-
-# usage: mkl_add_profile <profile> <interface_lib> <thread_lib> <rtl_lib>
-mkl_add_profile() {
- cd "${S}" || die
- local prof=${1}
- local x
- for x in blas cblas lapack; do
- cat > ${x}-${prof}.pc <<-EOF || die
- prefix=${MKL_DIR}
- libdir=${MKL_LIBDIR}
- includedir=\${prefix}/include
- Name: ${x}
- Description: Intel(R) Math Kernel Library implementation of ${x}
- Version: ${PV}
- URL: ${HOMEPAGE}
- EOF
- done
- cat >> blas-${prof}.pc <<-EOF || die
- Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core ${4} -lpthread
- EOF
- cat >> cblas-${prof}.pc <<-EOF || die
- Requires: blas
- Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core ${4} -lpthread
- Cflags: -I\${includedir}
- EOF
- cat >> lapack-${prof}.pc <<-EOF || die
- Requires: blas
- Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core -lmkl_lapack ${4} -lpthread
- EOF
- insinto ${MKL_LIBDIR}
- for x in blas cblas lapack; do
- doins ${x}-${prof}.pc
- cp eselect.${x} eselect.${x}.${prof} || die
- echo "${MKL_LIBDIR}/${x}-${prof}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc" \
- >> eselect.${x}.${prof} || die
- eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
- done
-}
-
-mkl_make_profiles() {
- local clib="gf"
- has_version 'dev-lang/ifc' && clib+=" intel"
- local slib="-lmkl_sequential"
- local rlib="-liomp5"
- local pbase=${PN}
- local c
- for c in ${clib}; do
- local ilib="-lmkl_${c}_lp64"
- use x86 && ilib="-lmkl_${c}"
- local tlib="-lmkl_${c/gf/gnu}_thread"
- local comp="${c/gf/gfortran}"
- comp="${comp/intel/ifort}"
- mkl_add_profile ${pbase}-${comp} ${ilib} ${slib}
- mkl_add_profile ${pbase}-${comp}-threads ${ilib} ${tlib} ${rlib}
- if use int64; then
- ilib="-lmkl_${c}_ilp64"
- mkl_add_profile ${pbase}-${comp}-int64 ${ilib} ${slib}
- mkl_add_profile ${pbase}-${comp}-threads-int64 ${ilib} ${tlib} ${rlib}
- fi
- done
-}
-
-src_install() {
- dodir ${MKL_DIR}
-
- # install license
- if [[ ! -f ${INTEL_LIC_DIR}/${MKL_LIC} ]]; then
- insinto ${INTEL_LIC_DIR}
- doins "${WORKDIR}"/${MKL_LIC}
- fi
-
- # install main stuff: cp faster than doins
- einfo "Installing files..."
- local cpdirs="benchmarks doc examples include interfaces lib man tests"
- local doinsdirs="tools"
- cp -pPR ${cpdirs} "${D}"${MKL_DIR} \
- || die "installing mkl failed"
- insinto ${MKL_DIR}
- doins -r ${doinsdirs}
- dosym mkl_cblas.h ${MKL_DIR}/include/cblas.h
-
- # install blas/lapack profiles
- mkl_make_generic_profile
- mkl_make_profiles
-
- # install env variables
- cat > 35mkl <<-EOF || die
- MKLROOT=${MKL_DIR}
- LDPATH=${MKL_LIBDIR}
- MANPATH=${MKL_DIR}/man
- EOF
- doenvd 35mkl
-}
-
-pkg_postinst() {
- # if blas profile is mkl, set lapack and cblas profiles as mkl
- local blas_prof=$(eselect blas show | cut -d' ' -f2)
- local def_prof="mkl-gfortran-threads"
- local x
- has_version 'dev-lang/ifc' && def_prof="mkl-ifort-threads"
- use int64 && def_prof="${def_prof}-int64"
- for x in blas cblas lapack; do
- local cur_prof=$(eselect ${x} show | cut -d' ' -f2)
- if [[ -z ${cur_prof} || ${cur_prof} == ${def_prof} ]]; then
- # work around eselect bug #189942
- local configfile="${ROOT}"/etc/env.d/${x}/$(get_libdir)/config
- rm -f ${configfile} || die
- eselect ${x} set ${def_prof}
- elog "${x} has been eselected to ${def_prof}"
- else
- elog "Current eselected ${x} is ${current_lib}"
- elog "To use one of mkl profiles, issue (as root):"
- elog "\t eselect ${x} set <profile>"
- fi
- if [[ ${blas_prof} == mkl* && ${cur_prof} != ${blas_prof} ]]; then
- eselect blas set ${def_prof}
- elog "${x} is now set to ${def_prof} for consistency"
- fi
- done
- if [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]]; then
- elog "Multi-threading OpenMP for GNU compilers only available"
- elog "with gcc >= 4.2. Make sure you have a compatible version"
- elog "and select it with gcc-config before selecting gnu profiles"
- fi
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2020-11-09 14:38 Benda XU
0 siblings, 0 replies; 19+ messages in thread
From: Benda XU @ 2020-11-09 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 396dc38cf08a3075ca5ff2d22ed9fbd3c6962d13
Author: root <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 9 14:36:55 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 14:38:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396dc38c
sci-libs/mkl: inherit rpm to draw in rpm2targz BDEPEND.
Closes: https://bugs.gentoo.org/753662
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-libs/mkl/mkl-2020.4.304.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild
index ed552ffeb60..10c56fec1fc 100644
--- a/sci-libs/mkl/mkl-2020.4.304.ebuild
+++ b/sci-libs/mkl/mkl-2020.4.304.ebuild
@@ -4,7 +4,7 @@
EAPI=7
MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit multilib-build
+inherit multilib-build rpm
MAGIC=16917 # from registration center
MY_P=${P/-/_} # mkl_2020.4.304
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2020-11-10 3:11 Matthias Maier
0 siblings, 0 replies; 19+ messages in thread
From: Matthias Maier @ 2020-11-10 3:11 UTC (permalink / raw
To: gentoo-commits
commit: daca860dd9136d3de94335326b38487dbd10ad59
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 03:10:12 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 03:10:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daca860d
sci-libs/mkl: whitelist FatELF binary
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/mkl/mkl-2020.4.304.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild
index 10c56fec1fc..e90f9cb2517 100644
--- a/sci-libs/mkl/mkl-2020.4.304.ebuild
+++ b/sci-libs/mkl/mkl-2020.4.304.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
QA_PREBUILT="*"
QA_TEXTRELS="*"
QA_SONAME="*"
+QA_MULTILIB_PATHS="/usr/lib.*/libmkl_tbb_thread.so"
# first unpack all rpms
# find folders containing header like, static and dynamic lib files
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2021-11-29 5:48 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2021-11-29 5:48 UTC (permalink / raw
To: gentoo-commits
commit: 66cd8b4d78cc5485af9e14d82e53bd7b213ce643
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 05:48:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 05:48:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66cd8b4d
sci-libs/mkl: rpm needs xz-utils[extra-filters]
Closes: https://bugs.gentoo.org/801460
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/mkl/mkl-2020.4.304.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild
index e90f9cb25172..daf81b2b41ea 100644
--- a/sci-libs/mkl/mkl-2020.4.304.ebuild
+++ b/sci-libs/mkl/mkl-2020.4.304.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,6 +29,8 @@ RDEPEND="
app-eselect/eselect-lapack
sys-libs/libomp[${MULTILIB_USEDEP}]
"
+# bug #801460
+BDEPEND="app-arch/xz-utils[extra-filters]"
QA_PREBUILT="*"
QA_TEXTRELS="*"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2022-11-23 18:25 Andrew Ammerlaan
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Ammerlaan @ 2022-11-23 18:25 UTC (permalink / raw
To: gentoo-commits
commit: f1aa09d2f10215fed13d57827c92fbea758d993b
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 18:25:20 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 18:25:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1aa09d2
sci-libs/mkl: add github upstream metadata
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/mkl/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 07376226d866..1c12a7532045 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -13,4 +13,7 @@
capacities. The package is installed as binary and has a restrictive
license. Please see license terms and home page for proper use.
</longdescription>
+ <upstream>
+ <remote-id type="github">oneapi-src/oneMKL</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2022-12-10 15:46 Andrew Ammerlaan
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Ammerlaan @ 2022-12-10 15:46 UTC (permalink / raw
To: gentoo-commits
commit: 4cee0ae946a2c6856e21f088268fd498e779c6af
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 15:41:00 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 15:45:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cee0ae9
sci-libs/mkl: add 2022.2.1.16993
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/mkl/Manifest | 4 +
sci-libs/mkl/mkl-2022.2.1.16993.ebuild | 147 +++++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+)
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 42f2d6c292c8..72f84cccf7ac 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1 +1,5 @@
+DIST intel-oneapi-mkl-2022.2.1-2022.2.1-16993_amd64.deb 202488238 BLAKE2B 9bea2cb85aebaa99eac17563e35e4a33e564e58b3e797ce97c140ee510870d7bccd5ffc138eea86a3c25de988a39b5ed06182cb87f103fd8c2dc772d1bd50b81 SHA512 21f2c8b9608fc942821624132aa905f2ec0863f6af9b8a02c166f88b41620ea4e66d1e6551f5da53e727103e9035f28018b12ee3bee33c76ea10be6a68c82748
+DIST intel-oneapi-mkl-common-2022.2.1-2022.2.1-16993_all.deb 23890 BLAKE2B 0287ac646a19e8a33b25cbef006cb98c410872fff2294a15d4e35dd55fc037b523c1923d99d2445a1959b6515ef4b6fdfa7243338c2d194b3c4bf4548949216c SHA512 362640c14713bc8186ea712bb6720311cce1dae6e775d7aade4c613a7a5708224507ff4fefa1081165fa366840f94f8ae73ee345699a4fee5cf7cd7607d9f94e
+DIST intel-oneapi-mkl-common-devel-2022.2.1-2022.2.1-16993_all.deb 4688928 BLAKE2B 545641f68ba7b835859092242a60e065dd7bae8e538b27afaa1f7b266c6ce9aa5c0777b6ced7b8f3a35b70dbe6c6cbfad1db7c370a7a4f4478c8f23b4075bfd5 SHA512 275f267cf103b92ed0bdf56fdd55aee7c5ba5f42d2f7507abe1219aba72f325b9386c8e203a04d4a91020598d0d9cc82b0fc7abe22491c1103f44f3a31d42b2a
+DIST intel-oneapi-mkl-devel-2022.2.1-2022.2.1-16993_amd64.deb 183600754 BLAKE2B 94373a9d71625f71fb406d302eabed7800dc1b0e0ffef6268bf93abdccb8da4adb87643ebe73cd187fe1432b43e6de4eee4b716bb67a483c862e1beef0db486a SHA512 a259580266798e16b6fe6195cfacb1cdd9ae519c86945e7df29b7eff344fbfb238b0126231a99d2190cdbdba6340dce3f40574f443efd09b4955c86260d331da
DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7
diff --git a/sci-libs/mkl/mkl-2022.2.1.16993.ebuild b/sci-libs/mkl/mkl-2022.2.1.16993.ebuild
new file mode 100644
index 000000000000..5f88f1e40685
--- /dev/null
+++ b/sci-libs/mkl/mkl-2022.2.1.16993.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Intel Math Kernel Library"
+HOMEPAGE="https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html"
+SRC_URI="
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb
+"
+S="${WORKDIR}"
+
+LICENSE="ISSL"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs"
+RESTRICT="strip"
+
+# MKL uses Intel/LLVM OpenMP by default.
+# One can change the threadding layer to "gnu" or "tbb"
+# through the MKL_THREADING_LAYER env var.
+RDEPEND="
+ app-eselect/eselect-blas
+ app-eselect/eselect-lapack
+ sys-libs/libomp
+"
+# bug #801460
+BDEPEND="app-arch/xz-utils[extra-filters]"
+
+QA_PREBUILT="*"
+QA_TEXTRELS="*"
+QA_SONAME="*"
+
+src_prepare() {
+ default
+ # Drop conda stuff
+ rm -r opt/intel/oneapi/conda_channel || die
+}
+
+src_install() {
+ # Symlink pkgconfig and cmake files
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig" || die
+ for file in *.pc; do
+ dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig/${file}" "/usr/share/pkgconfig/${file}"
+ done
+ popd || die
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl" || die
+ for file in *.cmake; do
+ dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl/${file}" "/usr/$(get_libdir)/cmake/mkl/${file}"
+ done
+ popd || die
+
+ # Symlink files in include directory
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include" || die
+ for file in *.h; do
+ dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/${file}" "/usr/include/${file}"
+ done
+ for file in *.f90; do
+ dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/${file}" "/usr/include/${file}"
+ done
+ for file in *.fi; do
+ dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/${file}" "/usr/include/${file}"
+ done
+ popd || die
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/fftw" || die
+ for file in *; do
+ dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/fftw/${file}" "/usr/include/fftw/${file}"
+ done
+ popd || die
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/intel64" || die
+ for file in *; do
+ dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/intel64/${file}" "/usr/include/${file}"
+ done
+ popd || die
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/oneapi" || die
+ for file in *; do
+ dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/oneapi/${file}" "/usr/include/oneapi/${file}"
+ done
+ popd || die
+
+ # Symlink files in locale directory
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US" || die
+ for file in *; do
+ dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US/${file}" "/usr/share/locale/en_US/${file}"
+ done
+ popd || die
+
+ # Move everything over to the image directory
+ mv "${S}/"* "${ED}" || die
+
+ dodir /usr/$(get_libdir)/blas/mkl
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so.3
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so.3
+ dodir /usr/$(get_libdir)/lapack/mkl
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so.3
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so.3
+
+ newenvd - "70intel-mkl" <<-_EOF_
+ MKLROOT="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)"
+ PATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64"
+ # we need to duplicate it in ROOTPATH for Portage to respect...
+ ROOTPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64"
+ LDPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64"
+ _EOF_
+}
+
+pkg_postinst() {
+ local libdir=$(get_libdir) me="mkl"
+
+ # check blas
+ eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+ local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+ eselect blas set ${libdir} ${me}
+ elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+ else
+ elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+ elog "To use blas [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect blas set ${libdir} ${me}"
+ fi
+
+ # check lapack
+ eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+ local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+ eselect lapack set ${libdir} ${me}
+ elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+ else
+ elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+ elog "To use lapack [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect lapack set ${libdir} ${me}"
+ fi
+}
+
+pkg_postrm() {
+ eselect blas validate
+ eselect lapack validate
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2022-12-10 18:26 Andrew Ammerlaan
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Ammerlaan @ 2022-12-10 18:26 UTC (permalink / raw
To: gentoo-commits
commit: f344d9ecc4b6fae88fc5795aebdbf57c5563d080
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 18:24:25 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 18:26:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f344d9ec
sci-libs/mkl: add convenience symlink without version number
and drop the symlinks into /usr/include, these create file conflicts.
Applications should be able to find the headers because we set the
MKLROOT variable anyway.
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...1.16993.ebuild => mkl-2022.2.1.16993-r1.ebuild} | 32 +++-------------------
1 file changed, 4 insertions(+), 28 deletions(-)
diff --git a/sci-libs/mkl/mkl-2022.2.1.16993.ebuild b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
similarity index 81%
rename from sci-libs/mkl/mkl-2022.2.1.16993.ebuild
rename to sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
index 5f88f1e40685..63e646576e0a 100644
--- a/sci-libs/mkl/mkl-2022.2.1.16993.ebuild
+++ b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
@@ -27,6 +27,7 @@ RESTRICT="strip"
RDEPEND="
app-eselect/eselect-blas
app-eselect/eselect-lapack
+ sys-cluster/mpich
sys-libs/libomp
"
# bug #801460
@@ -55,34 +56,6 @@ src_install() {
done
popd || die
- # Symlink files in include directory
- pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include" || die
- for file in *.h; do
- dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/${file}" "/usr/include/${file}"
- done
- for file in *.f90; do
- dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/${file}" "/usr/include/${file}"
- done
- for file in *.fi; do
- dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/${file}" "/usr/include/${file}"
- done
- popd || die
- pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/fftw" || die
- for file in *; do
- dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/fftw/${file}" "/usr/include/fftw/${file}"
- done
- popd || die
- pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/intel64" || die
- for file in *; do
- dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/intel64/${file}" "/usr/include/${file}"
- done
- popd || die
- pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/oneapi" || die
- for file in *; do
- dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/oneapi/${file}" "/usr/include/oneapi/${file}"
- done
- popd || die
-
# Symlink files in locale directory
pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US" || die
for file in *; do
@@ -93,6 +66,9 @@ src_install() {
# Move everything over to the image directory
mv "${S}/"* "${ED}" || die
+ # Create convenience symlink that does not include the version number
+ dosym "$(ver_cut 1-3)" /opt/intel/oneapi/mkl/latest
+
dodir /usr/$(get_libdir)/blas/mkl
dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so
dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2022-12-10 19:43 Andrew Ammerlaan
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Ammerlaan @ 2022-12-10 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 39642dae4479db8f6886188aa158c39cf7618a82
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 19:41:44 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 19:42:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39642dae
sci-libs/mkl: add some missing dependencies
there is an optional runtime dependency on DPC++
(currently in ::sci) which causes the remaining unresolved soname
Bug: https://bugs.gentoo.org/885361
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
index 63e646576e0a..2db42ce2ecab 100644
--- a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
+++ b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
@@ -27,6 +27,8 @@ RESTRICT="strip"
RDEPEND="
app-eselect/eselect-blas
app-eselect/eselect-lapack
+ dev-cpp/tbb
+ dev-libs/opencl-icd-loader
sys-cluster/mpich
sys-libs/libomp
"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2023-02-25 6:52 Andrew Ammerlaan
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Ammerlaan @ 2023-02-25 6:52 UTC (permalink / raw
To: gentoo-commits
commit: a2e2ff92e527dcf97177d70385b877950bf98c1f
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 06:52:26 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 06:52:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e2ff92
sci-libs/mkl: add 2023.0.0.25398
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/mkl/Manifest | 4 ++
sci-libs/mkl/mkl-2023.0.0.25398.ebuild | 128 +++++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 72f84cccf7ac..ac12bef12401 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,5 +1,9 @@
DIST intel-oneapi-mkl-2022.2.1-2022.2.1-16993_amd64.deb 202488238 BLAKE2B 9bea2cb85aebaa99eac17563e35e4a33e564e58b3e797ce97c140ee510870d7bccd5ffc138eea86a3c25de988a39b5ed06182cb87f103fd8c2dc772d1bd50b81 SHA512 21f2c8b9608fc942821624132aa905f2ec0863f6af9b8a02c166f88b41620ea4e66d1e6551f5da53e727103e9035f28018b12ee3bee33c76ea10be6a68c82748
+DIST intel-oneapi-mkl-2023.0.0-2023.0.0-25398_amd64.deb 188781126 BLAKE2B f4db4f0e8111a01c697e656de30579c22cba3c34816c8399b1b4cffde33f4b636e837f6eceddc659c5c1d4f38984dec110e7362bb3d91eb521f1cfede64d399a SHA512 7f53a93151e5754219d3fa70722918c26f8f90b040f2587f85ce7e8dc1f73dadba5d138e01e67db4b9c76602d6e8502aa92645a0d10ddbcf5854bb85fcd2dbe6
DIST intel-oneapi-mkl-common-2022.2.1-2022.2.1-16993_all.deb 23890 BLAKE2B 0287ac646a19e8a33b25cbef006cb98c410872fff2294a15d4e35dd55fc037b523c1923d99d2445a1959b6515ef4b6fdfa7243338c2d194b3c4bf4548949216c SHA512 362640c14713bc8186ea712bb6720311cce1dae6e775d7aade4c613a7a5708224507ff4fefa1081165fa366840f94f8ae73ee345699a4fee5cf7cd7607d9f94e
+DIST intel-oneapi-mkl-common-2023.0.0-2023.0.0-25398_all.deb 23930 BLAKE2B d4ea741816edbc69962cd3ac40bacfd200924212da47f30353ee60ef7ddad6a17453e51681e974cdc8f18355c538f1f3305e36a469860dc125f3c21e65fa0861 SHA512 3c190353b19ed32c13e702f45f453c37d62815aef306dc3bcf88faa20b5afe322c577e9129eafe2d1ace0238fde8d1f8fed04fcadd0ed2d6c43f8e5c46a76ce6
DIST intel-oneapi-mkl-common-devel-2022.2.1-2022.2.1-16993_all.deb 4688928 BLAKE2B 545641f68ba7b835859092242a60e065dd7bae8e538b27afaa1f7b266c6ce9aa5c0777b6ced7b8f3a35b70dbe6c6cbfad1db7c370a7a4f4478c8f23b4075bfd5 SHA512 275f267cf103b92ed0bdf56fdd55aee7c5ba5f42d2f7507abe1219aba72f325b9386c8e203a04d4a91020598d0d9cc82b0fc7abe22491c1103f44f3a31d42b2a
+DIST intel-oneapi-mkl-common-devel-2023.0.0-2023.0.0-25398_all.deb 4584320 BLAKE2B 4b172c61def3834d6c9c2ab82345c96fb474839af1abf56da280230fb69e4e01ebeabf5e9bed1dc394bc813595f3f6d0c104e9e7457de2366e17c6e83ce014b0 SHA512 9f300fd9950c734b10e846ccf21ff579dd761158c6e74f33acb77a8f636956c789f67b6757d9ff5e6ae7292782782556b158b413535b39fd39b80a45c634a017
DIST intel-oneapi-mkl-devel-2022.2.1-2022.2.1-16993_amd64.deb 183600754 BLAKE2B 94373a9d71625f71fb406d302eabed7800dc1b0e0ffef6268bf93abdccb8da4adb87643ebe73cd187fe1432b43e6de4eee4b716bb67a483c862e1beef0db486a SHA512 a259580266798e16b6fe6195cfacb1cdd9ae519c86945e7df29b7eff344fbfb238b0126231a99d2190cdbdba6340dce3f40574f443efd09b4955c86260d331da
+DIST intel-oneapi-mkl-devel-2023.0.0-2023.0.0-25398_amd64.deb 171354314 BLAKE2B 27ddc4f1fe09d688e2593e30d1de49505ccf5ac3d8ce50105f29ed451cf402df064419e3795b7f7aeed499fb6fd3191cce0099fa85a20fe90e06cc82415b1c79 SHA512 2688e1ca91bfce33026fd5853d04aa510318d2e6f154755afa2103ba797119b0e2c19718e1180b96fce89d704b9b8d5d3995788320296861b498e18420470572
DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7
diff --git a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild
new file mode 100644
index 000000000000..159969761e31
--- /dev/null
+++ b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Intel Math Kernel Library"
+HOMEPAGE="https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html"
+SRC_URI="
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb
+"
+S="${WORKDIR}"
+
+LICENSE="ISSL"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="strip"
+
+# MKL uses Intel/LLVM OpenMP by default.
+# One can change the threadding layer to "gnu" or "tbb"
+# through the MKL_THREADING_LAYER env var.
+RDEPEND="
+ app-eselect/eselect-blas
+ app-eselect/eselect-lapack
+ dev-cpp/tbb
+ dev-libs/opencl-icd-loader
+ sys-cluster/mpich
+ sys-libs/libomp
+"
+# bug #801460
+BDEPEND="
+ app-arch/xz-utils[extra-filters]
+ app-eselect/eselect-blas
+ app-eselect/eselect-lapack
+"
+
+QA_PREBUILT="*"
+QA_TEXTRELS="*"
+QA_SONAME="*"
+
+src_prepare() {
+ default
+ # Drop conda stuff
+ rm -r opt/intel/oneapi/conda_channel || die
+}
+
+src_install() {
+ # Symlink pkgconfig and cmake files
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig" || die
+ for file in *.pc; do
+ dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig/${file}" "/usr/share/pkgconfig/${file}"
+ done
+ popd || die
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl" || die
+ for file in *.cmake; do
+ dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl/${file}" "/usr/$(get_libdir)/cmake/mkl/${file}"
+ done
+ popd || die
+
+ # Symlink files in locale directory
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US" || die
+ for file in *; do
+ dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US/${file}" "/usr/share/locale/en_US/${file}"
+ done
+ popd || die
+
+ # Move everything over to the image directory
+ mv "${S}/"* "${ED}" || die
+
+ # Create convenience symlink that does not include the version number
+ dosym "$(ver_cut 1-3)" /opt/intel/oneapi/mkl/latest
+
+ dodir /usr/$(get_libdir)/blas/mkl
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so.3
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so.3
+ dodir /usr/$(get_libdir)/lapack/mkl
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so.3
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so.3
+
+ newenvd - "70intel-mkl" <<-_EOF_
+ MKLROOT="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)"
+ PATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64"
+ # we need to duplicate it in ROOTPATH for Portage to respect...
+ ROOTPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64"
+ LDPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64"
+ _EOF_
+}
+
+pkg_postinst() {
+ local libdir=$(get_libdir) me="mkl"
+
+ # check blas
+ eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+ local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+ eselect blas set ${libdir} ${me}
+ elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+ else
+ elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+ elog "To use blas [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect blas set ${libdir} ${me}"
+ fi
+
+ # check lapack
+ eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+ local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+ eselect lapack set ${libdir} ${me}
+ elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+ else
+ elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+ elog "To use lapack [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect lapack set ${libdir} ${me}"
+ fi
+}
+
+pkg_postrm() {
+ eselect blas validate
+ eselect lapack validate
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2024-08-04 11:15 Andrew Ammerlaan
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Ammerlaan @ 2024-08-04 11:15 UTC (permalink / raw
To: gentoo-commits
commit: 74396b56775f26029f39dd5480e731a168351594
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 11:14:59 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 11:15:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74396b56
sci-libs/mkl: add 2023.1.0.46342
Bug: https://bugs.gentoo.org/937280
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/mkl/Manifest | 4 ++
sci-libs/mkl/mkl-2023.1.0.46342.ebuild | 128 +++++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index ac12bef12401..38816ab8cb95 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,9 +1,13 @@
DIST intel-oneapi-mkl-2022.2.1-2022.2.1-16993_amd64.deb 202488238 BLAKE2B 9bea2cb85aebaa99eac17563e35e4a33e564e58b3e797ce97c140ee510870d7bccd5ffc138eea86a3c25de988a39b5ed06182cb87f103fd8c2dc772d1bd50b81 SHA512 21f2c8b9608fc942821624132aa905f2ec0863f6af9b8a02c166f88b41620ea4e66d1e6551f5da53e727103e9035f28018b12ee3bee33c76ea10be6a68c82748
DIST intel-oneapi-mkl-2023.0.0-2023.0.0-25398_amd64.deb 188781126 BLAKE2B f4db4f0e8111a01c697e656de30579c22cba3c34816c8399b1b4cffde33f4b636e837f6eceddc659c5c1d4f38984dec110e7362bb3d91eb521f1cfede64d399a SHA512 7f53a93151e5754219d3fa70722918c26f8f90b040f2587f85ce7e8dc1f73dadba5d138e01e67db4b9c76602d6e8502aa92645a0d10ddbcf5854bb85fcd2dbe6
+DIST intel-oneapi-mkl-2023.1.0-2023.1.0-46342_amd64.deb 181631354 BLAKE2B cd1380fd40505ebbd018e76f6727498ade9e63fd4db4167d38ada8819d264f01883afb00d6d3acd15981134f8c899f293afab9129637c359ba2e0b3cfa2e35ef SHA512 fcbe42bbd3446c7ac5d6986506e44976c8bd0e365ed829f20cc7662388bdd1c09ca1927bde49f8449539faa42eedbfbb7793603354fbfcd5cdc32e0e2564b4bf
DIST intel-oneapi-mkl-common-2022.2.1-2022.2.1-16993_all.deb 23890 BLAKE2B 0287ac646a19e8a33b25cbef006cb98c410872fff2294a15d4e35dd55fc037b523c1923d99d2445a1959b6515ef4b6fdfa7243338c2d194b3c4bf4548949216c SHA512 362640c14713bc8186ea712bb6720311cce1dae6e775d7aade4c613a7a5708224507ff4fefa1081165fa366840f94f8ae73ee345699a4fee5cf7cd7607d9f94e
DIST intel-oneapi-mkl-common-2023.0.0-2023.0.0-25398_all.deb 23930 BLAKE2B d4ea741816edbc69962cd3ac40bacfd200924212da47f30353ee60ef7ddad6a17453e51681e974cdc8f18355c538f1f3305e36a469860dc125f3c21e65fa0861 SHA512 3c190353b19ed32c13e702f45f453c37d62815aef306dc3bcf88faa20b5afe322c577e9129eafe2d1ace0238fde8d1f8fed04fcadd0ed2d6c43f8e5c46a76ce6
+DIST intel-oneapi-mkl-common-2023.1.0-2023.1.0-46342_all.deb 23886 BLAKE2B d166a924baa6014ae82fb4954c7a79eb3d854f7158ecf969f0a52f809ca8df863c9cec6c75e92b7122137e691c0d2bc71f4ed67006725af1ff9c6e66fed4625e SHA512 c51723be1522e9b1dcb41d30e46c9c1314a68f8cd76ee984c4b12e8206872d41360a9a28e89835225427f4ab2e637e4847fceaf6492cb18b18b22f32d124988d
DIST intel-oneapi-mkl-common-devel-2022.2.1-2022.2.1-16993_all.deb 4688928 BLAKE2B 545641f68ba7b835859092242a60e065dd7bae8e538b27afaa1f7b266c6ce9aa5c0777b6ced7b8f3a35b70dbe6c6cbfad1db7c370a7a4f4478c8f23b4075bfd5 SHA512 275f267cf103b92ed0bdf56fdd55aee7c5ba5f42d2f7507abe1219aba72f325b9386c8e203a04d4a91020598d0d9cc82b0fc7abe22491c1103f44f3a31d42b2a
DIST intel-oneapi-mkl-common-devel-2023.0.0-2023.0.0-25398_all.deb 4584320 BLAKE2B 4b172c61def3834d6c9c2ab82345c96fb474839af1abf56da280230fb69e4e01ebeabf5e9bed1dc394bc813595f3f6d0c104e9e7457de2366e17c6e83ce014b0 SHA512 9f300fd9950c734b10e846ccf21ff579dd761158c6e74f33acb77a8f636956c789f67b6757d9ff5e6ae7292782782556b158b413535b39fd39b80a45c634a017
+DIST intel-oneapi-mkl-common-devel-2023.1.0-2023.1.0-46342_all.deb 4661052 BLAKE2B 4cd1504982ce103a0654223e34e3c61fdb0b8759120cb8efb9750e5e0a728ea33b5c34d237bee07591ae32976ea96fa447b745a297061c54e6285a48dcdbec42 SHA512 877c758cc79d4b6239a0cf57b363f7a869b0794caf80f72eeeae9252544d8c2bafabd9f356f1b43839560d394218652e86a7983f30879523009bc144e5b2e814
DIST intel-oneapi-mkl-devel-2022.2.1-2022.2.1-16993_amd64.deb 183600754 BLAKE2B 94373a9d71625f71fb406d302eabed7800dc1b0e0ffef6268bf93abdccb8da4adb87643ebe73cd187fe1432b43e6de4eee4b716bb67a483c862e1beef0db486a SHA512 a259580266798e16b6fe6195cfacb1cdd9ae519c86945e7df29b7eff344fbfb238b0126231a99d2190cdbdba6340dce3f40574f443efd09b4955c86260d331da
DIST intel-oneapi-mkl-devel-2023.0.0-2023.0.0-25398_amd64.deb 171354314 BLAKE2B 27ddc4f1fe09d688e2593e30d1de49505ccf5ac3d8ce50105f29ed451cf402df064419e3795b7f7aeed499fb6fd3191cce0099fa85a20fe90e06cc82415b1c79 SHA512 2688e1ca91bfce33026fd5853d04aa510318d2e6f154755afa2103ba797119b0e2c19718e1180b96fce89d704b9b8d5d3995788320296861b498e18420470572
+DIST intel-oneapi-mkl-devel-2023.1.0-2023.1.0-46342_amd64.deb 171338710 BLAKE2B 7f804f88e88c1bc28c0b2470a703815e33e44fe6e4dacd179095c430a46db34f97f863b3169b96e74f67e14c285f3adf99ff04c60c40e495e17f2a947fc03387 SHA512 1ef5cb3a161b3d2fcf6c1e4a13e696abc8756a9d05723fd7d9c514bf2469f787e9e56f8696fbad25d3102a6d84063fc61daae6b514188c021f5e6b00d67a8dd9
DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7
diff --git a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
new file mode 100644
index 000000000000..973afe5ca76e
--- /dev/null
+++ b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Intel Math Kernel Library"
+HOMEPAGE="https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html"
+SRC_URI="
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb
+ https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb
+"
+S="${WORKDIR}"
+
+LICENSE="ISSL"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="strip"
+
+# MKL uses Intel/LLVM OpenMP by default.
+# One can change the threadding layer to "gnu" or "tbb"
+# through the MKL_THREADING_LAYER env var.
+RDEPEND="
+ app-eselect/eselect-blas
+ app-eselect/eselect-lapack
+ dev-cpp/tbb
+ dev-libs/opencl-icd-loader
+ sys-cluster/mpich[fortran]
+ sys-libs/libomp
+"
+# bug #801460
+BDEPEND="
+ app-arch/xz-utils[extra-filters]
+ app-eselect/eselect-blas
+ app-eselect/eselect-lapack
+"
+
+QA_PREBUILT="*"
+QA_TEXTRELS="*"
+QA_SONAME="*"
+
+src_prepare() {
+ default
+ # Drop conda stuff
+ rm -r opt/intel/oneapi/conda_channel || die
+}
+
+src_install() {
+ # Symlink pkgconfig and cmake files
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig" || die
+ for file in *.pc; do
+ dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig/${file}" "/usr/share/pkgconfig/${file}"
+ done
+ popd || die
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl" || die
+ for file in *.cmake; do
+ dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl/${file}" "/usr/$(get_libdir)/cmake/mkl/${file}"
+ done
+ popd || die
+
+ # Symlink files in locale directory
+ pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US" || die
+ for file in *; do
+ dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US/${file}" "/usr/share/locale/en_US/${file}"
+ done
+ popd || die
+
+ # Move everything over to the image directory
+ mv "${S}/"* "${ED}" || die
+
+ # Create convenience symlink that does not include the version number
+ dosym "$(ver_cut 1-3)" /opt/intel/oneapi/mkl/latest
+
+ dodir /usr/$(get_libdir)/blas/mkl
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so.3
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so.3
+ dodir /usr/$(get_libdir)/lapack/mkl
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so.3
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so
+ dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so.3
+
+ newenvd - "70intel-mkl" <<-_EOF_
+ MKLROOT="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)"
+ PATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64"
+ # we need to duplicate it in ROOTPATH for Portage to respect...
+ ROOTPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64"
+ LDPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64"
+ _EOF_
+}
+
+pkg_postinst() {
+ local libdir=$(get_libdir) me="mkl"
+
+ # check blas
+ eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+ local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+ eselect blas set ${libdir} ${me}
+ elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+ else
+ elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+ elog "To use blas [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect blas set ${libdir} ${me}"
+ fi
+
+ # check lapack
+ eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+ local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+ eselect lapack set ${libdir} ${me}
+ elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+ else
+ elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+ elog "To use lapack [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect lapack set ${libdir} ${me}"
+ fi
+}
+
+pkg_postrm() {
+ eselect blas validate
+ eselect lapack validate
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/
@ 2024-08-17 21:50 Mike Gilbert
0 siblings, 0 replies; 19+ messages in thread
From: Mike Gilbert @ 2024-08-17 21:50 UTC (permalink / raw
To: gentoo-commits
commit: 79e2f6f8768fd0f6b9c4770808be6ee0003b73a7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 21:45:59 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 21:47:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e2f6f8
sci-libs/mkl: fix xz-utils dep
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sci-libs/mkl/mkl-2020.4.304.ebuild | 4 ++--
sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild | 4 ++--
sci-libs/mkl/mkl-2023.0.0.25398.ebuild | 4 ++--
sci-libs/mkl/mkl-2023.1.0.46342.ebuild | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild
index daf81b2b41ea..b5764fafad09 100644
--- a/sci-libs/mkl/mkl-2020.4.304.ebuild
+++ b/sci-libs/mkl/mkl-2020.4.304.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
sys-libs/libomp[${MULTILIB_USEDEP}]
"
# bug #801460
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
QA_PREBUILT="*"
QA_TEXTRELS="*"
diff --git a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
index 2db42ce2ecab..08673a4b5283 100644
--- a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
+++ b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,7 +33,7 @@ RDEPEND="
sys-libs/libomp
"
# bug #801460
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
QA_PREBUILT="*"
QA_TEXTRELS="*"
diff --git a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild
index 159969761e31..55c1ca5a70c6 100644
--- a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild
+++ b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,7 +33,7 @@ RDEPEND="
"
# bug #801460
BDEPEND="
- app-arch/xz-utils[extra-filters]
+ app-arch/xz-utils[extra-filters(+)]
app-eselect/eselect-blas
app-eselect/eselect-lapack
"
diff --git a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
index 973afe5ca76e..024336ac92b8 100644
--- a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
+++ b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
"
# bug #801460
BDEPEND="
- app-arch/xz-utils[extra-filters]
+ app-arch/xz-utils[extra-filters(+)]
app-eselect/eselect-blas
app-eselect/eselect-lapack
"
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-08-17 21:50 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-29 10:02 [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2016-03-02 20:44 Justin Lecher
2016-08-23 8:44 David Seifert
2016-08-23 8:44 David Seifert
2017-12-10 21:41 Michał Górny
2018-05-11 21:56 Patrice Clement
2019-09-23 17:16 Michał Górny
2020-11-09 7:38 Benda XU
2020-11-09 7:38 Benda XU
2020-11-09 14:38 Benda XU
2020-11-10 3:11 Matthias Maier
2021-11-29 5:48 Sam James
2022-11-23 18:25 Andrew Ammerlaan
2022-12-10 15:46 Andrew Ammerlaan
2022-12-10 18:26 Andrew Ammerlaan
2022-12-10 19:43 Andrew Ammerlaan
2023-02-25 6:52 Andrew Ammerlaan
2024-08-04 11:15 Andrew Ammerlaan
2024-08-17 21:50 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox