From 86614b515aab2754cbbbd89d25bec9bed5d8a048 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Mon, 25 Jan 2021 13:33:11 +0100 Subject: [PATCH 1/4] Update Cray variable test for cdt/20.11 --- cscs-checks/prgenv/environ_check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cscs-checks/prgenv/environ_check.py b/cscs-checks/prgenv/environ_check.py index 0fec0cb03b..6fb68b1602 100644 --- a/cscs-checks/prgenv/environ_check.py +++ b/cscs-checks/prgenv/environ_check.py @@ -62,9 +62,9 @@ def __init__(self, module_name): sn.assert_found(f'{envvar_prefix}_VERSION', self.stderr) ]) - # These modules should be fixed in later releases + # FIXME: These modules should be fixed in later releases cdt = osext.cray_cdt_version() - if (cdt and cdt <= '20.10' and + if (cdt and cdt <= '20.11' and module_name in ['cray-petsc-complex', 'cray-petsc-complex-64', 'cudatoolkit', 'gcc']): From acdbcfda3979b7103202a6166df602bc8b1d181f Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Mon, 25 Jan 2021 13:47:59 +0100 Subject: [PATCH 2/4] Remove gcc from the skipped module tests --- cscs-checks/prgenv/environ_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/prgenv/environ_check.py b/cscs-checks/prgenv/environ_check.py index 6fb68b1602..5c8a509340 100644 --- a/cscs-checks/prgenv/environ_check.py +++ b/cscs-checks/prgenv/environ_check.py @@ -67,7 +67,7 @@ def __init__(self, module_name): if (cdt and cdt <= '20.11' and module_name in ['cray-petsc-complex', 'cray-petsc-complex-64', - 'cudatoolkit', 'gcc']): + 'cudatoolkit']): self.valid_systems = [] self.maintainers = ['EK', 'VH'] From e82ded01f118ad381a01cbaeed470dbccae97f43 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Mon, 25 Jan 2021 14:03:18 +0100 Subject: [PATCH 3/4] Disable gcc test for cdt < 20.11 --- cscs-checks/prgenv/environ_check.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cscs-checks/prgenv/environ_check.py b/cscs-checks/prgenv/environ_check.py index 5c8a509340..d1b52592a0 100644 --- a/cscs-checks/prgenv/environ_check.py +++ b/cscs-checks/prgenv/environ_check.py @@ -62,12 +62,15 @@ def __init__(self, module_name): sn.assert_found(f'{envvar_prefix}_VERSION', self.stderr) ]) - # FIXME: These modules should be fixed in later releases + # FIXME: These modules should be fixed in later releases, + # while gcc was fixed in 20.11 + cdt = osext.cray_cdt_version() - if (cdt and cdt <= '20.11' and - module_name in ['cray-petsc-complex', + if ((cdt and cdt <= '20.11' and + module_name in ['cray-petsc-complex', 'cray-petsc-complex-64', - 'cudatoolkit']): + 'cudatoolkit']) or + (cdt and cdt < 20.11 and module_name == 'gcc')): self.valid_systems = [] self.maintainers = ['EK', 'VH'] From 7429cc8766fce804c775592239b950ecfb02ca35 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Mon, 25 Jan 2021 14:10:27 +0100 Subject: [PATCH 4/4] PEP8 fix --- cscs-checks/prgenv/environ_check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cscs-checks/prgenv/environ_check.py b/cscs-checks/prgenv/environ_check.py index d1b52592a0..8953f45b1e 100644 --- a/cscs-checks/prgenv/environ_check.py +++ b/cscs-checks/prgenv/environ_check.py @@ -68,8 +68,8 @@ def __init__(self, module_name): cdt = osext.cray_cdt_version() if ((cdt and cdt <= '20.11' and module_name in ['cray-petsc-complex', - 'cray-petsc-complex-64', - 'cudatoolkit']) or + 'cray-petsc-complex-64', + 'cudatoolkit']) or (cdt and cdt < 20.11 and module_name == 'gcc')): self.valid_systems = []