From 0e64153fb6f54dbc4d17be777ac332cf71b0cc6e Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Wed, 24 Oct 2018 16:25:37 +0200 Subject: [PATCH] Remove Monch from supported systems - Monch-specific tests are commented as obsolete. --- cscs-checks/apps/gromacs/gromacs_check.py | 1 + cscs-checks/cuda/hpcg_check.py | 1 + cscs-checks/libraries/math/dgemm.py | 1 + cscs-checks/libraries/math/scalapack_compile_run.py | 6 ++---- cscs-checks/microbenchmarks/osu/flexible_a2a.py | 3 +-- cscs-checks/microbenchmarks/osu/osu_tests.py | 9 +++------ cscs-checks/microbenchmarks/stream/stream.py | 3 +-- cscs-checks/prgenv/helloworld.py | 6 +++--- cscs-checks/system/io/ior_check.py | 9 +++++---- 9 files changed, 18 insertions(+), 21 deletions(-) diff --git a/cscs-checks/apps/gromacs/gromacs_check.py b/cscs-checks/apps/gromacs/gromacs_check.py index c57900546f..08b3f54e49 100644 --- a/cscs-checks/apps/gromacs/gromacs_check.py +++ b/cscs-checks/apps/gromacs/gromacs_check.py @@ -129,6 +129,7 @@ def __init__(self): } +# FIXME: This test is obsolete; it is kept only for reference. @rfm.parameterized_test([1], [2], [4], [6], [8]) class GromacsCPUMonchAcceptance(GromacsBaseCheck): def __init__(self, num_nodes): diff --git a/cscs-checks/cuda/hpcg_check.py b/cscs-checks/cuda/hpcg_check.py index c7ca794c8c..daa180f08d 100644 --- a/cscs-checks/cuda/hpcg_check.py +++ b/cscs-checks/cuda/hpcg_check.py @@ -44,6 +44,7 @@ def __init__(self, **kwargs): self.maintainers = ['VK'] +# FIXME: This test is obsolete; it is kept only for reference class HPCGMonchAcceptanceCheck(RegressionTest): def __init__(self, num_tasks, **kwargs): super().__init__('hpcg_check_%s_nodes' % num_tasks, diff --git a/cscs-checks/libraries/math/dgemm.py b/cscs-checks/libraries/math/dgemm.py index cae4dcd5ea..7c80a3f894 100644 --- a/cscs-checks/libraries/math/dgemm.py +++ b/cscs-checks/libraries/math/dgemm.py @@ -14,6 +14,7 @@ def __init__(self): self.tags = {'production'} +# FIXME: This test is obsolete; it is kept only for reference. @rfm.required_version('>=2.14') @rfm.simple_test class DGEMMTestMonch(DGEMMTest): diff --git a/cscs-checks/libraries/math/scalapack_compile_run.py b/cscs-checks/libraries/math/scalapack_compile_run.py index dd63b55393..5a69623b84 100644 --- a/cscs-checks/libraries/math/scalapack_compile_run.py +++ b/cscs-checks/libraries/math/scalapack_compile_run.py @@ -67,16 +67,14 @@ def scalapack_sanity(number1, number2, expected_value): ]) +# FIXME: This test is obsolete; it is kept only for reference. +# NOTE: The test case is very small, but larger cases did not succeed! @rfm.required_version('>=2.14') @rfm.parameterized_test(['dynamic']) class ScaLAPACKPerf(ScaLAPACKTest): def __init__(self, linkage): super().__init__(linkage) - # FIXME: - # Currently, this test case is only aimed for the monch acceptance, - # yet it could be interesting to extend it to other systems. - # NB: The test case is very small, but larger cases did not succeed! self.tags |= {'monch_acceptance'} self.sourcepath = 'scalapack_performance_compile_run.f' self.valid_systems = ['monch:compute'] diff --git a/cscs-checks/microbenchmarks/osu/flexible_a2a.py b/cscs-checks/microbenchmarks/osu/flexible_a2a.py index 5d3b0d9e0e..ef1b914f58 100644 --- a/cscs-checks/microbenchmarks/osu/flexible_a2a.py +++ b/cscs-checks/microbenchmarks/osu/flexible_a2a.py @@ -8,8 +8,7 @@ def __init__(self): super().__init__() self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'kesch:cn', 'kesch:pn', - 'leone:normal', 'monch:compute'] + 'kesch:cn', 'kesch:pn', 'leone:normal'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] if self.current_system.name == 'kesch': diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py index 88019ff617..0611e3fa8d 100644 --- a/cscs-checks/microbenchmarks/osu/osu_tests.py +++ b/cscs-checks/microbenchmarks/osu/osu_tests.py @@ -48,6 +48,7 @@ def __init__(self, variant): } +# FIXME: This test is obsolete; it is kept only for reference. @rfm.parameterized_test(*({'num_tasks': i} for i in range(2, 10, 2))) class AlltoallMonchAcceptanceTest(AlltoallTest): def __init__(self, num_tasks): @@ -105,9 +106,7 @@ class P2PCPUBandwidthTest(P2PBaseTest): def __init__(self): super().__init__() self.valid_systems = ['daint:gpu', 'daint:mc', - 'dom:gpu', 'dom:mc', - 'monch:compute', - 'kesch:cn'] + 'dom:gpu', 'dom:mc', 'kesch:cn'] self.executable = './p2p_osu_bw' self.executable_opts = ['-x', '100', '-i', '1000'] @@ -144,9 +143,7 @@ class P2PCPULatencyTest(P2PBaseTest): def __init__(self): super().__init__() self.valid_systems = ['daint:gpu', 'daint:mc', - 'dom:gpu', 'dom:mc', - 'monch:compute', - 'kesch:cn'] + 'dom:gpu', 'dom:mc', 'kesch:cn'] self.executable_opts = ['-x', '100', '-i', '1000'] self.executable = './p2p_osu_latency' diff --git a/cscs-checks/microbenchmarks/stream/stream.py b/cscs-checks/microbenchmarks/stream/stream.py index 838188212e..48ef9a41c7 100644 --- a/cscs-checks/microbenchmarks/stream/stream.py +++ b/cscs-checks/microbenchmarks/stream/stream.py @@ -11,8 +11,7 @@ def __init__(self): self.exclusive_access = True # All available systems are supported self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'kesch:cn', 'kesch:pn', 'leone:normal', - 'monch:compute'] + 'kesch:cn', 'kesch:pn', 'leone:normal'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] if self.current_system.name == 'kesch': diff --git a/cscs-checks/prgenv/helloworld.py b/cscs-checks/prgenv/helloworld.py index 8f7e562235..a4571a58ab 100644 --- a/cscs-checks/prgenv/helloworld.py +++ b/cscs-checks/prgenv/helloworld.py @@ -21,20 +21,20 @@ def __init__(self, variant, lang, linkage): self.sourcepath = 'hello_world' self.build_system = 'SingleSource' self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'kesch:cn', 'leone:normal', 'monch:compute'] + 'kesch:cn', 'leone:normal'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] # Removing static compilation from kesch - if (self.current_system.name in ['kesch', 'leone', 'monch'] and + if (self.current_system.name in ['kesch', 'leone'] and linkage == 'static'): self.valid_prog_environs = [] self.compilation_time_seconds = None self.maintainers = ['CB', 'VK'] - self.tags = {'production', 'monch_acceptance'} + self.tags = {'production'} def setup(self, partition, environ, **job_opts): result = sn.findall(r'Hello World from thread \s*(\d+) out ' diff --git a/cscs-checks/system/io/ior_check.py b/cscs-checks/system/io/ior_check.py index 953a00efb6..cd2b6aab87 100644 --- a/cscs-checks/system/io/ior_check.py +++ b/cscs-checks/system/io/ior_check.py @@ -39,16 +39,14 @@ def __init__(self, fs_mount_point): self.num_tasks = 720 self.num_tasks_per_node = 12 elif fs_mount_point == '/users': - self.valid_systems = ['daint:gpu', 'dom:gpu', 'monch:compute'] + self.valid_systems = ['daint:gpu', 'dom:gpu'] self.num_tasks = 1 self.num_tasks_per_node = 1 self.tags |= {'maintenance'} elif fs_mount_point == '/apps': - self.valid_systems = ['daint:gpu', 'dom:gpu', 'monch:compute'] + self.valid_systems = ['daint:gpu', 'dom:gpu'] self.num_tasks = 1 self.num_tasks_per_node = 1 - elif fs_mount_point == '/mnt/lnec': - self.valid_systems = ['monch:compute'] self.valid_prog_environs = ['PrgEnv-cray'] self.sourcesdir = os.path.join(self.current_system.resourcesdir, 'IOR') @@ -166,6 +164,7 @@ def __init__(self, fs_mount_point, ior_type): self.tags |= {'write'} +# FIXME: This test is obsolete; it is kept only for reference. class IoMonchAcceptanceBase(IorCheck): def __init__(self, fs_mount_point, ior_type, num_tasks): super().__init__(fs_mount_point) @@ -195,6 +194,7 @@ def __init__(self, fs_mount_point, ior_type, num_tasks): self.tags = {'monch_acceptance'} +# FIXME: This test is obsolete; it is kept only for reference. @rfm.parameterized_test(*(['/mnt/lnec', 'MPIIO', num_tasks] for num_tasks in [40, 80, 160])) class IorReadScratchMonchAcceptanceCheck(IoMonchAcceptanceBase): @@ -213,6 +213,7 @@ def __init__(self, fs_mount_point, ior_type, num_tasks): self.tags |= {'read'} +# FIXME: This test is obsolete; it is kept only for reference. @rfm.parameterized_test(*(['/mnt/lnec', 'MPIIO', num_tasks] for num_tasks in [40, 80, 160])) class IorWriteScratchMonchAcceptanceCheck(IoMonchAcceptanceBase):