arocanon/bscpkgs
1
0
Fork 0
forked from rarias/bscpkgs
Code Pull Requests Activity

Update Intel MPI: 2019.8.254 -> 2019.9.304

Browse Source
This commit is contained in:
Rodrigo Arias 2020-11-06 15:41:43 +01:00
parent 31f7d17a41
commit c0669d7dc8
3 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,13 +29,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "intel-mpi-${version}"; name = "intel-mpi-${version}";
version = "2019.8.254"; version = "2019.9.304";
dir_nr = "16814"; dir_nr = "17263";
internal-ver = "2020.2.254"; 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 = "1za4zyvxm5bfkrca843na6sxq2gq7qb87s0zysa7dnyqjwa11n45"; sha256 = "0nmp6np4s7nx2p94x40bpqkp5nasgif3gmbfl4lajzgj2rkh871v";
}; };
buildInputs = [ buildInputs = [
@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
ls -l opt/intel/
pushd opt/intel/compilers_and_libraries_${internal-ver}/linux/mpi/intel64/bin pushd opt/intel/compilers_and_libraries_${internal-ver}/linux/mpi/intel64/bin
for i in mpi* ; do for i in mpi* ; do
echo "Fixing paths in $i" echo "Fixing paths in $i"

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

@ -1,20 +1,20 @@
--- a/opt/intel/compilers_and_libraries_2020.2.254/linux/mpi/intel64/bin/mpicc 2020-06-30 14:22:04.510566478 +0200 --- a/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicc 2020-11-06 15:17:24.746803639 +0100
+++ b/opt/intel/compilers_and_libraries_2020.2.254/linux/mpi/intel64/bin/mpicc 2020-06-30 14:24:58.250998988 +0200 +++ b/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicc 2020-11-06 15:18:41.806654112 +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) $dir/mpiicc -cc=$compiler_name "$@" ;; icc|icx) $dir/mpiicc -cc=$compiler_name "$@" ;;
- cc|*gcc*) $dir/mpigcc -cc=$compiler_name "$@" ;; - cc|*gcc*|clang*) $dir/mpigcc -cc=$compiler_name "$@" ;;
+ cc|*gcc*|mcc|clang|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) $dir/mpiicc -cc=$compiler_name "$@" $opt_args ;; icc|icx) $dir/mpiicc -cc=$compiler_name "$@" $opt_args ;;
- cc|*gcc*) $dir/mpigcc -cc=$compiler_name "$@" $opt_args ;; - cc|*gcc*|clang*) $dir/mpigcc -cc=$compiler_name "$@" $opt_args ;;
+ cc|*gcc*|mcc|clang|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'."

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

@ -1,28 +1,20 @@
--- a/opt/intel/compilers_and_libraries_2020.2.254/linux/mpi/intel64/bin/mpicxx 2020-06-30 14:26:14.619723932 +0200 --- a/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicxx 2020-11-06 15:14:35.911131270 +0100
+++ b/opt/intel/compilers_and_libraries_2020.2.254/linux/mpi/intel64/bin/mpicxx 2020-06-30 14:27:56.644687134 +0200 +++ b/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicxx 2020-11-06 15:23:41.198073231 +0100
@@ -49,9 +49,9 @@ @@ -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) $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 "$@" ;;
- mpicxx) $dir/mpigxx "$@" ;; + *g++*|clang*++|mcxx|echo) $dir/mpigxx -cxx=$compiler_name "$@" ;;
+ icc|icpc) $dir/mpiicpc -cxx=$compiler_name "$@" ;; mpicxx) $dir/mpigxx "$@" ;;
+ *g++*|clang*++|mcxx|echo) $dir/mpigxx -cxx=$compiler_name "$@" ;;
+ mpicxx) $dir/mpigxx "$@" ;;
*) *)
echo "Error: unsupported compiler name '$compiler_name'." echo "Error: unsupported compiler name '$compiler_name'."
echo "Check -cxx=<compiler_name> command line option and I_MPI_CXX='$I_MPI_CXX' and MPICH_CXX='$MPICH_CXX' variables."; @@ -60,7 +60,7 @@
@@ -59,9 +59,9 @@
esac
else else
case "${compiler_short_name}" in case "${compiler_short_name}" in
- icc|icpc) $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 ;;
- mpicxx) $dir/mpigxx "$@" $opt_args ;; + *g++*|clang*++|mcxx|echo) $dir/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
+ icc|icpc) $dir/mpiicpc -cxx=$compiler_name "$@" $opt_args ;; mpicxx) $dir/mpigxx "$@" $opt_args ;;
+ *g++*|clang*++|mcxx|echo) $dir/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
+ mpicxx) $dir/mpigxx "$@" $opt_args ;;
*) *)
echo "Error: unsupported compiler name '$compiler_name'." echo "Error: unsupported compiler name '$compiler_name'."
echo "Check -cxx=<compiler_name> command line option and I_MPI_CXX='$I_MPI_CXX' and MPICH_CXX='$MPICH_CXX' variables.";