From b97619e2d0a2b795b97340e604643752e08b865f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= <ole.schuett@cp2k.org>
Date: Mon, 26 Dec 2022 14:00:19 +0100
Subject: [PATCH] Toolchain: Upgrade to ELPA 2022.11.001

---
 .../scripts/stage5/elpa-fix_nvcc_wrap.patch      |  7 -------
 tools/toolchain/scripts/stage5/install_elpa.sh   | 16 ++--------------
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 tools/toolchain/scripts/stage5/elpa-fix_nvcc_wrap.patch

diff --git a/tools/toolchain/scripts/stage5/elpa-fix_nvcc_wrap.patch b/tools/toolchain/scripts/stage5/elpa-fix_nvcc_wrap.patch
deleted file mode 100644
index 140e156bc2..0000000000
--- a/tools/toolchain/scripts/stage5/elpa-fix_nvcc_wrap.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/nvcc_wrap
-+++ b/nvcc_wrap
-@@ -1,3 +1,3 @@
- #!/bin/sh
- 
--$NVCC `echo $@ | sed 's/-fPIC/-Xcompiler -fPIC/; s/-Wl/-Xlinker -Wl/; '`
-+$NVCC `echo $@ | sed 's/-fPIC/-Xcompiler -fPIC/g; s/-Wl/-Xlinker -Wl/g; '`
diff --git a/tools/toolchain/scripts/stage5/install_elpa.sh b/tools/toolchain/scripts/stage5/install_elpa.sh
index a2b999ce08..1830d9ab9d 100755
--- a/tools/toolchain/scripts/stage5/install_elpa.sh
+++ b/tools/toolchain/scripts/stage5/install_elpa.sh
@@ -7,8 +7,8 @@
 SCRIPT_DIR="$(cd "$(dirname "$SCRIPT_NAME")/.." && pwd -P)"
 
 # From https://elpa.mpcdf.mpg.de/software/tarball-archive/ELPA_TARBALL_ARCHIVE.html
-elpa_ver="2022.11.001.rc2"
-elpa_sha256="13d67e7d69894c631b48e4fcac905b51c4e41554c7eb4731e98c4e205f0fab9f"
+elpa_ver="2022.11.001"
+elpa_sha256="35e397d7c0af95bb43bc7bef7fff29425c1da400fa0cd86ae8d3bd2ff2f9d999"
 
 source "${SCRIPT_DIR}"/common_vars.sh
 source "${SCRIPT_DIR}"/tool_kit.sh
@@ -63,18 +63,10 @@ case "$with_elpa" in
       [ -d elpa-${elpa_ver} ] && rm -rf elpa-${elpa_ver}
       tar -xzf elpa-${elpa_ver}.tar.gz
 
-      # fix wrong dependency order (at least in elpa 2016.05.003)
-      # sed -i "s/build_lib = libelpa@SUFFIX@.la libelpatest@SUFFIX@.la/build_lib = libelpatest@SUFFIX@.la libelpa@SUFFIX@.la/g" elpa-${elpa_ver}/Makefile.in
-      # sed -i "s/build_lib = libelpa@SUFFIX@.la libelpatest@SUFFIX@.la/build_lib = libelpatest@SUFFIX@.la libelpa@SUFFIX@.la/g" elpa-${elpa_ver}/Makefile.am
-
-      # need both flavors ?
-
       # elpa expect FC to be an mpi fortran compiler that is happy
       # with long lines, and that a bunch of libs can be found
       cd elpa-${elpa_ver}
 
-      patch -p1 < "${SCRIPT_DIR}/stage5/elpa-fix_nvcc_wrap.patch"
-
       # ELPA-2017xxxx enables AVX2 by default, switch off if machine doesn't support it.
       AVX_flag=""
       AVX512_flags=""
@@ -201,10 +193,6 @@ export ELPA_ROOT="$pkg_install_dir"
 export ELPA_VERSION="${elpa_ver}"
 EOF
 
-  cat << EOF >> ${INSTALLDIR}/lsan.supp
-# leaks related to ELPA
-leak:cublasCreateFromC
-EOF
 fi
 
 load "${BUILDDIR}/setup_elpa"