summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVersus Void2019-03-27 15:40:39 +0300
committerVersus Void2019-03-27 15:40:39 +0300
commite5208b060aff8cbf2618820ca65ecf2791106bf4 (patch)
treeb96e71b579c74e5c128451b2028638d8c5fcae44
parent87d9cb5820e584c03582904d4284dfa3e1993e50 (diff)
downloadaur-e5208b060aff8cbf2618820ca65ecf2791106bf4.tar.gz
New version. Fix conflict with llvm's openmp
-rw-r--r--.SRCINFO43
-rw-r--r--PKGBUILD33
-rw-r--r--intel-mkl-slim.conf1
-rw-r--r--intel-mkl.install8
4 files changed, 53 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e2488f3c203..2cfc3f7c5a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,38 @@
pkgbase = intel-mkl-slim
pkgdesc = Intel Math Kernel Library (x86_64 shared libraries and headers only)
- pkgver = 2019.2.187
+ pkgver = 2019.3.199
pkgrel = 2
url = https://software.intel.com/en-us/mkl
install = intel-mkl.install
arch = x86_64
license = custom:ISSL
optdepends = intel-tbb: Intel® threading implementation
+ optdepends = openmp: Clang OpenMP runtime
+ optdepends = gcc-lib: GNU OpenMP runtime
provides = intel-mkl
conflicts = intel-mkl
replaces = intel-mkl
- noextract = intel-mkl-common-2019.2-187-2019.2-187.noarch.rpm
- noextract = intel-mkl-common-c-2019.2-187-2019.2-187.noarch.rpm
- noextract = intel-mkl-core-rt-2019.2-187-2019.2-187.x86_64.rpm
- noextract = intel-mkl-gnu-rt-2019.2-187-2019.2-187.x86_64.rpm
- noextract = intel-mkl-tbb-rt-2019.2-187-2019.2-187.x86_64.rpm
- noextract = intel-openmp-19.0.2-187-19.0.2-187.x86_64.rpm
- source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15095/onlinedata/rpm/intel-mkl-common-2019.2-187-2019.2-187.noarch.rpm
- source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15095/onlinedata/rpm/intel-mkl-common-c-2019.2-187-2019.2-187.noarch.rpm
- source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15095/onlinedata/rpm/intel-mkl-core-rt-2019.2-187-2019.2-187.x86_64.rpm
- source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15095/onlinedata/rpm/intel-mkl-gnu-rt-2019.2-187-2019.2-187.x86_64.rpm
- source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15095/onlinedata/rpm/intel-mkl-tbb-rt-2019.2-187-2019.2-187.x86_64.rpm
- source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15095/onlinedata/rpm/intel-openmp-19.0.2-187-19.0.2-187.x86_64.rpm
- sha256sums = c44be9800e2f129ffb0fce018df3457ee78df686bf37c7a6632d59ce5c17f6e6
- sha256sums = 065153f14d81892681bfd743e162ce545209ed624e8a53a85f402935e676eddc
- sha256sums = f8a9d89c78a2ea8d698f37fde9532277db054f2c636bfecb2116cc44869494c9
- sha256sums = 44f30d95905ec7f24d874cd59ad37012d39ba98f9dd858f4424a6eb36cc570c4
- sha256sums = c477c1dd925678a3826e8163416c16aa5e0069cd633bec0c36282fba0c30694d
- sha256sums = bc0dc99755cd5b122c394f2614e44b307bd2c595979c0e1b35deef1693d1a144
+ noextract = intel-mkl-common-2019.3-199-2019.3-199.noarch.rpm
+ noextract = intel-mkl-common-c-2019.3-199-2019.3-199.noarch.rpm
+ noextract = intel-mkl-core-rt-2019.3-199-2019.3-199.x86_64.rpm
+ noextract = intel-mkl-gnu-rt-2019.3-199-2019.3-199.x86_64.rpm
+ noextract = intel-mkl-tbb-rt-2019.3-199-2019.3-199.x86_64.rpm
+ noextract = intel-openmp-19.0.3-199-19.0.3-199.x86_64.rpm
+ noextract = intel-mkl-slim.conf
+ source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15275/onlinedata/rpm/intel-mkl-common-2019.3-199-2019.3-199.noarch.rpm
+ source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15275/onlinedata/rpm/intel-mkl-common-c-2019.3-199-2019.3-199.noarch.rpm
+ source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15275/onlinedata/rpm/intel-mkl-core-rt-2019.3-199-2019.3-199.x86_64.rpm
+ source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15275/onlinedata/rpm/intel-mkl-gnu-rt-2019.3-199-2019.3-199.x86_64.rpm
+ source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15275/onlinedata/rpm/intel-mkl-tbb-rt-2019.3-199-2019.3-199.x86_64.rpm
+ source = http://registrationcenter-download.intel.com/akdlm/irc_nas/15275/onlinedata/rpm/intel-openmp-19.0.3-199-19.0.3-199.x86_64.rpm
+ source = intel-mkl-slim.conf
+ sha256sums = af61ba2e8bd22f15bca3442cabf5c53075aa5fa0f48b8b73ad2fcf62cfe5cf73
+ sha256sums = c7f4653eec66660e47b28d5b7d7cf2f62fa753ce3406cfead84f14c60e24817b
+ sha256sums = 7ee93ba52bd90f82f16f515bb9e3561fd92765857307b74e38eff26d8988209d
+ sha256sums = 951abd23243034f26d60b9095552fdcae4b8493bb37f39bd54e79f25712729b3
+ sha256sums = ac1bf128de66c4a37b62df8828ea6f252da72027f58e3962338a6bbfdad93a43
+ sha256sums = a31d8ed5edb0083f4a78dd202df0635412884afd5edfcb8640d30e8d0679a094
+ sha256sums = 90586d84ff1a4273921affe669f9af45ab09b2e97f58483282dd11a194cf9d8a
pkgname = intel-mkl-slim
diff --git a/PKGBUILD b/PKGBUILD
index 04691b91c52..9625c2b6a2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
# Maintainer: Versus Void <chaoskeeper somwhere_at m a i l ru>
pkgname=intel-mkl-slim
-pkgver_hyphen=2019.2-187
+pkgver_hyphen=2019.3-199
pkgver=${pkgver_hyphen/-/.}
pkgrel=2
pkgdesc="Intel Math Kernel Library (x86_64 shared libraries and headers only)"
arch=(x86_64)
url="https://software.intel.com/en-us/mkl"
license=("custom:ISSL")
-depends=()
-optdepends=('intel-tbb: Intel® threading implementation')
+optdepends=(
+ 'intel-tbb: Intel® threading implementation'
+ 'openmp: Clang OpenMP runtime'
+ 'gcc-lib: GNU OpenMP runtime'
+)
provides=(intel-mkl)
conflicts=(intel-mkl)
replaces=(intel-mkl)
-_url="http://registrationcenter-download.intel.com/akdlm/irc_nas/15095/onlinedata/rpm"
-openmp_version=19.0.2-187
+_url="http://registrationcenter-download.intel.com/akdlm/irc_nas/15275/onlinedata/rpm"
+openmp_version=${pkgver_hyphen/2019/19.0}
source=(
"$_url/intel-mkl-common-$pkgver_hyphen-$pkgver_hyphen.noarch.rpm"
"$_url/intel-mkl-common-c-$pkgver_hyphen-$pkgver_hyphen.noarch.rpm"
@@ -21,14 +24,16 @@ source=(
"$_url/intel-mkl-gnu-rt-$pkgver_hyphen-$pkgver_hyphen.x86_64.rpm"
"$_url/intel-mkl-tbb-rt-$pkgver_hyphen-$pkgver_hyphen.x86_64.rpm"
"$_url/intel-openmp-$openmp_version-$openmp_version.x86_64.rpm"
+ intel-mkl-slim.conf
)
noextract=("${source[@]##*/}")
-sha256sums=('c44be9800e2f129ffb0fce018df3457ee78df686bf37c7a6632d59ce5c17f6e6'
- '065153f14d81892681bfd743e162ce545209ed624e8a53a85f402935e676eddc'
- 'f8a9d89c78a2ea8d698f37fde9532277db054f2c636bfecb2116cc44869494c9'
- '44f30d95905ec7f24d874cd59ad37012d39ba98f9dd858f4424a6eb36cc570c4'
- 'c477c1dd925678a3826e8163416c16aa5e0069cd633bec0c36282fba0c30694d'
- 'bc0dc99755cd5b122c394f2614e44b307bd2c595979c0e1b35deef1693d1a144')
+sha256sums=('af61ba2e8bd22f15bca3442cabf5c53075aa5fa0f48b8b73ad2fcf62cfe5cf73'
+ 'c7f4653eec66660e47b28d5b7d7cf2f62fa753ce3406cfead84f14c60e24817b'
+ '7ee93ba52bd90f82f16f515bb9e3561fd92765857307b74e38eff26d8988209d'
+ '951abd23243034f26d60b9095552fdcae4b8493bb37f39bd54e79f25712729b3'
+ 'ac1bf128de66c4a37b62df8828ea6f252da72027f58e3962338a6bbfdad93a43'
+ 'a31d8ed5edb0083f4a78dd202df0635412884afd5edfcb8640d30e8d0679a094'
+ '90586d84ff1a4273921affe669f9af45ab09b2e97f58483282dd11a194cf9d8a')
install=intel-mkl.install
package() {
@@ -42,7 +47,7 @@ package() {
-xf intel-mkl-common-c-$pkgver_hyphen-$pkgver_hyphen.noarch.rpm \
./opt/intel/compilers_and_libraries_$pkgver/linux/mkl/include
- mkdir -p "$pkgdir"/usr/lib
+ mkdir -p "$pkgdir"/usr/lib/intel
echo "Installing libraries"
bsdtar --strip-components 8 -C "$pkgdir"/usr/lib \
-xf intel-mkl-core-rt-$pkgver_hyphen-$pkgver_hyphen.x86_64.rpm \
@@ -55,7 +60,9 @@ package() {
-xf intel-mkl-tbb-rt-$pkgver_hyphen-$pkgver_hyphen.x86_64.rpm \
./opt/intel/compilers_and_libraries_$pkgver/linux/mkl/lib/intel64_lin
- bsdtar --strip-components 8 -C "$pkgdir"/usr/lib \
+ bsdtar --strip-components 8 -C "$pkgdir"/usr/lib/intel \
-xf intel-openmp-$openmp_version-$openmp_version.x86_64.rpm \
./opt/intel/compilers_and_libraries_$pkgver/linux/compiler/lib/intel64_lin/libiomp5.so
+
+ install -Dm644 "$srcdir"/intel-mkl-slim.conf "$pkgdir"/etc/ld.so.conf.d/intel-mkl-slim.conf
}
diff --git a/intel-mkl-slim.conf b/intel-mkl-slim.conf
new file mode 100644
index 00000000000..df6d6d959c6
--- /dev/null
+++ b/intel-mkl-slim.conf
@@ -0,0 +1 @@
+/usr/lib/intel
diff --git a/intel-mkl.install b/intel-mkl.install
index 0130b901ba7..2127b7a1d35 100644
--- a/intel-mkl.install
+++ b/intel-mkl.install
@@ -1,3 +1,11 @@
post_install() {
echo -e "\n\tNOTE: Intel® MKL is redistributed under very restrictive license. Please comply.\n"
+ echo -e "\tIntel® OpenMP runtime is located under /usr/lib/intel/ due to conflict
+ with llvm's openmp package.\n"
+ post_upgrade
+}
+
+post_upgrade() {
+ echo -e "\tNOTE: any binary linking with -liomp5 will now use Intel® OpenMP runtime, sorry.
+ To use llvm's OpenMP runtime link with -lomp.\n"
}