From ed1cd75d56e7e8ae99c5e23db9f74ea7fa30e144 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 5 Feb 2021 10:16:57 +0100
Subject: [PATCH] impi: update 2019.9.304 -> 2019.10.317

---
 bsc/intel-mpi/default.nix  | 22 ++++++++++------------
 bsc/intel-mpi/mpicc.patch  | 20 ++++++++++----------
 bsc/intel-mpi/mpicxx.patch | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/bsc/intel-mpi/default.nix b/bsc/intel-mpi/default.nix
index 8082a2e..c2740a4 100644
--- a/bsc/intel-mpi/default.nix
+++ b/bsc/intel-mpi/default.nix
@@ -29,13 +29,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "intel-mpi-${version}";
-  version = "2019.9.304";
-  dir_nr = "17263";
-  internal-ver = "2020.4.304";
+  version = "2019.10.317";
+  dir_nr = "17534";
 
   src = builtins.fetchTarball {
     url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/${dir_nr}/l_mpi_${version}.tgz";
-    sha256 = "0nmp6np4s7nx2p94x40bpqkp5nasgif3gmbfl4lajzgj2rkh871v";
+    sha256 = "00nimgqywr20dv1ns5kg4r8539gvharn0xfj48i7mhbg8kwf8s08";
   };
 
   buildInputs = [
@@ -53,7 +52,10 @@ stdenv.mkDerivation rec {
   postUnpack = ''
     pushd $sourceRoot
       rpmextract rpm/intel-mpi-*.rpm
+      # Predictable name
+      mv opt/intel/compilers_and_libraries_* opt/intel/compilers_and_libraries
     popd
+    sourceRoot="$sourceRoot/opt/intel/compilers_and_libraries/linux/mpi/intel64"
   '';
 
   patches = [
@@ -62,19 +64,15 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    ls -l opt/intel/
-    pushd opt/intel/compilers_and_libraries_${internal-ver}/linux/mpi/intel64/bin
-      for i in mpi* ; do
-        echo "Fixing paths in $i"
-        sed -i "s:I_MPI_SUBSTITUTE_INSTALLDIR:$out:g" "$i"
-      done     
-    popd
+    for i in bin/mpi* ; do
+      echo "Fixing paths in $i"
+      sed -i "s:I_MPI_SUBSTITUTE_INSTALLDIR:$out:g" "$i"
+    done     
   '';
 
   dontBuild = true;
 
   installPhase = ''
-    cd opt/intel/compilers_and_libraries_${internal-ver}/linux/mpi/intel64
     mkdir -p $out
     mv etc $out
     mv bin $out 
diff --git a/bsc/intel-mpi/mpicc.patch b/bsc/intel-mpi/mpicc.patch
index 0122ec6..d91f77e 100644
--- a/bsc/intel-mpi/mpicc.patch
+++ b/bsc/intel-mpi/mpicc.patch
@@ -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
-+++ b/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicc	2020-11-06 15:18:41.806654112 +0100
+--- a/bin/mpicc	2021-02-04 18:15:11.233632360 +0100
++++ b/bin/mpicc	2021-02-05 09:33:49.493598479 +0100
 @@ -50,7 +50,7 @@
  if [ x"$opt_args" == x"" ]; then
      case "${compiler_short_name}" in
-     icc|icx)    $dir/mpiicc -cc=$compiler_name "$@" ;;
--    cc|*gcc*|clang*) $dir/mpigcc -cc=$compiler_name "$@" ;;
-+    cc|*gcc*|clang*|mcc|echo) $dir/mpigcc -cc=$compiler_name "$@" ;;
-     mpicc)  $dir/mpigcc "$@" ;;    
+     icc|icx)    "$dir"/mpiicc -cc=$compiler_name "$@" ;;
+-    cc|*gcc*|clang*) "$dir"/mpigcc -cc=$compiler_name "$@" ;;
++    cc|*gcc*|clang*|mcc|echo) "$dir"/mpigcc -cc=$compiler_name "$@" ;;
+     mpicc)  "$dir"/mpigcc "$@" ;;    
      *)  
              echo "Error: unsupported compiler name '$compiler_name'."
 @@ -60,7 +60,7 @@
  else
      case "${compiler_short_name}" in
-     icc|icx)    $dir/mpiicc -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 ;;
-     mpicc)  $dir/mpigcc "$@" $opt_args ;;    
+     icc|icx)    "$dir"/mpiicc -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 ;;
+     mpicc)  "$dir"/mpigcc "$@" $opt_args ;;    
      *)  
              echo "Error: unsupported compiler name '$compiler_name'."
diff --git a/bsc/intel-mpi/mpicxx.patch b/bsc/intel-mpi/mpicxx.patch
index c48eb69..76bdfce 100644
--- a/bsc/intel-mpi/mpicxx.patch
+++ b/bsc/intel-mpi/mpicxx.patch
@@ -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
-+++ b/opt/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpicxx	2020-11-06 15:23:41.198073231 +0100
+--- a/bin/mpicxx	2021-02-04 18:15:11.233632360 +0100
++++ b/bin/mpicxx	2021-02-05 09:36:21.396922569 +0100
 @@ -50,7 +50,7 @@
  if [ x"$opt_args" == x"" ]; then
      case "${compiler_short_name}" in
-     icc|icpc|dpcpp)   $dir/mpiicpc -cxx=$compiler_name "$@" ;;
--    *g++*)        $dir/mpigxx -cxx=$compiler_name "$@" ;;
-+    *g++*|clang*++|mcxx|echo) $dir/mpigxx -cxx=$compiler_name "$@" ;;
-     mpicxx)     $dir/mpigxx "$@" ;;
+     icc|icpc|dpcpp)   "$dir"/mpiicpc -cxx=$compiler_name "$@" ;;
+-    *g++*)        "$dir"/mpigxx -cxx=$compiler_name "$@" ;;
++    *g++*|clang*++|mcxx|echo) "$dir"/mpigxx -cxx=$compiler_name "$@" ;;
+     mpicxx)     "$dir"/mpigxx "$@" ;;
      *)  
              echo "Error: unsupported compiler name '$compiler_name'."
 @@ -60,7 +60,7 @@
  else
      case "${compiler_short_name}" in
-     icc|icpc|dpcpp)   $dir/mpiicpc -cxx=$compiler_name "$@" $opt_args ;;
--    *g++*)        $dir/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
-+    *g++*|clang*++|mcxx|echo) $dir/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
-     mpicxx)     $dir/mpigxx "$@" $opt_args ;;
+     icc|icpc|dpcpp)   "$dir"/mpiicpc -cxx=$compiler_name "$@" $opt_args ;;
+-    *g++*)        "$dir"/mpigxx -cxx=$compiler_name "$@" $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'."