From bbb0fe4f2735f74b67f44125084ba88e8f1d71c1 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Wed, 21 Nov 2018 23:24:25 +0100 Subject: [PATCH 1/2] Add specific tag for MCH tests Also: - Remove `kesch:cn` from CDO/NCO tests --- cscs-checks/mch/automatic_arrays.py | 2 +- cscs-checks/mch/check_ruby.py | 2 +- cscs-checks/mch/collectives_halo.py | 2 +- cscs-checks/mch/cuda_stress_test.py | 2 +- cscs-checks/mch/g2g_meteoswiss_check.py | 2 +- cscs-checks/mch/gpu_direct_acc.py | 2 +- cscs-checks/mch/gpu_direct_cuda.py | 2 +- cscs-checks/mch/openacc_cuda_mpi_cppstd.py | 2 +- cscs-checks/tools/io/cdo.py | 4 ++-- cscs-checks/tools/io/nco.py | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cscs-checks/mch/automatic_arrays.py b/cscs-checks/mch/automatic_arrays.py index b89fd1806a..2a4cd1b085 100644 --- a/cscs-checks/mch/automatic_arrays.py +++ b/cscs-checks/mch/automatic_arrays.py @@ -47,7 +47,7 @@ def __init__(self): } self.maintainers = ['AJ', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'mch'} def setup(self, partition, environ, **job_opts): if environ.name == 'PrgEnv-cray': diff --git a/cscs-checks/mch/check_ruby.py b/cscs-checks/mch/check_ruby.py index 1eba17e16d..9c02f4857e 100644 --- a/cscs-checks/mch/check_ruby.py +++ b/cscs-checks/mch/check_ruby.py @@ -16,4 +16,4 @@ def __init__(self): r'\[ 1.0, 2.0, 3.0, 4.0 \]', self.stdout) self.maintainers = ['MKr'] - self.tags = {'production'} + self.tags = {'production', 'mch'} diff --git a/cscs-checks/mch/collectives_halo.py b/cscs-checks/mch/collectives_halo.py index cdb3e089c5..9d716dccec 100644 --- a/cscs-checks/mch/collectives_halo.py +++ b/cscs-checks/mch/collectives_halo.py @@ -76,7 +76,7 @@ def __init__(self, variant, bench_reference): } self.maintainers = ['AJ', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'mch'} def setup(self, *args, **kwargs): super().setup(*args, **kwargs) diff --git a/cscs-checks/mch/cuda_stress_test.py b/cscs-checks/mch/cuda_stress_test.py index 69c074819e..b9f5099d8a 100644 --- a/cscs-checks/mch/cuda_stress_test.py +++ b/cscs-checks/mch/cuda_stress_test.py @@ -35,5 +35,5 @@ def __init__(self): 'time': (2.12769, None, 0.05) } } - self.tags = {'production'} + self.tags = {'production', 'mch'} self.maintainers = ['VK', 'AJ'] diff --git a/cscs-checks/mch/g2g_meteoswiss_check.py b/cscs-checks/mch/g2g_meteoswiss_check.py index ce2afa3c54..5b0d8974b6 100644 --- a/cscs-checks/mch/g2g_meteoswiss_check.py +++ b/cscs-checks/mch/g2g_meteoswiss_check.py @@ -25,7 +25,7 @@ def __init__(self, g2g): '-DENABLE_MPI_TIMER=ON'] self.build_system.max_concurrency = 1 self.maintainers = ['TM', 'JG'] - self.tags = {'production'} + self.tags = {'production', 'mch'} self.num_tasks = 2 self.num_gpus_per_node = 2 cuda_visible_devices = {1: r'CUDA_VISIBLE_DEVICES: ' diff --git a/cscs-checks/mch/gpu_direct_acc.py b/cscs-checks/mch/gpu_direct_acc.py index 94635541b9..1ee674cbbb 100644 --- a/cscs-checks/mch/gpu_direct_acc.py +++ b/cscs-checks/mch/gpu_direct_acc.py @@ -34,7 +34,7 @@ def __init__(self): ]) self.launch_options = [] self.maintainers = ['AJ', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'mch'} def setup(self, partition, environ, **job_opts): if environ.name.startswith('PrgEnv-cray'): diff --git a/cscs-checks/mch/gpu_direct_cuda.py b/cscs-checks/mch/gpu_direct_cuda.py index 140709251f..7357e253aa 100644 --- a/cscs-checks/mch/gpu_direct_cuda.py +++ b/cscs-checks/mch/gpu_direct_cuda.py @@ -33,4 +33,4 @@ def __init__(self): self.stdout, 'result', float) self.sanity_patterns = sn.assert_reference(result, 1., -1e-5, 1e-5) self.maintainers = ['AJ', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'mch'} diff --git a/cscs-checks/mch/openacc_cuda_mpi_cppstd.py b/cscs-checks/mch/openacc_cuda_mpi_cppstd.py index d24efecf14..776db5798a 100644 --- a/cscs-checks/mch/openacc_cuda_mpi_cppstd.py +++ b/cscs-checks/mch/openacc_cuda_mpi_cppstd.py @@ -48,7 +48,7 @@ def __init__(self, withmpi): self.executable = 'openacc_cuda_mpi_cppstd' self.sanity_patterns = sn.assert_found(r'Result:\s+OK', self.stdout) self.maintainers = ['AJ', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'mch'} def setup(self, partition, environ, **job_opts): if environ.name.startswith('PrgEnv-cray'): diff --git a/cscs-checks/tools/io/cdo.py b/cscs-checks/tools/io/cdo.py index 2546dc867c..b2e8ee3de2 100644 --- a/cscs-checks/tools/io/cdo.py +++ b/cscs-checks/tools/io/cdo.py @@ -30,7 +30,7 @@ def __init__(self): self.sourcesdir = os.path.join(self.current_system.resourcesdir, 'CDO-NCO') self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'kesch:pn', 'kesch:cn'] + 'kesch:pn'] if self.current_system.name == 'kesch': self.valid_prog_environs = ['PrgEnv-gnu-nompi'] self.modules = ['cdo'] @@ -39,7 +39,7 @@ def __init__(self): self.modules = ['CDO'] self.maintainers = ['SO'] - self.tags = {'production'} + self.tags = {'production', 'mch'} # Check that the netCDF loaded by the CDO module supports the nc4 filetype diff --git a/cscs-checks/tools/io/nco.py b/cscs-checks/tools/io/nco.py index 2986d33dd4..692c99ddcc 100644 --- a/cscs-checks/tools/io/nco.py +++ b/cscs-checks/tools/io/nco.py @@ -32,7 +32,7 @@ def __init__(self): self.modules = ['NCO'] self.maintainers = ['SO'] - self.tags = {'production'} + self.tags = {'production', 'mch'} # Check that the netCDF loaded by the NCO module supports the nc4 filetype From b0026be3b705abdf3aa5cac6b37aa17fd54b4bc5 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Tue, 27 Nov 2018 16:22:04 +0100 Subject: [PATCH 2/2] Remove kesch:cn from the NCO test --- cscs-checks/tools/io/nco.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/tools/io/nco.py b/cscs-checks/tools/io/nco.py index 692c99ddcc..f7af69c572 100644 --- a/cscs-checks/tools/io/nco.py +++ b/cscs-checks/tools/io/nco.py @@ -23,7 +23,7 @@ def __init__(self): self.sourcesdir = os.path.join(self.current_system.resourcesdir, 'CDO-NCO') self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', - 'kesch:pn', 'kesch:cn'] + 'kesch:pn'] if self.current_system.name == 'kesch': self.valid_prog_environs = ['PrgEnv-gnu-nompi'] self.modules = ['nco']