From a1b4c1a68544f4d98f2fda9c6560734bc809d12b Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Tue, 14 Jun 2022 14:47:23 +0200
Subject: [PATCH 1/6] Adding hipSYCL-0.9.1 to pilot 2021.12

Test for developing EESSI bot.
---
 EESSI-pilot-install-software.sh | 6 ++++++
 eessi-2021.12.yml               | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index a25c3f1d9e..d37b8ebc4f 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -332,6 +332,12 @@ fail_msg="Installation of WRF failed, that's unexpected..."
 OMPI_MCA_pml=ucx UCX_TLS=tcp $EB WRF-3.9.1.1-foss-2020a-dmpar.eb -r --include-easyblocks-from-pr 2648
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
+echo ">> Installing hipSYCL-0.9.1..."
+ok_msg="hipSYCL installed, hipp hipp hurra!"
+fail_msg="Installation of hipSYCL failed, that's disappointing..."
+$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --toolchain=foss,2020a
+check_exit_code $? "${ok_msg}" "${fail_msg}"
+
 echo ">> Creating/updating Lmod cache..."
 export LMOD_RC="${EASYBUILD_INSTALLPATH}/.lmod/lmodrc.lua"
 if [ ! -f $LMOD_RC ]; then
diff --git a/eessi-2021.12.yml b/eessi-2021.12.yml
index f3ed9dd9c4..c87f3b12d8 100644
--- a/eessi-2021.12.yml
+++ b/eessi-2021.12.yml
@@ -53,3 +53,7 @@ software:
          versions: 
            '3.9.1.1': 
              versionsuffix: -dmpar
+  hipSYCL:
+     toolchains:
+       foss-2020a:
+         versions: ['0.9.1']

From 28f92615e33c318fca2a0ba0090d2437f03e80f6 Mon Sep 17 00:00:00 2001
From: poksumdo <poksumdo@gmail.com>
Date: Wed, 15 Jun 2022 14:46:27 +0200
Subject: [PATCH 2/6] Investigate toolchain error

Just run eb with --dry-run
---
 EESSI-pilot-install-software.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index d37b8ebc4f..6f63adde22 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -335,7 +335,8 @@ check_exit_code $? "${ok_msg}" "${fail_msg}"
 echo ">> Installing hipSYCL-0.9.1..."
 ok_msg="hipSYCL installed, hipp hipp hurra!"
 fail_msg="Installation of hipSYCL failed, that's disappointing..."
-$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --toolchain=foss,2020a
+$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --dry-run
+#$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --toolchain=foss,2020a
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
 echo ">> Creating/updating Lmod cache..."

From 444235fa3d13d94443165ab18242797da1ef4b07 Mon Sep 17 00:00:00 2001
From: poksumdo <poksumdo@gmail.com>
Date: Wed, 15 Jun 2022 15:33:26 +0200
Subject: [PATCH 3/6] Adding toolchain version

To determine if number of missing packages is lower.
---
 EESSI-pilot-install-software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index 1ccb47982a..f01ceec2ac 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -308,7 +308,7 @@ check_exit_code $? "${ok_msg}" "${fail_msg}"
 echo ">> Installing hipSYCL-0.9.1..."
 ok_msg="hipSYCL installed, hipp hipp hurra!"
 fail_msg="Installation of hipSYCL failed, that's disappointing..."
-$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --dry-run
+$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --dry-run --toolchain-version=2020a
 #$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --toolchain=foss,2020a
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 

From f1e6def77d048088896ed2460951702634f2c926 Mon Sep 17 00:00:00 2001
From: poksumdo <poksumdo@gmail.com>
Date: Wed, 15 Jun 2022 15:53:25 +0200
Subject: [PATCH 4/6] Debug toolchain version issue

Adding command to print available toolchains. Also replacing version 2020a with 9.3.0.
---
 EESSI-pilot-install-software.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index f01ceec2ac..956c54567b 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -308,7 +308,8 @@ check_exit_code $? "${ok_msg}" "${fail_msg}"
 echo ">> Installing hipSYCL-0.9.1..."
 ok_msg="hipSYCL installed, hipp hipp hurra!"
 fail_msg="Installation of hipSYCL failed, that's disappointing..."
-$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --dry-run --toolchain-version=2020a
+$EB --list-toolchains
+$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --dry-run --toolchain-version=9.3.0
 #$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --toolchain=foss,2020a
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 

From 2185cf88aed9e1b00d1ad6acfe04b0baa975c8cc Mon Sep 17 00:00:00 2001
From: poksumdo <poksumdo@gmail.com>
Date: Wed, 15 Jun 2022 19:05:20 +0200
Subject: [PATCH 5/6] Use try toolchain version ...

Adjust parameters to use a different toolchain version.
---
 EESSI-pilot-install-software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index 956c54567b..aab9dc71b9 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -309,7 +309,7 @@ echo ">> Installing hipSYCL-0.9.1..."
 ok_msg="hipSYCL installed, hipp hipp hurra!"
 fail_msg="Installation of hipSYCL failed, that's disappointing..."
 $EB --list-toolchains
-$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --dry-run --toolchain-version=9.3.0
+$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --dry-run --try-toolchain-version 9.3.0 --try-update-deps
 #$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --toolchain=foss,2020a
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 

From 108a42a7f11c94abd415755dc4a59229ad10fc5d Mon Sep 17 00:00:00 2001
From: poksumdo <poksumdo@gmail.com>
Date: Wed, 15 Jun 2022 19:14:59 +0200
Subject: [PATCH 6/6] Added missing --experimental

Also removed eb command to list toolchains.
---
 EESSI-pilot-install-software.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index aab9dc71b9..1def49e5f7 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -308,8 +308,7 @@ check_exit_code $? "${ok_msg}" "${fail_msg}"
 echo ">> Installing hipSYCL-0.9.1..."
 ok_msg="hipSYCL installed, hipp hipp hurra!"
 fail_msg="Installation of hipSYCL failed, that's disappointing..."
-$EB --list-toolchains
-$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --dry-run --try-toolchain-version 9.3.0 --try-update-deps
+$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --dry-run --try-toolchain-version 9.3.0 --try-update-deps --experimental
 #$EB hipSYCL-0.9.1-GCC-10.2.0.eb --robot --toolchain=foss,2020a
 check_exit_code $? "${ok_msg}" "${fail_msg}"