From 7f3b06c5469ccac524ec44e08d906bd8dbbc1201 Mon Sep 17 00:00:00 2001
From: Marc Schluetter <m.schluetter@fz-juelich.de>
Date: Thu, 9 Nov 2023 11:00:24 +0100
Subject: [PATCH] Update scorep/scalasca eb files with new public
versions/sources
---
Custom_EasyBlocks/score_p.py | 7 +++++--
...mix.eb => Scalasca-deepsea-v1-gpsmpi-2022a-pmix.eb} | 10 +++++-----
...pmix.eb => Score-P-deepsea-v1-gpsmpi-2022a-pmix.eb} | 8 ++++----
3 files changed, 14 insertions(+), 11 deletions(-)
rename Golden_Repo/s/Scalasca/{Scalasca-2023-09-26-gpsmpi-2022a-pmix.eb => Scalasca-deepsea-v1-gpsmpi-2022a-pmix.eb} (89%)
rename Golden_Repo/s/Score-P/{Score-P-2023-09-26-gpsmpi-2022a-pmix.eb => Score-P-deepsea-v1-gpsmpi-2022a-pmix.eb} (91%)
diff --git a/Custom_EasyBlocks/score_p.py b/Custom_EasyBlocks/score_p.py
index 4c6f49c20..aa663d988 100644
--- a/Custom_EasyBlocks/score_p.py
+++ b/Custom_EasyBlocks/score_p.py
@@ -76,8 +76,11 @@ class EB_Score_minus_P(ConfigureMake):
'CubeLib': '4.8',
'CubeGUI': '4.8',
}
- if LooseVersion(self.version) < LooseVersion(nvhpc_since.get(self.name, '0')):
- comp_opts[toolchain.NVHPC] = 'pgi'
+ try:
+ if LooseVersion(self.version) < LooseVersion(nvhpc_since.get(self.name, '0')):
+ comp_opts[toolchain.NVHPC] = 'pgi'
+ except:
+ pass
comp_fam = self.toolchain.comp_family()
if comp_fam in comp_opts:
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2023-09-26-gpsmpi-2022a-pmix.eb b/Golden_Repo/s/Scalasca/Scalasca-deepsea-v1-gpsmpi-2022a-pmix.eb
similarity index 89%
rename from Golden_Repo/s/Scalasca/Scalasca-2023-09-26-gpsmpi-2022a-pmix.eb
rename to Golden_Repo/s/Scalasca/Scalasca-deepsea-v1-gpsmpi-2022a-pmix.eb
index 5f6afc602..6f27ab603 100644
--- a/Golden_Repo/s/Scalasca/Scalasca-2023-09-26-gpsmpi-2022a-pmix.eb
+++ b/Golden_Repo/s/Scalasca/Scalasca-deepsea-v1-gpsmpi-2022a-pmix.eb
@@ -13,7 +13,7 @@
easyblock = 'EB_Score_minus_P'
name = 'Scalasca'
-version = '2023-09-26'
+version = 'deepsea-v1'
homepage = 'https://www.scalasca.org/'
description = """
@@ -26,10 +26,10 @@ in exploring their causes.
toolchain = {'name': 'gpsmpi', 'version': '2022a-pmix'}
-source_urls = ['https://perftools.pages.jsc.fz-juelich.de/cicd/scalasca/branches/MR71/']
-sources = ['sources.ed3f096d.tar.gz']
+source_urls = ['https://apps.fz-juelich.de/scalasca/project/deep-sea']
+sources = ['scalasca-deepsea-v1.tar.gz']
checksums = [
- '2c7ff194ee5c59b2213f0a7fe6e5f005eb15f4e16e9abad63a6cc648d8c3394c', # sources.ed3f096d.tar.gz
+ '2c7ff194ee5c59b2213f0a7fe6e5f005eb15f4e16e9abad63a6cc648d8c3394c', # scalasca-deepsea-v1.tar.gz
]
builddependencies = [
('CubeWriter', '4.8.2'),
@@ -39,7 +39,7 @@ dependencies = [
('CubeGUI', '4.8.2'),
('CubeLib', '4.8.2'),
('OTF2', '3.0.3'),
- ('Score-P', '2023-09-26'),
+ ('Score-P', 'deepsea-v1'),
]
sanity_check_paths = {
diff --git a/Golden_Repo/s/Score-P/Score-P-2023-09-26-gpsmpi-2022a-pmix.eb b/Golden_Repo/s/Score-P/Score-P-deepsea-v1-gpsmpi-2022a-pmix.eb
similarity index 91%
rename from Golden_Repo/s/Score-P/Score-P-2023-09-26-gpsmpi-2022a-pmix.eb
rename to Golden_Repo/s/Score-P/Score-P-deepsea-v1-gpsmpi-2022a-pmix.eb
index b95568191..75bbf83e6 100644
--- a/Golden_Repo/s/Score-P/Score-P-2023-09-26-gpsmpi-2022a-pmix.eb
+++ b/Golden_Repo/s/Score-P/Score-P-deepsea-v1-gpsmpi-2022a-pmix.eb
@@ -13,7 +13,7 @@
easyblock = 'EB_Score_minus_P'
name = 'Score-P'
-version = '2023-09-26'
+version = 'deepsea-v1'
homepage = 'https://www.score-p.org'
description = """
@@ -24,10 +24,10 @@ applications.
toolchain = {'name': 'gpsmpi', 'version': '2022a-pmix'}
-source_urls = ['https://perftools.pages.jsc.fz-juelich.de/cicd/scorep/branches/MR195']
-sources = ['sources.15529a7c.tar.gz']
+source_urls = ['https://apps.fz-juelich.de/scalasca/project/deep-sea']
+sources = ['scorep-deepsea-v1.tar.gz']
checksums = [
- 'ca8cc49909965aaa59173821627c61945f3b4bdae0d7b582d374522a5322fbe1', # sources.15529a7c.tar.gz
+ 'ca8cc49909965aaa59173821627c61945f3b4bdae0d7b582d374522a5322fbe1', # scorep-deepsea-v1.tar.gz
]
builddependencies = [
--
GitLab