diff options
author | Alexander Phinikarides | 2018-03-29 04:09:47 +0300 |
---|---|---|
committer | Alexander Phinikarides | 2018-03-29 04:09:47 +0300 |
commit | e005e7e54d776732411a0e1bb945078d15dfea00 (patch) | |
tree | 97bb797e342acdf83527beb0a9274a794641df2c | |
parent | 21211b8fe18348faf21b9174142380cce10425d4 (diff) | |
download | aur-e005e7e54d776732411a0e1bb945078d15dfea00.tar.gz |
add TBB
-rw-r--r-- | .SRCINFO | 3 | ||||
-rw-r--r-- | PKGBUILD | 31 | ||||
-rw-r--r-- | r-mkl.install | 1 |
3 files changed, 19 insertions, 16 deletions
@@ -1,7 +1,7 @@ pkgbase = r-mkl pkgdesc = Language and environment for statistical computing and graphics, linked to the Intel(R) MKL. pkgver = 3.4.4 - pkgrel = 2 + pkgrel = 3 url = http://www.r-project.org/ install = r-mkl.install arch = x86_64 @@ -11,6 +11,7 @@ pkgbase = r-mkl depends = intel-mkl depends = intel-compiler-base depends = intel-fortran-compiler + depends = intel-tbb_psxe depends = bzip2 depends = desktop-file-utils depends = gcc-libs @@ -5,7 +5,7 @@ pkgname=r-mkl pkgver=3.4.4 -pkgrel=2 +pkgrel=3 pkgdesc="Language and environment for statistical computing and graphics, linked to the Intel(R) MKL." arch=('x86_64') license=('GPL') @@ -15,6 +15,7 @@ conflicts=('r') depends=('intel-mkl' 'intel-compiler-base' 'intel-fortran-compiler' + 'intel-tbb_psxe' 'bzip2' 'desktop-file-utils' 'gcc-libs' @@ -89,19 +90,18 @@ build() { if [ $_CC = "icc" ]; then source ${MKLROOT}/../bin/compilervars.sh ${_intel_arch} - _intel_cc_opt=" -O3 -xHost -m64 -qopenmp -march=native -fp-model precise -fp-model source -diag-disable=188,308" - # If `-ipo` is used, LDFLAGS need to match CFLAGS - # because IPO is done at link time - # export MAIN_LDFLAGS=${_intel_cc_opt} - export MAIN_LDFLAGS=" -qopenmp" + source ${MKLROOT}/../tbb/bin/tbbvars.sh ${_intel_arch} + _intel_cc_opt=" -O3 -ipo -qno-openmp -xHost -fPIC -m64 -march=native -fp-model precise -fp-model source" + export LDFLAGS=" -qno-openmp" export FLIBS=" -lgfortran -lifcore -lifport" - # Dynamic Linking + # Dynamic Linking with TBB _mkllibs=" -L${MKLROOT}/lib/${_intel_arch} \ -l${_intel_lib} \ - -lmkl_intel_thread \ + -lmkl_tbb_thread \ -lmkl_core \ - -liomp5 \ + -ltbb \ + -lstdc++ \ -lpthread \ -lm \ -ldl" @@ -117,16 +117,17 @@ build() { export FFLAGS="${_intel_cc_opt} -I${MKLROOT}/include" export FCFLAGS="${_intel_cc_opt} -I${MKLROOT}/include" else - _gcc_opt=" -O3 -m64 -fopenmp -march=native" - export MAIN_LDFLAGS=" -fopenmp" + _gcc_opt=" -O3 -fopenmp -m64 -march=native" + export LDFLAGS=" -fopenmp" - # Dynamic Linking + # Dynamic Linking with TBB _mkllibs=" -L${MKLROOT}/lib/${_intel_arch} \ -Wl,--no-as-needed \ -l${_gfortran_lib} \ - -lmkl_intel_thread \ + -lmkl_tbb_thread \ -lmkl_core \ - -liomp5 \ + -ltbb \ + -lstdc++ \ -lpthread \ -lm \ -ldl" @@ -180,7 +181,7 @@ package() { cd src/nmath/standalone make DESTDIR="${pkgdir}" install - # Fixup R wrapper scripts. + # Fix R wrapper scripts. sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R" rm "${pkgdir}/usr/lib/R/bin/R" cd "${pkgdir}/usr/lib/R/bin" diff --git a/r-mkl.install b/r-mkl.install index 522ce52e7b1f..f116b0532507 100644 --- a/r-mkl.install +++ b/r-mkl.install @@ -4,6 +4,7 @@ post_install() { echo ">>> updating the filename database for texlive..." mktexlsr --quiet usr/share/texmf fi + ldconfig } post_upgrade() { |