diff --git a/benchmark-slow/build/cosma7.py b/benchmark-slow/build/cosma7.py
deleted file mode 100644
index 3dcb16ddb807b0899156840fa672221cf8676e15..0000000000000000000000000000000000000000
--- a/benchmark-slow/build/cosma7.py
+++ /dev/null
@@ -1,88 +0,0 @@
-site_configuration = {
- 'systems': [
- {
- 'name': 'cosma7',
- 'descr': 'Cosma7',
- 'hostnames': ['login7b.pri.cosma7.alces.network', 'login7c.pri.cosma7.alces.network', 'login7a.pri.cosma7.alces.network'],
- 'modules_system': 'tmod4',
- 'partitions': [
- {
- 'name': 'login',
- 'descr': 'login nodes',
- 'scheduler': 'local',
- 'launcher': 'local',
- 'environs': ['intelcosma7'],
- 'max_jobs': 100,
- },
- {
- 'name': 'cpu_single_node',
- 'descr': 'cpu nodes - single node',
- 'scheduler': 'slurm',
- 'launcher': 'local',
- 'access': ['-p cosma7', '-A ds007'],
- 'environs': ['intelcosma7'],
- 'max_jobs': 100,
- },
- {
- 'name': 'cpu_multi_node',
- 'descr': 'cpu nodes - multi node',
- 'scheduler': 'slurm',
- 'launcher': 'mpirun',
- 'access': ['-p cosma7', '-A ds007'],
- 'environs': ['intelcosma7'],
- 'max_jobs': 100,
- }
- ]
- }
- ],
- 'environments': [
- {
- 'modules': ['intel_comp/2018', 'intel_mpi/2018',
- 'parmetis/4.0.3', 'parallel_hdf5/1.10.3',
- 'gsl/2.4', 'fftw/3.3.8cosma7',
- 'python/3.6.5'],
- 'name': 'intelcosma7',
- 'cc': 'icc',
- 'cxx': 'icpc',
- 'ftn': '',
- 'target_systems': ['cosma7']
- }
- ],
- 'logging': [
- {
- 'level': 'debug',
- 'handlers': [
- {
- 'type': 'stream',
- 'name': 'stdout',
- 'level': 'info',
- 'format': '%(message)s'
- },
- {
- 'type': 'file',
- 'name': 'reframe.log',
- 'level': 'debug',
- 'format': '[%(asctime)s] %(levelname)s: %(check_info)s: %(message)s', # noqa: E501
- 'append': False
- }
- ],
- 'handlers_perflog': [
- {
- 'type': 'filelog',
- 'prefix': '%(check_system)s/%(check_partition)s',
- 'level': 'info',
- 'format': (
- '%(check_job_completion_time)s|reframe %(version)s|'
- '%(check_info)s|jobid=%(check_jobid)s|'
- '%(check_perf_var)s=%(check_perf_value)s|'
- 'ref=%(check_perf_ref)s '
- '(l=%(check_perf_lower_thres)s, '
- 'u=%(check_perf_upper_thres)s)|'
- '%(check_perf_unit)s'
- ),
- 'append': True
- }
- ]
- }
- ],
-}
diff --git a/benchmark-slow/build/swiftReframeTest.py b/benchmark-slow/build/swiftReframeTest.py
deleted file mode 100644
index 3a616ade2c94138660df901e310b6df9d2b04030..0000000000000000000000000000000000000000
--- a/benchmark-slow/build/swiftReframeTest.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import reframe as rfm
-import reframe.utility.sanity as sn
-
-
-GIT_REV = 'master'
-
-@rfm.simple_test
-class PMillenniumTest(rfm.RegressionTest):
- def __init__(self):
- self.valid_systems = ['cosma7:cpu_single_node']
- self.valid_prog_environs = ['*']
- self.build_system = 'Autotools'
- self.prebuild_cmds = [
- 'rm -rf swiftsim',
- 'git clone https://gitlab.cosma.dur.ac.uk/swift/swiftsim.git',
- 'pushd swiftsim',
- f'git checkout {GIT_REV}',
- 'git clean -x -f -d',
- './autogen.sh',
- 'cd ./'
- ]
- self.build_system.max_concurrency = 32
- self.build_system.config_opts = [
- '--enable-ipo',
- '--with-tbbmalloc',
- '--with-parmetis'
- ]
- self.sanity_patterns = sn.assert_found("", self.stdout)
diff --git a/benchmark-slow/job-aps/__pycache__/cosma7.cpython-36.pyc b/benchmark-slow/job-aps/__pycache__/cosma7.cpython-36.pyc
deleted file mode 100644
index 24573fd96f33180a530fc9084eef89d8ce595663..0000000000000000000000000000000000000000
Binary files a/benchmark-slow/job-aps/__pycache__/cosma7.cpython-36.pyc and /dev/null differ
diff --git a/benchmark-slow/job-aps/__pycache__/swiftReframeTest.cpython-36.pyc b/benchmark-slow/job-aps/__pycache__/swiftReframeTest.cpython-36.pyc
deleted file mode 100644
index 1f966a47a3e8f71ba4658384d4578d766c720da8..0000000000000000000000000000000000000000
Binary files a/benchmark-slow/job-aps/__pycache__/swiftReframeTest.cpython-36.pyc and /dev/null differ
diff --git a/benchmark-slow/job-aps/cosma7.py b/benchmark-slow/job-aps/cosma7.py
deleted file mode 100644
index 6c425fe4549b8c2653a05d84acadda5659c06c16..0000000000000000000000000000000000000000
--- a/benchmark-slow/job-aps/cosma7.py
+++ /dev/null
@@ -1,88 +0,0 @@
-site_configuration = {
- 'systems': [
- {
- 'name': 'cosma7',
- 'descr': 'Cosma7',
- 'hostnames': ['b101.pri.cosma7.alces.network', 'login7b.pri.cosma7.alces.network', 'login7c.pri.cosma7.alces.network', 'login7a.pri.cosma7.alces.network'],
- 'modules_system': 'tmod4',
- 'partitions': [
- {
- 'name': 'login',
- 'descr': 'login nodes',
- 'scheduler': 'local',
- 'launcher': 'local',
- 'environs': ['intelcosma7'],
- 'max_jobs': 100,
- },
- {
- 'name': 'cpu_single_node',
- 'descr': 'cpu nodes - single node',
- 'scheduler': 'slurm',
- 'launcher': 'local',
- 'access': ['-p cosma7', '-A ds007'],
- 'environs': ['intelcosma7'],
- 'max_jobs': 100,
- },
- {
- 'name': 'cpu_multi_node',
- 'descr': 'cpu nodes - multi node',
- 'scheduler': 'slurm',
- 'launcher': 'mpirun',
- 'access': ['-p cosma7', '-A ds007'],
- 'environs': ['intelcosma7'],
- 'max_jobs': 100,
- }
- ]
- }
- ],
- 'environments': [
- {
- 'modules': ['intel_comp/2018', 'intel_mpi/2018',
- 'parmetis/4.0.3', 'parallel_hdf5/1.10.3',
- 'gsl/2.4', 'fftw/3.3.8cosma7',
- 'python/3.6.5','vtune'],
- 'name': 'intelcosma7',
- 'cc': 'icc',
- 'cxx': 'icpc',
- 'ftn': '',
- 'target_systems': ['cosma7']
- }
- ],
- 'logging': [
- {
- 'level': 'debug',
- 'handlers': [
- {
- 'type': 'stream',
- 'name': 'stdout',
- 'level': 'info',
- 'format': '%(message)s'
- },
- {
- 'type': 'file',
- 'name': 'reframe.log',
- 'level': 'debug',
- 'format': '[%(asctime)s] %(levelname)s: %(check_info)s: %(message)s', # noqa: E501
- 'append': False
- }
- ],
- 'handlers_perflog': [
- {
- 'type': 'filelog',
- 'prefix': '%(check_system)s/%(check_partition)s',
- 'level': 'info',
- 'format': (
- '%(check_job_completion_time)s|reframe %(version)s|'
- '%(check_info)s|jobid=%(check_jobid)s|'
- '%(check_perf_var)s=%(check_perf_value)s|'
- 'ref=%(check_perf_ref)s '
- '(l=%(check_perf_lower_thres)s, '
- 'u=%(check_perf_upper_thres)s)|'
- '%(check_perf_unit)s'
- ),
- 'append': True
- }
- ]
- }
- ],
-}
diff --git a/benchmark-slow/job-aps/swiftReframeTest.py b/benchmark-slow/job-aps/swiftReframeTest.py
deleted file mode 100644
index c0a4b91494b420da99d2accb062fa90b0fbbbf07..0000000000000000000000000000000000000000
--- a/benchmark-slow/job-aps/swiftReframeTest.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import reframe as rfm
-import reframe.utility.sanity as sn
-
-
-GIT_REV = 'master'
-
-@rfm.simple_test
-class PMillenniumTest(rfm.RegressionTest):
- def __init__(self):
- self.valid_systems = ['cosma7:cpu_single_node','cosma7:cpu_multi_node']
- self.valid_prog_environs = ['*']
- self.build_system = 'Autotools'
- self.sourcesdir = None # Added
- self.prebuild_cmds = [
- 'rm -rf swiftsim',
- 'git clone https://gitlab.cosma.dur.ac.uk/swift/swiftsim.git',
- 'pushd swiftsim',
- f'git checkout {GIT_REV}',
- 'git clean -x -f -d',
- './autogen.sh',
- 'cd ./'
- ]
- self.build_system.max_concurrency = 32
- self.build_system.config_opts = [
- '--enable-ipo',
- '--with-tbbmalloc',
- '--with-parmetis'
- ]
-
- test_dir = 'swiftsim/examples/PMillennium/PMillennium-768'
- self.keep_files = [test_dir]
- self.prerun_cmds = [f'pushd {test_dir}']
- #self.executable = 'mpirun' #temp copied out
- num_iterations = 1
- num_threads = 64
- ic_dir = '/cosma/home/durham/dc-turn5/swiftsim/examples'
- self.executable_opts = [
- 'aps', '--collection-mode=mpi,omp',
- '../../swift_mpi',
- '--cosmology',
- '--self-gravity',
- '-v', '1',
- f'--threads={num_threads}',
- '-n', f'{num_iterations}',
- '-P', 'Restarts:enable:0',
- f'-PInitialConditions:file_name:{ic_dir}/pmillenium/PMill-768.hdf5',
- 'p-mill-768.yml'
- ]
-
- self.sanity_patterns = sn.assert_found("", self.stdout) # moved from above
-
-