From 61ee0235a180a1635b74b67718c9853212d9f678 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Wed, 26 Feb 2020 11:14:09 +0100 Subject: [PATCH 1/2] Fix deprecated 'time_limit' syntax in checks --- cscs-checks/apps/cpmd/cpmd_check.py | 2 +- cscs-checks/apps/paraview/paraview_check.py | 2 +- cscs-checks/microbenchmarks/spec-accel/spec.py | 2 +- cscs-checks/prgenv/mpi.py | 2 +- cscs-checks/system/io/ior_check.py | 2 +- cscs-checks/system/openstack/s3_check.py | 2 +- cscs-checks/system/slurm/slurm.py | 2 +- cscs-checks/tools/jupyter/jupyter_tests.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cscs-checks/apps/cpmd/cpmd_check.py b/cscs-checks/apps/cpmd/cpmd_check.py index c0295e7db3..64c79cdd5c 100644 --- a/cscs-checks/apps/cpmd/cpmd_check.py +++ b/cscs-checks/apps/cpmd/cpmd_check.py @@ -21,7 +21,7 @@ def __init__(self, scale): self.valid_systems += ['dom:gpu'] else: self.num_tasks = 16 - self.time_limit = (0, 20, 0) + self.time_limit = '20m' self.num_tasks_per_node = 1 self.valid_prog_environs = ['PrgEnv-intel'] diff --git a/cscs-checks/apps/paraview/paraview_check.py b/cscs-checks/apps/paraview/paraview_check.py index 678a03014a..52df0c1f81 100644 --- a/cscs-checks/apps/paraview/paraview_check.py +++ b/cscs-checks/apps/paraview/paraview_check.py @@ -16,7 +16,7 @@ def __init__(self): self.num_tasks_per_node = 12 self.modules = ['ParaView'] - self.time_limit = (0, 1, 0) + self.time_limit = '1m' self.executable = 'pvbatch' self.executable_opts = ['coloredSphere.py'] diff --git a/cscs-checks/microbenchmarks/spec-accel/spec.py b/cscs-checks/microbenchmarks/spec-accel/spec.py index b0e996e387..4cf1994020 100644 --- a/cscs-checks/microbenchmarks/spec-accel/spec.py +++ b/cscs-checks/microbenchmarks/spec-accel/spec.py @@ -42,7 +42,7 @@ def __init__(self, prg_envs): self.num_tasks = 1 self.num_tasks_per_node = 1 - self.time_limit = (0, 30, 0) + self.time_limit = '30m' self.executable = 'runspec' diff --git a/cscs-checks/prgenv/mpi.py b/cscs-checks/prgenv/mpi.py index 2879937f81..3a0c27342e 100644 --- a/cscs-checks/prgenv/mpi.py +++ b/cscs-checks/prgenv/mpi.py @@ -48,7 +48,7 @@ def __init__(self, required_thread): } self.build_system.cppflags = self.cppflags[required_thread] self.build_system.cppflags += ['-static'] - self.time_limit = (0, 1, 0) + self.time_limit = '1m' found_mpithread = sn.extractsingle( r'^mpi_thread_required=\w+\s+mpi_thread_supported=\w+' r'\s+mpi_thread_queried=\w+\s+(?P\d)$', diff --git a/cscs-checks/system/io/ior_check.py b/cscs-checks/system/io/ior_check.py index 0d70036e16..844eee8613 100644 --- a/cscs-checks/system/io/ior_check.py +++ b/cscs-checks/system/io/ior_check.py @@ -101,7 +101,7 @@ def __init__(self, base_dir): # Default umask is 0022, which generates file permissions -rw-r--r-- # we want -rw-rw-r-- so we set umask to 0002 os.umask(2) - self.time_limit = (0, 5, 0) + self.time_limit = '5m' # Our references are based on fs types but regression needs reference # per system. self.reference = { diff --git a/cscs-checks/system/openstack/s3_check.py b/cscs-checks/system/openstack/s3_check.py index c15442b79a..6831ade79f 100644 --- a/cscs-checks/system/openstack/s3_check.py +++ b/cscs-checks/system/openstack/s3_check.py @@ -15,7 +15,7 @@ def __init__(self): self.tags = {'ops', 'object_store'} self.valid_systems = ['dom:gpu', 'daint:gpu'] self.valid_prog_environs = ['PrgEnv-gnu'] - self.time_limit = (0, 5, 0) + self.time_limit = '5m' self.maintainers = ['VH', 'GLR'] self.executable = 's3_test.sh' self.username = getpass.getuser() diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py index b0b79881b1..ce0dec801b 100644 --- a/cscs-checks/system/slurm/slurm.py +++ b/cscs-checks/system/slurm/slurm.py @@ -170,7 +170,7 @@ def set_slurm_constraint(self): class MemoryOverconsumptionCheck(SlurmCompiledBaseCheck): def __init__(self): super().__init__() - self.time_limit = (0, 1, 0) + self.time_limit = '1m' self.sourcepath = 'eatmemory.c' self.tags.add('mem') self.executable_opts = ['4000M'] diff --git a/cscs-checks/tools/jupyter/jupyter_tests.py b/cscs-checks/tools/jupyter/jupyter_tests.py index e38d8f665a..d604ae17d5 100644 --- a/cscs-checks/tools/jupyter/jupyter_tests.py +++ b/cscs-checks/tools/jupyter/jupyter_tests.py @@ -15,7 +15,7 @@ def __init__(self): self.valid_prog_environs = ['*'] self.sourcesdir = None self.executable = 'hostname' - self.time_limit = (0, 1, 0) + self.time_limit = '1m' self.sanity_patterns = sn.assert_found(r'nid\d+', self.stdout) self.tags = {'production', 'maintenance'} self.maintainers = ['RS', 'TR'] From 5540b563dbbf6fb1d2b2a347a62d63da237b2e70 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Tue, 3 Mar 2020 10:22:03 +0100 Subject: [PATCH 2/2] Remove timelimit from cpmd check --- cscs-checks/apps/cpmd/cpmd_check.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cscs-checks/apps/cpmd/cpmd_check.py b/cscs-checks/apps/cpmd/cpmd_check.py index 64c79cdd5c..803d053324 100644 --- a/cscs-checks/apps/cpmd/cpmd_check.py +++ b/cscs-checks/apps/cpmd/cpmd_check.py @@ -21,7 +21,6 @@ def __init__(self, scale): self.valid_systems += ['dom:gpu'] else: self.num_tasks = 16 - self.time_limit = '20m' self.num_tasks_per_node = 1 self.valid_prog_environs = ['PrgEnv-intel']