diff options
| -rw-r--r-- | .SRCINFO | 58 | ||||
| -rw-r--r-- | PKGBUILD | 485 | ||||
| -rw-r--r-- | intel-mkl-th.conf | 14 | ||||
| -rw-r--r-- | intel-mkl.conf | 1 | ||||
| -rw-r--r-- | intel-mkl.install | 19 | ||||
| -rwxr-xr-x | intel-mkl.sh | 5 | ||||
| -rw-r--r-- | intel-mpi.conf | 2 | ||||
| -rw-r--r-- | intel_vtune-amplifier.sh | 2 | ||||
| -rw-r--r-- | intel_vtune-profiler.sh | 2 | ||||
| -rw-r--r-- | zsh-fix.patch | 12 |
10 files changed, 244 insertions, 356 deletions
@@ -1,6 +1,6 @@ pkgbase = intel-parallel-studio-xe - pkgdesc = Intel C++ C and FORTRAN compiler - Intel Parallel Studio XE - Cluster Edition - icc icpc ifort ipp mkl - pkgver = 2019.3.199 + pkgdesc = Intel C++ C and FORTRAN compiler - Intel Parallel Studio XE - Cluster Edition - icc icpc ifort ipp + pkgver = 2020.4.304 pkgrel = 3 url = http://software.intel.com/en-us/articles/non-commercial-software-download/ arch = x86_64 @@ -14,74 +14,59 @@ pkgbase = intel-parallel-studio-xe options = strip options = libtool options = staticlibs - source = http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15268/parallel_studio_xe_2019_update3_cluster_edition.tgz - source = http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15260/l_mpi_2019.3.199.tgz + source = http://registrationcenter-download.intel.com/akdlm/IRC_NAS/tec/17113/parallel_studio_xe_2020_update4_cluster_edition.tgz source = intel_compilers.sh - source = intel_vtune-amplifier.sh + source = intel_vtune-profiler.sh source = intel_advisor.sh source = intel_inspector.sh source = intel-composer.install source = intel-common-libs.conf source = intel-fortran.conf source = intel-openmp.conf - source = intel-mkl.conf source = intel-mpi.conf source = intel-ipp.conf source = intel-tbb.conf - source = intel-mkl.sh - source = intel-mkl.install - source = intel-mkl-th.conf source = intel-tbb.install + source = zsh-fix.patch source = EULA.txt - sha256sums = b5b022366d6d1a98dbb63b60221c62bc951c9819653ad6f5142192e89f78cf63 - sha256sums = 5304346c863f64de797250eeb14f51c5cfc8212ff20813b124f20e7666286990 + sha256sums = f36e49da97b6ce24d2d464d73d7ff49d71cff20e1698c20e607919819602a9f5 sha256sums = 0704025fdfe40e4fce08e88b641128310c3a3b51332668aab60fb815b424f52b - sha256sums = 58bced75693b2f73480b89242b33c9a0ce565d6a12a17f84067bab351bde9be7 + sha256sums = 12f932f99e6d3ee9dd828b95e630f096a9e58707db39bea15fba22a1ad80f211 sha256sums = 63b12c66d9c8c2310a7bbd5206c82ba9667fb6ffb3dc7e3f9304a17ed8c8fbcd sha256sums = fd24842f29d50bc53779dd918fbc548ebf165ff664114e59195773ad04076b5d sha256sums = 3f96dec03111e69d16bb363acf4d0570e8a9526c09e5e542a7558f1b26d043ef sha256sums = 31ac4d0f30a93fe6393f48cb13761d7d1ce9719708c76a377193d96416bed884 sha256sums = 6151bc273b6f741a4ce93d8160b6f167c8ad499dbc6e8e3f6e08d48571d6a52a sha256sums = 99cc9683cc75934cc21bb5a09f6ad83365ee48712719bfd914de9444695eed13 - sha256sums = a856326362e9b80c19dc237cbf66bf3d96a69bd7ad1baff99ec9849f8208348c - sha256sums = ed02ea4a0ebc9c32b53155bc5e442c46257f8185ae17833be0b975558bbc951a + sha256sums = 2345695151930806cc73c14a35b8cde94281def144d0c2c180357862fd08fcaa sha256sums = da6f41c2e002c9a793c75a18c8d1c85ef7ef5bf83a7a0a158ff144481491aac8 sha256sums = 5d3ac1ba31d7fc5795821d95b17956b0c977c8f3576b02f664f8ebf476213a43 - sha256sums = 5e68c529c65cac54218026c869e54b2ddb268179725fc1e6b56d920470dad999 - sha256sums = 11398c0ae2e2011902b1d6356d916d41bb8b54d39d090c6c83630f4b0e84e93a - sha256sums = e515cb28bf40cdb0db818db6a2688a0028575153a1b9d5acfb0bc5f13fe45722 sha256sums = fde83eb0071a5bd2887de127b56cc573a254e30131ec7b2d956987512c3e90c2 + sha256sums = 48632e9831c1066721c0ed8e561cbae1c5bbe470851c05d5de3a05b2b18e676b sha256sums = 228ac25e147adb9b872e1a562e522d2fd48809ccae89b765112009896a6d55a5 pkgname = intel-common-libs - pkgdesc = Intel Common Libraries 19.0.3 + pkgdesc = Intel Common Libraries 19.1.3 pkgname = intel-openmp - pkgdesc = Intel OpenMP Implementation 19.0.3 - depends = intel-common-libs=2019.3.199 + pkgdesc = Intel OpenMP Implementation 19.1.3 + depends = intel-common-libs=2020.4.304 pkgname = intel-compiler-base - pkgdesc = Intel C/C++ 19.0.3 + pkgdesc = Intel C/C++ 19.1.3 install = intel-composer.install - depends = intel-common-libs=2019.3.199 - depends = intel-openmp=2019.3.199 + depends = intel-common-libs=2020.4.304 + depends = intel-openmp=2020.4.304 pkgname = intel-fortran-compiler - pkgdesc = Intel Fortran compiler 19.0.3 + pkgdesc = Intel Fortran compiler 19.1.3 install = intel-composer.install - depends = intel-compiler-base=2019.3.199 + depends = intel-compiler-base=2020.4.304 pkgname = intel-ipp pkgdesc = Intel Integrated Performance Primitives install = intel-composer.install -pkgname = intel-mkl - pkgdesc = Intel Math Kernel Library (Intel® MKL) - install = intel-mkl.install - depends = intel-common-libs=2019.3.199 - optdepends = intel-openmp: Intel OpenMP Implementation - backup = etc/intel-mkl-th.conf - pkgname = intel-mpi pkgdesc = Intel MPI library @@ -90,14 +75,15 @@ pkgname = intel-tbb_psxe install = intel-tbb.install pkgname = intel-advisor - pkgdesc = Threading design and prototyping tool for software architects 2019.3.0.591490 + pkgdesc = Threading design and prototyping tool for software architects 2020.3.0.607294 conflicts = intel-advisor-xe -pkgname = intel-vtune-amplifier - pkgdesc = Performance profiler for serial and parallel performance analysis 2019.3.0.591499 +pkgname = intel-vtune-profiler + pkgdesc = Performance profiler for serial and parallel performance analysis 2020.3.0.612611 depends = pangox-compat + options = !strip pkgname = intel-inspector - pkgdesc = Memory and thread debugger 2019.3.0.591484 + pkgdesc = Memory and thread debugger 2020.3.0.604771 conflicts = intel-inspector-xe @@ -1,5 +1,6 @@ -# Maintainer: Stephen Cox: stephencoxmail -at- gmail com -# Maintainer: Alexey Stukalov: astukalov -t- gmail com +# Maintainer: Kaixiang Huang: kxhuang0 -at- gmail.com +# Contributor: Stephen Cox: stephencoxmail -at- gmail com +# Contributor: Alexey Stukalov: astukalov -t- gmail com # Contributor: Ignat Harczuk: ignathe -at- gmail com # Contributor: Mark Wells: mwellsa -at- gmail com # Contributor: Simone Riva: siomone.rva -a- gmail com @@ -7,17 +8,16 @@ # Intel Parallel Studio XE 2019 for Linux - ( Intel compiler icc suite ) ########################################################################## -# this PKGBUILD splits the main Parallel Studio XE package in 9 sub-packages: +# this PKGBUILD splits the main Parallel Studio XE package in 10 sub-packages: # # intel-common-libs: Intel Common Libraries # intel-openmp: Intel OpenMP Implementation # intel-compiler-base: Intel C/C++ compiler and base libs # intel-fortran-compiler: Intel Fortran compiler and base libs" # intel-ipp: Intel Integrated Performance Primitives -# intel-mkl: Intel Math Kernel Library (Intel® MKL) # intel-mpi: Intel Message passing interface (MPI) # intel-tbb_psxe: Intel Threading Building Blocks (TBB) -# intel-vtune: Intel Vtune Amplifier +# intel-vtune-profiler: Intel Vtune Profiler # intel-advisor: Intel Advisor # intel-inspector: Intel Inspector ########################################################################### @@ -44,18 +44,17 @@ pkgname=('intel-common-libs' 'intel-compiler-base' 'intel-fortran-compiler' 'intel-ipp' - 'intel-mkl' 'intel-mpi' 'intel-tbb_psxe' 'intel-advisor' - 'intel-vtune-amplifier' + 'intel-vtune-profiler' 'intel-inspector') if [ -z "$FORCE_PKGEXT" ]; then - PKGEXT='.pkg.tar.lzo' - msg "Overriding the default PKGEXT with '${PKGEXT}' to save compression time" - msg "(change PKGEXT in the PKGBUILD or use FORCE_PKGEXT on the command line" - msg " to override PKGEXT set by the package)." + PKGEXT='.pkg.tar.zst' + #msg "Overriding the default PKGEXT with '${PKGEXT}' to save compression time" + #msg "(change PKGEXT in the PKGBUILD or use FORCE_PKGEXT on the command line" + #msg " to override PKGEXT set by the package)." else msg "Overriding PKGEXT with FORCE_PKGEXT='${FORCE_PKGEXT}'" PKGEXT=$FORCE_PKGEXT @@ -78,34 +77,29 @@ fi _remove_docs=true # set to true if you want to remove the static objects from the libs. -#_remove_static_objects_mkl=true -_remove_static_objects_mkl=false - #_remove_static_objects_ipp=true _remove_static_objects_ipp=false ######################################## -_year='2019' -_v_a='3' -_v_b='199' +_year='2020' +_v_a='4' +_v_b='304' # year, version a and version b found in /opt/intel/compilers_and_libraries_YEAR_A_B -_update='3' +_update='4' pkgrel=3 - _sp='cluster_edition' -_icc_ver='19.0.3' -_vtune_ver='2019.3.0.591499' -_inspector_ver='2019.3.0.591484' -_advisor_ver='2019.3.0.591490' +_icc_ver='19.1.3' +_vtune_ver='2020.3.0.612611' +_inspector_ver='2020.3.0.604771' +_advisor_ver='2020.3.0.607294' pkgver=${_year}.${_v_a}.${_v_b} # package download folders -_dir_nr='15268' -_mpi_dir_nr='15260' +_dir_nr='17113' options=(strip libtool staticlibs) @@ -117,89 +111,100 @@ makedepends=('libarchive' 'sed' 'gzip' 'lzop') _parallel_studio_xe_dir="parallel_studio_xe${_year:+_${_year}}${_update:+_update${_update}}${_sp:+_${_sp}}" source=( - "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/${_dir_nr}/${_parallel_studio_xe_dir}.tgz" - "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/${_mpi_dir_nr}/l_mpi_${_year}.${_v_a}.${_v_b}.tgz" + "http://registrationcenter-download.intel.com/akdlm/IRC_NAS/tec/${_dir_nr}/${_parallel_studio_xe_dir}.tgz" 'intel_compilers.sh' - 'intel_vtune-amplifier.sh' + 'intel_vtune-profiler.sh' 'intel_advisor.sh' 'intel_inspector.sh' 'intel-composer.install' 'intel-common-libs.conf' + 'intel-fortran.conf' 'intel-openmp.conf' - 'intel-mkl.conf' 'intel-mpi.conf' 'intel-ipp.conf' 'intel-tbb.conf' - 'intel-mkl.sh' - 'intel-mkl.install' - 'intel-mkl-th.conf' 'intel-tbb.install' + 'zsh-fix.patch' 'EULA.txt' ) - - -sha256sums=('b5b022366d6d1a98dbb63b60221c62bc951c9819653ad6f5142192e89f78cf63' - '5304346c863f64de797250eeb14f51c5cfc8212ff20813b124f20e7666286990' +sha256sums=('f36e49da97b6ce24d2d464d73d7ff49d71cff20e1698c20e607919819602a9f5' '0704025fdfe40e4fce08e88b641128310c3a3b51332668aab60fb815b424f52b' - '58bced75693b2f73480b89242b33c9a0ce565d6a12a17f84067bab351bde9be7' + '12f932f99e6d3ee9dd828b95e630f096a9e58707db39bea15fba22a1ad80f211' '63b12c66d9c8c2310a7bbd5206c82ba9667fb6ffb3dc7e3f9304a17ed8c8fbcd' 'fd24842f29d50bc53779dd918fbc548ebf165ff664114e59195773ad04076b5d' '3f96dec03111e69d16bb363acf4d0570e8a9526c09e5e542a7558f1b26d043ef' '31ac4d0f30a93fe6393f48cb13761d7d1ce9719708c76a377193d96416bed884' '6151bc273b6f741a4ce93d8160b6f167c8ad499dbc6e8e3f6e08d48571d6a52a' '99cc9683cc75934cc21bb5a09f6ad83365ee48712719bfd914de9444695eed13' - 'a856326362e9b80c19dc237cbf66bf3d96a69bd7ad1baff99ec9849f8208348c' - 'ed02ea4a0ebc9c32b53155bc5e442c46257f8185ae17833be0b975558bbc951a' + '2345695151930806cc73c14a35b8cde94281def144d0c2c180357862fd08fcaa' 'da6f41c2e002c9a793c75a18c8d1c85ef7ef5bf83a7a0a158ff144481491aac8' '5d3ac1ba31d7fc5795821d95b17956b0c977c8f3576b02f664f8ebf476213a43' - '5e68c529c65cac54218026c869e54b2ddb268179725fc1e6b56d920470dad999' - '11398c0ae2e2011902b1d6356d916d41bb8b54d39d090c6c83630f4b0e84e93a' - 'e515cb28bf40cdb0db818db6a2688a0028575153a1b9d5acfb0bc5f13fe45722' 'fde83eb0071a5bd2887de127b56cc573a254e30131ec7b2d956987512c3e90c2' + '48632e9831c1066721c0ed8e561cbae1c5bbe470851c05d5de3a05b2b18e676b' '228ac25e147adb9b872e1a562e522d2fd48809ccae89b765112009896a6d55a5') + #_archive=l_ccompxe${_comp}_p_${pkgver} if [ "$CARCH" = "i686" ]; then _i_arch='ia32' - _i_arch2='i486' _bin_dir='bin32' _not_arch='intel64' - _not_arch2='x86_64' else _i_arch='intel64' - _i_arch2='x86_64' _bin_dir='bin64' _not_arch='ia32' - _not_arch2='i486' fi extract_rpm() { - msg2 " ${1##*/}" - bsdtar -xf $1 -C $2 + # filter out rpms for incompatible arch + local extract=true + if [[ "$1" =~ .noarch.rpm$ ]]; then + if [[ "$1" =~ -doc ]]; then + if $_remove_docs ; then + # don't skip doc rpms because they contain man pages + #extract=false + extract=true + fi + fi + else + if [[ "$1" =~ (-32bit.+\.x86_64|\.i486)\.rpm$ ]]; then + if [[ "$CARCH" != 'i686' ]]; then + extract=false + fi + else + if [[ "$CARCH" == 'i686' ]]; then + extract=false + fi + fi + fi + if $extract ; then + msg2 " ${1##*/}" + bsdtar -xf $1 -C $2 + else + plain "skipped ${1##*/}" + fi } extract_rpms() { - for rpm_file in ${rpm_dir}/$1 ; do - extract_rpm ${rpm_file} $2 - done -} - -extract_mpi_rpms() { - for rpm_file in ${mpi_rpm_dir}/$1 ; do + # select binary files of specific arch + if [ -z "$3" ]; then + _rpm_dir="${rpm_dir}" + else + _rpm_dir="$3" + fi + for rpm_file in ${_rpm_dir}/$1 ; do extract_rpm ${rpm_file} $2 done } set_build_vars() { - _pkg_ver=${pkgver} _composer_xe_dir="compilers_and_libraries_${_year}.${_v_a}.${_v_b}" rpm_dir=${srcdir}/${_parallel_studio_xe_dir}/rpm - mpi_rpm_dir=${srcdir}/l_mpi_${_year}.${_v_a}.${_v_b}/rpm xe_build_dir=${srcdir}/cxe_build - base_dir=`realpath ${srcdir}/..` + base_dir=$(realpath ${srcdir}/..) _man_dir=${xe_build_dir}/usr/share/man/man1 } @@ -292,13 +297,6 @@ build() { msg2 "Remove Documentation: NO" fi - if ${_remove_static_objects_mkl} ; then - msg2 "Remove Static Objects from MKL: YES" - warning "If your software is based on the static MKL objects, edit" - warning "the _remove_static_objects_mkl option at the line 50 of this PKGBUILD" - else - msg2 "Remove Static Objects from MKL: NO" - fi if ${_remove_static_objects_ipp} ; then msg2 "Remove Static Objects from IPP: YES" warning "If your software is based on the static IPP objects, edit" @@ -311,51 +309,47 @@ build() { if [ -d ${pkgdir}/opt ] ; then rm -rf ${pkgdir}/opt fi ; - - cd ${srcdir}/${_parallel_studio_xe_dir}/rpm - rm -v -f *.${_not_arch2}.rpm } package_intel-common-libs() { set_build_vars pkgdesc="Intel Common Libraries $_icc_ver" - pkgver=${_pkg_ver} - - mkdir -p ${xe_build_dir}/opt - cp ${srcdir}/intel-common-libs.conf ${xe_build_dir}/etc/ld.so.conf.d/ + mkdir -p ${xe_build_dir} cd ${xe_build_dir} + mkdir -p ./opt + mkdir -p ./etc/ld.so.conf.d + + cp ${srcdir}/intel-common-libs.conf ./etc/ld.so.conf.d/ msg2 "Extracting RPMS" extract_rpms 'intel-comp-ps-ss-bec*.rpm' $xe_build_dir extract_rpms 'intel-c-*.rpm' $xe_build_dir msg2 "Moving package files" mkdir -p ${pkgdir}/etc - mv ${xe_build_dir}/opt ${pkgdir} + mv ./opt ${pkgdir} # move ld.so configs, but keep profile.d (should be in intel-compiler-base) - mv ${xe_build_dir}/etc/ld.so.conf.d ${pkgdir}/etc/ + mv ./etc/ld.so.conf.d ${pkgdir}/etc/ - cd ${pkgdir}/opt/intel - - ln -s ./${_composer_xe_dir}/linux/compiler/lib/${_i_arch}_lin lib + ln -s ./${_composer_xe_dir}/linux/compiler/lib/${_i_arch}_lin ${pkgdir}/opt/intel/lib } package_intel-openmp() { set_build_vars pkgdesc="Intel OpenMP Implementation ${_icc_ver}" - pkgver=${_pkg_ver} depends=("intel-common-libs=$pkgver") - mkdir -p ${xe_build_dir}/opt - + mkdir -p ${xe_build_dir} cd ${xe_build_dir} + mkdir -p ./opt + msg2 "Extracting RPMS" extract_rpms 'intel-openmp*.rpm' $xe_build_dir msg2 "Moving package files" - mv ${xe_build_dir}/opt ${pkgdir} + mv ./opt ${pkgdir}/ } package_intel-compiler-base() { @@ -363,25 +357,24 @@ package_intel-compiler-base() { set_build_vars pkgdesc="Intel C/C++ $_icc_ver" - pkgver=${_pkg_ver} depends=("intel-common-libs=$pkgver" "intel-openmp=$pkgver") install=intel-composer.install - mkdir -p ${xe_build_dir}/opt - mkdir -p ${xe_build_dir}/etc/profile.d + mkdir -p ${xe_build_dir} + cd ${xe_build_dir} + mkdir -p ./opt + mkdir -p ./etc/profile.d mkdir -p ${_man_dir} - - cd ${xe_build_dir} msg2 "Extracting RPMS" extract_rpms 'intel-icc*.rpm' $xe_build_dir - for rpm_file in `find ${rpm_dir} -iname 'intel-comp-*.rpm' ! -iname 'intel-comp-ps-ss-bec-*.rpm' -print` ; do + for rpm_file in `find ${rpm_dir} -name 'intel-comp-*.rpm' ! -name 'intel-comp-ps-ss-bec-*.rpm' -print` ; do extract_rpm $rpm_file $xe_build_dir done msg2 "Updating scripts" - cd ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/bin + cd ./opt/intel/${_composer_xe_dir}/linux/bin #rm uninstall.sh rm *.csh @@ -391,33 +384,30 @@ package_intel-compiler-base() { sed -i "s/<INSTALLDIR>/\/opt\/intel\/${_composer_xe_dir}\/linux/g" $f done - cd $_i_arch - sed -i "s/<INSTALLDIR>/\/opt\/intel\/${_composer_xe_dir}\/linux/g" loopprofileviewer.sh - chmod a+x loopprofileviewer.sh - rm loopprofileviewer.csh + msg2 "Copying man pages" + mv ${xe_build_dir}/opt/intel/documentation_${_year}/en/man/common/man1/*.1 ${_man_dir} + cd ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux if $_remove_docs ; then msg2 "Removing documentation" - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/documentation - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/Documentation - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/Samples + rm -rf ./documentation + rm -rf ./Documentation + rm -rf ./Samples + rm -rf ${xe_build_dir}/opt/intel/documentation_${_year} fi - msg2 "Copying man pages" - mv ${xe_build_dir}/opt/intel/documentation_${_year}/en/man/common/man1/*.1 ${_man_dir} - - gzip ${_man_dir}/*.1 - msg2 "Moving package files" - mv ${xe_build_dir}/opt ${pkgdir} - mv ${xe_build_dir}/etc ${pkgdir} - mv ${xe_build_dir}/usr ${pkgdir} + mv ${xe_build_dir}/opt ${pkgdir}/ + mv ${xe_build_dir}/etc ${pkgdir}/ + mv ${xe_build_dir}/usr ${pkgdir}/ cd ${pkgdir}/opt/intel ln -s ./${_composer_xe_dir} composerxe ln -s ./${_composer_xe_dir}/linux/bin/${_i_arch} bin ln -s ./${_composer_xe_dir}/linux/pkg_bin pkg_bin + patch -p0 < ${srcdir}/zsh-fix.patch + #ln -s ./${_composer_xe_dir}/linux/debugger/lib/${_i_arch} debugger_lib #ln -s ./${_composer_xe_dir}/linux/man/ man } @@ -427,53 +417,47 @@ package_intel-fortran-compiler() { set_build_vars pkgdesc="Intel Fortran compiler $_icc_ver" - pkgver=${_pkg_ver} depends=("intel-compiler-base=$pkgver") install=intel-composer.install - mkdir -p ${xe_build_dir}/opt - mkdir -p ${xe_build_dir}/etc/profile.d - mkdir -p ${xe_build_dir}/etc/ld.so.conf.d + mkdir -p ${xe_build_dir} + cd ${xe_build_dir} + mkdir -p ./opt + mkdir -p ./etc/profile.d + mkdir -p ./etc/ld.so.conf.d mkdir -p ${_man_dir} - sed "s/<arch>/${_i_arch}/" < ${srcdir}/intel-fortran.conf > ${xe_build_dir}/etc/ld.so.conf.d/intel-fortran.conf - - cd ${xe_build_dir} + sed "s/<arch>/${_i_arch}/" < ${srcdir}/intel-fortran.conf > ./etc/ld.so.conf.d/intel-fortran.conf msg2 "Extracting RPMS" extract_rpms 'intel-ifort*.rpm' $xe_build_dir msg2 "Updating scripts" - cd ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/bin - - rm *.csh + rm ./opt/intel/${_composer_xe_dir}/linux/bin/*.csh #Remove duplicate logo and .css found in intel base - rm ${xe_build_dir}/opt/intel/documentation_${_year}/en/compiler_f/ps${_year}/resources/intel_gsp_styles.css - rm ${xe_build_dir}/opt/intel/documentation_${_year}/en/compiler_f/ps${_year}/resources/intel_logo.png - - if $_remove_docs ; then - msg2 "Removing documentation" - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/documentation - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/Documentation - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/Samples - fi + rm ${xe_build_dir}/opt/intel/documentation_${_year}/en/compiler_f/ps${_year}/resources/{intel_gsp_styles.css,intel_logo.png} msg2 "Copying man pages" mv ${xe_build_dir}/opt/intel/documentation_${_year}/en/man/common/man1/*.1 ${_man_dir} - gzip ${_man_dir}/*.1 + cd ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux + if $_remove_docs ; then + msg2 "Removing documentation" + rm -rf ./documentation + rm -rf ./Documentation + rm -rf ./Samples + fi - # Remove duplicate headers found in intel base - rm ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/compiler/include/omp_lib.f90 - rm ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/compiler/include/intel64/omp_lib.mod - rm ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/compiler/include/intel64/omp_lib_kinds.mod - cd ${xe_build_dir} + msg2 "Removing duplicate headers found in intel-compiler-base" + rm ./compiler/include/omp_lib.f90 + rm ./compiler/include/${_i_arch}/omp_lib.mod + rm ./compiler/include/${_i_arch}/omp_lib_kinds.mod msg2 "Moving package files" - mv ${xe_build_dir}/opt ${pkgdir} - mv ${xe_build_dir}/etc ${pkgdir} - mv ${xe_build_dir}/usr ${pkgdir} + mv ${xe_build_dir}/opt ${pkgdir}/ + mv ${xe_build_dir}/etc ${pkgdir}/ + mv ${xe_build_dir}/usr ${pkgdir}/ } package_intel-ipp() { @@ -481,16 +465,15 @@ package_intel-ipp() { set_build_vars pkgdesc="Intel Integrated Performance Primitives" - pkgver=${_pkg_ver} install=intel-composer.install - mkdir -p ${xe_build_dir}/opt - - mkdir -p ${xe_build_dir}/etc/ld.so.conf.d + mkdir -p ${xe_build_dir} + cd ${xe_build_dir} + mkdir -p ./opt + mkdir -p ./etc/ld.so.conf.d - sed "s/<arch>/${_i_arch}/" < ${srcdir}/intel-ipp.conf > ${xe_build_dir}/etc/ld.so.conf.d/intel-ipp.conf + sed "s/<arch>/${_i_arch}/" < ${srcdir}/intel-ipp.conf > ./etc/ld.so.conf.d/intel-ipp.conf - cd ${xe_build_dir} msg2 "Extracting RPMS" extract_rpms 'intel-ipp-*.rpm' $xe_build_dir @@ -499,104 +482,49 @@ package_intel-ipp() { rm ippvars.csh sed -i "s/<INSTALLDIR>/\/opt\/intel\/${_composer_xe_dir}\/linux/g" ippvars.sh + cd ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/ if ${_remove_docs} ; then msg2 "Removing documentation" - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/Documentation + rm -rf ./Documentation fi if ${_remove_static_objects_ipp} ; then msg2 "Removing static objects" - rm -f ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/ipp/lib/${_i_arch}/libipp*.a - rm -f ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/ipp/lib/${_i_arch}/nonpic/libipp*.a - rmdir ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/ipp/lib/${_i_arch}/nonpic/ + rm -f ./ipp/lib/${_i_arch}/libipp*.a + rm -f ./ipp/lib/${_i_arch}/nonpic/libipp*.a + rmdir ./ipp/lib/${_i_arch}/nonpic/ fi msg2 "Moving package files" - mv ${xe_build_dir}/opt ${pkgdir} - mv ${xe_build_dir}/etc ${pkgdir} + mv ${xe_build_dir}/opt ${pkgdir}/ + mv ${xe_build_dir}/etc ${pkgdir}/ ln -s ./${_composer_xe_dir}/linux/ipp/ ${pkgdir}/opt/intel/ipp } -package_intel-mkl() { - - set_build_vars - - pkgdesc="Intel Math Kernel Library (Intel® MKL)" - pkgver=${_pkg_ver} - depends=("intel-common-libs=$pkgver") - optdepends=("intel-openmp: Intel OpenMP Implementation") - install=intel-mkl.install - backup=('etc/intel-mkl-th.conf') - - mkdir -p ${xe_build_dir}/opt - mkdir -p ${xe_build_dir}/etc/ld.so.conf.d - mkdir -p ${xe_build_dir}/etc/profile.d - - cp ${srcdir}/intel-mkl.sh ${xe_build_dir}/etc/profile.d/ - chmod a+x ${xe_build_dir}/etc/profile.d/intel-mkl.sh - - cp ${srcdir}/intel-mkl-th.conf ${xe_build_dir}/etc/ - - sed "s/<arch>/${_i_arch}/" < ${srcdir}/intel-mkl.conf > ${xe_build_dir}/etc/ld.so.conf.d/intel-mkl.conf - - cd ${xe_build_dir} - - msg2 "Extracting RPMS" - extract_rpms 'intel-mkl-*.rpm' $xe_build_dir - - msg2 "Updating scripts" - cd ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/mkl/bin - rm mklvars.csh - sed -i "s/<INSTALLDIR>/\/opt\/intel\/${_composer_xe_dir}\/linux/g" mklvars.sh - - rm -rf ./${_not_arch} - - if ${_remove_docs} ; then - msg2 "Removing documentation" - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/mkl/examples - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/mkl/benchmarks - fi - - if ${_remove_static_objects_mkl} ; then - msg2 "Removing static objects" - rm -f ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/mkl/lib/${_i_arch}/libmkl_*.a - rm -f ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/mkl/lib/mic/libmkl_*.a - fi - - msg2 "Moving package files" - mv ${xe_build_dir}/opt ${pkgdir} - mv ${xe_build_dir}/etc ${pkgdir} - - ln -s ./${_composer_xe_dir}/linux/mkl/ ${pkgdir}/opt/intel/mkl -} - package_intel-mpi() { set_build_vars pkgdesc="Intel MPI library" - pkgver=${_pkg_ver} - - mkdir -p ${xe_build_dir}/opt - mkdir -p ${xe_build_dir}/bin - mkdir -p ${xe_build_dir}/etc/ld.so.conf.d - - sed "s/<arch>/${_i_arch}/" < ${srcdir}/intel-mpi.conf > ${xe_build_dir}/etc/ld.so.conf.d/intel-mpi.conf + mkdir -p ${xe_build_dir} cd ${xe_build_dir} + mkdir -p ./opt + mkdir -p ./bin + mkdir -p ./etc/ld.so.conf.d + + sed "s/<arch>/${_i_arch}/" < ${srcdir}/intel-mpi.conf > ./etc/ld.so.conf.d/intel-mpi.conf msg2 "Extracting RPMS" extract_rpms 'intel-mpi-*.rpm' $xe_build_dir - extract_mpi_rpms 'intel-mpi-sdk-*.rpm' $xe_build_dir msg2 "Updating scripts" - cd ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/mpi/${_i_arch}/bin + cd ./opt/intel/${_composer_xe_dir}/linux/mpi/${_i_arch}/bin rm mpivars.csh #for i in mpd* mpi* no mpd longer since 2017? - for i in mpi* - do + for i in mpi* ; do sed -i "s/I_MPI_SUBSTITUTE_INSTALLDIR/\/opt\/intel\/${_composer_xe_dir}\/linux\/mpi/g" $i done @@ -605,6 +533,11 @@ package_intel-mpi() { rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/mpi_2019 rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/licensing/mpi_2019 + if $_remove_docs ; then + msg2 "Removing documentation" + rm -rf ${xe_build_dir}/opt/intel/documentation_${_year} + fi + msg2 "Moving package files" mv ${xe_build_dir}/opt ${pkgdir} mv ${xe_build_dir}/etc ${pkgdir} @@ -617,86 +550,80 @@ package_intel-tbb_psxe() { set_build_vars pkgdesc="Intel Threading Building Blocks (TBB)" - pkgver=${_pkg_ver} install=intel-tbb.install - mkdir -p ${xe_build_dir}/opt - mkdir -p ${xe_build_dir}/etc/ld.so.conf.d - - sed "s/<arch>/${_i_arch}/" < ${srcdir}/intel-tbb.conf > ${xe_build_dir}/etc/ld.so.conf.d/intel-tbb.conf - sed -i "s/<INSTALLDIR>/\/opt\/intel\/${_composer_xe_dir}/g" ${xe_build_dir}/etc/ld.so.conf.d/intel-tbb.conf - + mkdir -p ${xe_build_dir} cd ${xe_build_dir} + mkdir -p ./opt + mkdir -p ./etc/ld.so.conf.d + + sed "s/<arch>/${_i_arch}/" < ${srcdir}/intel-tbb.conf > ./etc/ld.so.conf.d/intel-tbb.conf + sed -i "s/<INSTALLDIR>/\/opt\/intel\/${_composer_xe_dir}/g" ./etc/ld.so.conf.d/intel-tbb.conf msg2 "Extracting RPMS" extract_rpms 'intel-tbb-*.rpm' $xe_build_dir - msg2 "Updating scripts" - cd ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/tbb/bin - rm tbbvars.csh - - sed -i "s/SUBSTITUTE_INSTALL_DIR_HERE/\/opt\/intel\/${_composer_xe_dir}\/linux\/tbb/g" tbbvars.sh - - chmod a+x tbbvars.sh + cd ./opt/intel/${_composer_xe_dir}/linux + rm ./tbb/bin/tbbvars.csh + sed -i "s/SUBSTITUTE_INSTALL_DIR_HERE/\/opt\/intel\/${_composer_xe_dir}\/linux\/tbb/g" ./tbb/bin/tbbvars.sh - msg2 "Removing unneeded libs and bin" - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/tbb/bin/${_not_arch} - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/tbb/lib/${_not_arch} + chmod a+x ./tbb/bin/tbbvars.sh if $_remove_docs ; then msg2 "Removing documentation" - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/Documentation - rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/tbb/examples + rm -rf ./Documentation + rm -rf ./tbb/examples fi msg2 "Moving package files" - mv ${xe_build_dir}/opt ${pkgdir} - mv ${xe_build_dir}/etc ${pkgdir} + mv ${xe_build_dir}/opt ${pkgdir}/ + mv ${xe_build_dir}/etc ${pkgdir}/ ln -s ./${_composer_xe_dir}/linux/tbb/ ${pkgdir}/opt/intel/tbb } -package_intel-vtune-amplifier() { +package_intel-vtune-profiler() { set_build_vars pkgdesc="Performance profiler for serial and parallel performance analysis $_vtune_ver" - pkgver=${_pkg_ver} depends=('pangox-compat') + options=(!strip) - mkdir -p ${xe_build_dir}/opt - mkdir -p ${xe_build_dir}/etc/ld.so.conf.d - mkdir -p ${xe_build_dir}/etc/profile.d + mkdir -p ${xe_build_dir} + cd ${xe_build_dir} + mkdir -p ./opt + mkdir -p ./etc/ld.so.conf.d + mkdir -p ./etc/profile.d mkdir -p ${_man_dir} msg2 "Updating scripts" sed -e "s/<arch>/${_bin_dir}/g" -e "s/<ver>/${_vtune_ver}/g" \ - < ${srcdir}/intel_vtune-amplifier.sh > ${xe_build_dir}/etc/profile.d/intel_vtune-amplifier.sh - chmod a+x ${xe_build_dir}/etc/profile.d/intel_vtune-amplifier.sh + < ${srcdir}/intel_vtune-profiler.sh > etc/profile.d/intel_vtune-profiler.sh + chmod a+x ./etc/profile.d/intel_vtune-profiler.sh - cd ${xe_build_dir} msg2 "Extracting RPMS" - extract_rpms 'intel-vtune-amplifier-*.rpm' $xe_build_dir + extract_rpms 'intel-vtune-profiler-*.rpm' $xe_build_dir + + cd ${xe_build_dir}/opt/intel/vtune_profiler_${_vtune_ver} msg2 "Copying man pages" - if [[ -d ${xe_build_dir}/opt/intel/vtune_amplifier_${_vtune_ver}/man/man1 ]] - then - mv ${xe_build_dir}/opt/intel/vtune_amplifier_${_vtune_ver}/man/man1/*.1 ${_man_dir} - gzip ${_man_dir}/*.1 + if [[ -d ./man/man1 ]]; then + mv ./man/man1/*.1 ${_man_dir}/ fi if $_remove_docs ; then msg2 "Removing documentation" - rm -rf ${xe_build_dir}/opt/intel/vtune_amplifier_${_vtune_ver}/samples - rm -rf ${xe_build_dir}/opt/intel/vtune_amplifier_${_vtune_ver}/documentation + rm -rf ./samples + rm -rf ./documentation fi msg2 "Moving package files" - mv ${xe_build_dir}/opt ${pkgdir} - mv ${xe_build_dir}/etc ${pkgdir} - mv ${xe_build_dir}/usr ${pkgdir} + mv ${xe_build_dir}/opt ${pkgdir}/ + mv ${xe_build_dir}/etc ${pkgdir}/ + mv ${xe_build_dir}/usr ${pkgdir}/ } package_intel-advisor() { @@ -704,82 +631,82 @@ package_intel-advisor() { set_build_vars pkgdesc="Threading design and prototyping tool for software architects $_advisor_ver" - pkgver=${_pkg_ver} conflicts=( 'intel-advisor-xe' ) - mkdir -p ${xe_build_dir}/opt - mkdir -p ${xe_build_dir}/etc/ld.so.conf.d - mkdir -p ${xe_build_dir}/etc/profile.d + mkdir -p ${xe_build_dir} + cd ${xe_build_dir} + mkdir -p ./opt + mkdir -p ./etc/ld.so.conf.d + mkdir -p ./etc/profile.d mkdir -p ${_man_dir} msg2 "Updating scripts" sed -e "s/<arch>/${_bin_dir}/g" -e "s/<ver>/${_advisor_ver}/g" \ - < ${srcdir}/intel_advisor.sh > ${xe_build_dir}/etc/profile.d/intel_advisor.sh - chmod a+x ${xe_build_dir}/etc/profile.d/intel_advisor.sh + < ${srcdir}/intel_advisor.sh > etc/profile.d/intel_advisor.sh + chmod a+x ./etc/profile.d/intel_advisor.sh - cd ${xe_build_dir} msg2 "Extracting RPMS" extract_rpms 'intel-advisor-*.rpm' $xe_build_dir + cd ${xe_build_dir}/opt/intel/advisor_${_advisor_ver} + msg2 "Copying man pages" - if [[ -d ${xe_build_dir}/opt/intel/advisor_${_advisor_ver}/man/man1 ]] - then - mv ${xe_build_dir}/opt/intel/advisor_${_advisor_ver}/man/man1/*.1 ${_man_dir} - gzip ${_man_dir}/*.1 + if [[ -d ./man/man1 ]]; then + mv ./man/man1/*.1 ${_man_dir}/ fi if $_remove_docs ; then msg2 "Removing documentation" - rm -rf ${xe_build_dir}/opt/intel/advisor_${_advisor_ver}/samples - rm -rf ${xe_build_dir}/opt/intel/advisor_${_advisor_ver}/documentation + rm -rf ./samples + rm -rf ./documentation fi msg2 "Moving package files" - mv ${xe_build_dir}/opt ${pkgdir} - mv ${xe_build_dir}/etc ${pkgdir} - mv ${xe_build_dir}/usr ${pkgdir} + mv ${xe_build_dir}/opt ${pkgdir}/ + mv ${xe_build_dir}/etc ${pkgdir}/ + mv ${xe_build_dir}/usr ${pkgdir}/ } package_intel-inspector() { set_build_vars pkgdesc="Memory and thread debugger $_inspector_ver" - pkgver=${_pkg_ver} conflicts=('intel-inspector-xe') - mkdir -p ${xe_build_dir}/opt - mkdir -p ${xe_build_dir}/etc/ld.so.conf.d - mkdir -p ${xe_build_dir}/etc/profile.d + mkdir -p ${xe_build_dir} + cd ${xe_build_dir} + mkdir -p ./opt + mkdir -p ./etc/ld.so.conf.d + mkdir -p ./etc/profile.d mkdir -p ${_man_dir} msg2 "Updating scripts" sed -e "s/<arch>/${_bin_dir}/g" -e "s/<ver>/${_inspector_ver}/g" \ - < ${srcdir}/intel_inspector.sh > ${xe_build_dir}/etc/profile.d/intel_inspector.sh - chmod a+x ${xe_build_dir}/etc/profile.d/intel_inspector.sh + < ${srcdir}/intel_inspector.sh > ./etc/profile.d/intel_inspector.sh + chmod a+x ./etc/profile.d/intel_inspector.sh - cd ${xe_build_dir} msg2 "Extracting RPMS" extract_rpms 'intel-inspector-*.rpm' $xe_build_dir + cd ${xe_build_dir}/opt/intel/inspector_${_inspector_ver} + msg2 "Copying man pages" - if [[ -d ${xe_build_dir}/opt/intel/inspector_${_inspector_ver}/man/man1 ]] - then - mv ${xe_build_dir}/opt/intel/inspector_${_inspector_ver}/man/man1/*.1 ${_man_dir} - gzip ${_man_dir}/*.1 + if [[ -d ./man/man1 ]]; then + mv ./man/man1/*.1 ${_man_dir}/ fi if $_remove_docs ; then msg2 "Removing documentation" - rm -rf ${xe_build_dir}/opt/intel/inspector_${_inspector_ver}/samples - rm -rf ${xe_build_dir}/opt/intel/inspector_${_inspector_ver}/documentation + rm -rf ./samples + rm -rf ./documentation fi msg2 "Moving package files" - mv ${xe_build_dir}/opt ${pkgdir} - mv ${xe_build_dir}/etc ${pkgdir} - mv ${xe_build_dir}/usr ${pkgdir} + mv ${xe_build_dir}/opt ${pkgdir}/ + mv ${xe_build_dir}/etc ${pkgdir}/ + mv ${xe_build_dir}/usr ${pkgdir}/ } -pkgdesc="Intel C++ C and FORTRAN compiler - Intel Parallel Studio XE - Cluster Edition - icc icpc ifort ipp mkl" +pkgdesc="Intel C++ C and FORTRAN compiler - Intel Parallel Studio XE - Cluster Edition - icc icpc ifort ipp" depends=('bash' 'gcc') diff --git a/intel-mkl-th.conf b/intel-mkl-th.conf deleted file mode 100644 index aabc06e7d3f4..000000000000 --- a/intel-mkl-th.conf +++ /dev/null @@ -1,14 +0,0 @@ -# -# Confgure the MKL multithreading -# for more details visit: http://software.intel.com/sites/products/documentation/hpc/mkl/lin/MKL_UG_managing_performance/Using_Additional_Threading_Control.htm -# - -# Uncomment if you want to set a constant number o threads. -# export MKL_NUM_THREADS=4 - -# Uncomment and edit if you want to set the nr. of threads for every components. -# export MKL_DOMAIN_NUM_THREADS="MKL_ALL=4, MKL_BLAS=4" - -# If TRUE MKL set automatically the optimal number of threads -export MKL_DYNAMIC=TRUE - diff --git a/intel-mkl.conf b/intel-mkl.conf deleted file mode 100644 index bd0cd3c0816a..000000000000 --- a/intel-mkl.conf +++ /dev/null @@ -1 +0,0 @@ -/opt/intel/mkl/lib/<arch> diff --git a/intel-mkl.install b/intel-mkl.install deleted file mode 100644 index 322317d6f483..000000000000 --- a/intel-mkl.install +++ /dev/null @@ -1,19 +0,0 @@ - -## arg 1: the new package version -post_install() { - echo "Intel-MKL: To configure the mkl thread number edit: /etc/intel-mkl-th.conf" - echo "for more details visit: http://software.intel.com/sites/products/documentation/hpc/mkl/lin/MKL_UG_managing_performance/Using_Additional_Threading_Control.htm" - - ldconfig ; -} - -post_upgrade() { - post_install $1 -} - -## arg 1: the old package version -post_remove() { - ldconfig ; -} - -# vim:set ts=2 sw=2 et: diff --git a/intel-mkl.sh b/intel-mkl.sh deleted file mode 100755 index 04176a041775..000000000000 --- a/intel-mkl.sh +++ /dev/null @@ -1,5 +0,0 @@ - - -. /etc/intel-mkl-th.conf - - diff --git a/intel-mpi.conf b/intel-mpi.conf index 6d6d45a760fa..e83ffa9ebfaa 100644 --- a/intel-mpi.conf +++ b/intel-mpi.conf @@ -1,2 +1,4 @@ /opt/intel/composerxe/linux/mpi/<arch>/lib +/opt/intel/mpi/<arch>/libfabric/lib +/opt/intel/mpi/<arch>/lib/release diff --git a/intel_vtune-amplifier.sh b/intel_vtune-amplifier.sh deleted file mode 100644 index 48f1b37d6acb..000000000000 --- a/intel_vtune-amplifier.sh +++ /dev/null @@ -1,2 +0,0 @@ -PATH=$PATH:/opt/intel/vtune_amplifier_xe_<ver>/<arch> -export PATH diff --git a/intel_vtune-profiler.sh b/intel_vtune-profiler.sh new file mode 100644 index 000000000000..c260526464f3 --- /dev/null +++ b/intel_vtune-profiler.sh @@ -0,0 +1,2 @@ +PATH=$PATH:/opt/intel/vtune_profiler_<ver>/<arch> +export PATH diff --git a/zsh-fix.patch b/zsh-fix.patch new file mode 100644 index 000000000000..cbfafbc161c1 --- /dev/null +++ b/zsh-fix.patch @@ -0,0 +1,12 @@ +--- composerxe/linux/bin/compilervars.sh 2020-11-09 06:28:27.000000000 +0900 ++++ composerxe/linux/bin/compilervars_fix.sh 2020-11-09 06:40:21.707348052 +0900 +@@ -120,7 +120,8 @@ + if [ "${INTEL_HOST_PLATFORM}" = "Darwin" ]; then + local arr=(`echo ${!arg} | sed 's/:/\'$'\n/g'`) + else +- local arr=(`echo ${!arg} | sed 's/:/\n/g'`) ++ eval "value=\"\${$arg}\"" ++ local arr=(`echo ${value} | sed 's/:/\n/g'`) + fi + local fixarr=() + local found= |