rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

impi: update 2019.9.304 -> 2019.10.317

Browse Source
This commit is contained in:
Rodrigo Arias 2021-02-05 10:16:57 +01:00
parent d4dfbb7501
commit ed1cd75d56
3 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bsc/intel-mpi/default.nix
View File

@ -29,13 +29,12 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "intel-mpi-${version}"; name = "intel-mpi-${version}";
version = "2019.9.304"; version = "2019.10.317";
dir_nr = "17263"; dir_nr = "17534";
internal-ver = "2020.4.304";
src = builtins.fetchTarball { src = builtins.fetchTarball {
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/${dir_nr}/l_mpi_${version}.tgz"; url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/${dir_nr}/l_mpi_${version}.tgz";
sha256 = "0nmp6np4s7nx2p94x40bpqkp5nasgif3gmbfl4lajzgj2rkh871v"; sha256 = "00nimgqywr20dv1ns5kg4r8539gvharn0xfj48i7mhbg8kwf8s08";
}; };
buildInputs = [ buildInputs = [
@ -53,7 +52,10 @@ stdenv.mkDerivation rec {
postUnpack = '' postUnpack = ''
pushd $sourceRoot pushd $sourceRoot
rpmextract rpm/intel-mpi-*.rpm rpmextract rpm/intel-mpi-*.rpm
# Predictable name
mv opt/intel/compilers_and_libraries_* opt/intel/compilers_and_libraries
popd popd
sourceRoot="$sourceRoot/opt/intel/compilers_and_libraries/linux/mpi/intel64"
''; '';
patches = [ patches = [
@ -62,19 +64,15 @@ stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
ls -l opt/intel/ for i in bin/mpi* ; do
pushd opt/intel/compilers_and_libraries_${internal-ver}/linux/mpi/intel64/bin echo "Fixing paths in $i"
for i in mpi* ; do sed -i "s:I_MPI_SUBSTITUTE_INSTALLDIR:$out:g" "$i"
echo "Fixing paths in $i" done
sed -i "s:I_MPI_SUBSTITUTE_INSTALLDIR:$out:g" "$i"
done
popd
''; '';
dontBuild = true; dontBuild = true;
installPhase = '' installPhase = ''
cd opt/intel/compilers_and_libraries_${internal-ver}/linux/mpi/intel64
mkdir -p $out mkdir -p $out
mv etc $out mv etc $out
mv bin $out mv bin $out

20
bsc/intel-mpi/mpicc.patch
View File

@ -1,20 +1,20 @@
--- a/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicc 2020-11-06 15:17:24.746803639 +0100 --- a/bin/mpicc 2021-02-04 18:15:11.233632360 +0100
+++ b/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicc 2020-11-06 15:18:41.806654112 +0100 +++ b/bin/mpicc 2021-02-05 09:33:49.493598479 +0100
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
if [ x"$opt_args" == x"" ]; then if [ x"$opt_args" == x"" ]; then
case "${compiler_short_name}" in case "${compiler_short_name}" in
icc|icx) $dir/mpiicc -cc=$compiler_name "$@" ;; icc|icx) "$dir"/mpiicc -cc=$compiler_name "$@" ;;
- cc|*gcc*|clang*) $dir/mpigcc -cc=$compiler_name "$@" ;; - cc|*gcc*|clang*) "$dir"/mpigcc -cc=$compiler_name "$@" ;;
+ cc|*gcc*|clang*|mcc|echo) $dir/mpigcc -cc=$compiler_name "$@" ;; + cc|*gcc*|clang*|mcc|echo) "$dir"/mpigcc -cc=$compiler_name "$@" ;;
mpicc) $dir/mpigcc "$@" ;; mpicc) "$dir"/mpigcc "$@" ;;
*) *)
echo "Error: unsupported compiler name '$compiler_name'." echo "Error: unsupported compiler name '$compiler_name'."
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
else else
case "${compiler_short_name}" in case "${compiler_short_name}" in
icc|icx) $dir/mpiicc -cc=$compiler_name "$@" $opt_args ;; icc|icx) "$dir"/mpiicc -cc=$compiler_name "$@" $opt_args ;;
- cc|*gcc*|clang*) $dir/mpigcc -cc=$compiler_name "$@" $opt_args ;; - cc|*gcc*|clang*) "$dir"/mpigcc -cc=$compiler_name "$@" $opt_args ;;
+ cc|*gcc*|clang*|mcc|echo) $dir/mpigcc -cc=$compiler_name "$@" $opt_args ;; + cc|*gcc*|clang*|mcc|echo) "$dir"/mpigcc -cc=$compiler_name "$@" $opt_args ;;
mpicc) $dir/mpigcc "$@" $opt_args ;; mpicc) "$dir"/mpigcc "$@" $opt_args ;;
*) *)
echo "Error: unsupported compiler name '$compiler_name'." echo "Error: unsupported compiler name '$compiler_name'."

20
bsc/intel-mpi/mpicxx.patch
View File

@ -1,20 +1,20 @@
--- a/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicxx 2020-11-06 15:14:35.911131270 +0100 --- a/bin/mpicxx 2021-02-04 18:15:11.233632360 +0100
+++ b/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicxx 2020-11-06 15:23:41.198073231 +0100 +++ b/bin/mpicxx 2021-02-05 09:36:21.396922569 +0100
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
if [ x"$opt_args" == x"" ]; then if [ x"$opt_args" == x"" ]; then
case "${compiler_short_name}" in case "${compiler_short_name}" in
icc|icpc|dpcpp) $dir/mpiicpc -cxx=$compiler_name "$@" ;; icc|icpc|dpcpp) "$dir"/mpiicpc -cxx=$compiler_name "$@" ;;
- *g++*) $dir/mpigxx -cxx=$compiler_name "$@" ;; - *g++*) "$dir"/mpigxx -cxx=$compiler_name "$@" ;;
+ *g++*|clang*++|mcxx|echo) $dir/mpigxx -cxx=$compiler_name "$@" ;; + *g++*|clang*++|mcxx|echo) "$dir"/mpigxx -cxx=$compiler_name "$@" ;;
mpicxx) $dir/mpigxx "$@" ;; mpicxx) "$dir"/mpigxx "$@" ;;
*) *)
echo "Error: unsupported compiler name '$compiler_name'." echo "Error: unsupported compiler name '$compiler_name'."
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
else else
case "${compiler_short_name}" in case "${compiler_short_name}" in
icc|icpc|dpcpp) $dir/mpiicpc -cxx=$compiler_name "$@" $opt_args ;; icc|icpc|dpcpp) "$dir"/mpiicpc -cxx=$compiler_name "$@" $opt_args ;;
- *g++*) $dir/mpigxx -cxx=$compiler_name "$@" $opt_args ;; - *g++*) "$dir"/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
+ *g++*|clang*++|mcxx|echo) $dir/mpigxx -cxx=$compiler_name "$@" $opt_args ;; + *g++*|clang*++|mcxx|echo) "$dir"/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
mpicxx) $dir/mpigxx "$@" $opt_args ;; mpicxx) "$dir"/mpigxx "$@" $opt_args ;;
*) *)
echo "Error: unsupported compiler name '$compiler_name'." echo "Error: unsupported compiler name '$compiler_name'."