Move reframe test files into seperate directory

reframe_tests/benchmark_tests/reframe_benchmarks.py

@@ -1,7 +1,8 @@
 import reframe as rfm
-from base_tests import GprMaxBaseTest
 from reframe.core.builtins import parameter, run_after
 
+from reframe_tests.tests.base_tests import GprMaxRegressionTest
+
 """ReFrame tests for performance benchmarking
 
     Usage:
@@ -11,10 +12,9 @@ from reframe.core.builtins import parameter, run_after
 
 
 @rfm.simple_test
-class SingleNodeBenchmark(GprMaxBaseTest):
+class SingleNodeBenchmark(GprMaxRegressionTest):
     tags = {"benchmark", "single node", "openmp"}
 
-    num_tasks = 1
     omp_threads = parameter([1, 2, 4, 8, 16, 32, 64, 128])
     domain = parameter([0.1, 0.15, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8])
     cpu_freq = parameter([2000000, 2250000])

reframe_tests/job_scripts/archer2_benchmarks.slurm

@@ -14,6 +14,6 @@ export OMP_NUM_THREADS=1
 source ../.venv/bin/activate
 
 # Any commandline arguments provided will be passed to reframe
-reframe -C configuration/archer2_settings.py -c reframe_benchmarks.py -c base_tests.py -r --performance-report "$@"
+reframe -C configuration/archer2_settings.py -c benchmark_tests/ -c tests/base_tests.py -r --performance-report "$@"
 
 sacct --format=JobID,State,Submit,Start,End,Elapsed,NodeList,ReqMem --units=M -j $SLURM_JOBID

reframe_tests/job_scripts/archer2_tests.slurm

@@ -15,6 +15,6 @@ module load cray-python
 
 source ../.venv/bin/activate
 
-reframe -C configuration/archer2_settings.py -c reframe_tests.py -c base_tests.py -r "$@"
+reframe -C configuration/archer2_settings.py -c tests/ -r "$@"
 
 sacct --format=JobID,State,Submit,Start,End,Elapsed,NodeList --units=M -j $SLURM_JOBID

reframe_tests/tests/base_tests.py

@@ -18,9 +18,9 @@ from reframe.core.builtins import (
     variable,
 )
 from reframe.utility import udeps
-from utilities.deferrable import path_join
 
 from gprMax.receivers import Rx
+from reframe_tests.utilities.deferrable import path_join
 
 GPRMAX_ROOT_DIR = Path(__file__).parent.parent.resolve()
 PATH_TO_PYENV = os.path.join(".venv", "bin", "activate")