diff --git a/reframe_tests/benchmarks/SingleNodeBenchmark_2024-01-24_11-31-37.csv b/reframe_tests/benchmark_results/SingleNodeBenchmark_2024-01-24_11-31-37.csv similarity index 100% rename from reframe_tests/benchmarks/SingleNodeBenchmark_2024-01-24_11-31-37.csv rename to reframe_tests/benchmark_results/SingleNodeBenchmark_2024-01-24_11-31-37.csv diff --git a/reframe_tests/reframe_benchmarks.py b/reframe_tests/benchmark_tests/reframe_benchmarks.py similarity index 88% rename from reframe_tests/reframe_benchmarks.py rename to reframe_tests/benchmark_tests/reframe_benchmarks.py index 0690d2a8..ea4b8aae 100644 --- a/reframe_tests/reframe_benchmarks.py +++ b/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]) diff --git a/reframe_tests/src/benchmark_tests/benchmark_model_0.1.in b/reframe_tests/benchmark_tests/src/benchmark_model_0.1.in similarity index 100% rename from reframe_tests/src/benchmark_tests/benchmark_model_0.1.in rename to reframe_tests/benchmark_tests/src/benchmark_model_0.1.in diff --git a/reframe_tests/src/benchmark_tests/benchmark_model_0.15.in b/reframe_tests/benchmark_tests/src/benchmark_model_0.15.in similarity index 100% rename from reframe_tests/src/benchmark_tests/benchmark_model_0.15.in rename to reframe_tests/benchmark_tests/src/benchmark_model_0.15.in diff --git a/reframe_tests/src/benchmark_tests/benchmark_model_0.2.in b/reframe_tests/benchmark_tests/src/benchmark_model_0.2.in similarity index 100% rename from reframe_tests/src/benchmark_tests/benchmark_model_0.2.in rename to reframe_tests/benchmark_tests/src/benchmark_model_0.2.in diff --git a/reframe_tests/src/benchmark_tests/benchmark_model_0.3.in b/reframe_tests/benchmark_tests/src/benchmark_model_0.3.in similarity index 100% rename from reframe_tests/src/benchmark_tests/benchmark_model_0.3.in rename to reframe_tests/benchmark_tests/src/benchmark_model_0.3.in diff --git a/reframe_tests/src/benchmark_tests/benchmark_model_0.4.in b/reframe_tests/benchmark_tests/src/benchmark_model_0.4.in similarity index 100% rename from reframe_tests/src/benchmark_tests/benchmark_model_0.4.in rename to reframe_tests/benchmark_tests/src/benchmark_model_0.4.in diff --git a/reframe_tests/src/benchmark_tests/benchmark_model_0.5.in b/reframe_tests/benchmark_tests/src/benchmark_model_0.5.in similarity index 100% rename from reframe_tests/src/benchmark_tests/benchmark_model_0.5.in rename to reframe_tests/benchmark_tests/src/benchmark_model_0.5.in diff --git a/reframe_tests/src/benchmark_tests/benchmark_model_0.6.in b/reframe_tests/benchmark_tests/src/benchmark_model_0.6.in similarity index 100% rename from reframe_tests/src/benchmark_tests/benchmark_model_0.6.in rename to reframe_tests/benchmark_tests/src/benchmark_model_0.6.in diff --git a/reframe_tests/src/benchmark_tests/benchmark_model_0.7.in b/reframe_tests/benchmark_tests/src/benchmark_model_0.7.in similarity index 100% rename from reframe_tests/src/benchmark_tests/benchmark_model_0.7.in rename to reframe_tests/benchmark_tests/src/benchmark_model_0.7.in diff --git a/reframe_tests/src/benchmark_tests/benchmark_model_0.8.in b/reframe_tests/benchmark_tests/src/benchmark_model_0.8.in similarity index 100% rename from reframe_tests/src/benchmark_tests/benchmark_model_0.8.in rename to reframe_tests/benchmark_tests/src/benchmark_model_0.8.in diff --git a/reframe_tests/job_scripts/archer2_benchmarks.slurm b/reframe_tests/job_scripts/archer2_benchmarks.slurm index 35986739..a0879fea 100644 --- a/reframe_tests/job_scripts/archer2_benchmarks.slurm +++ b/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 diff --git a/reframe_tests/job_scripts/archer2_tests.slurm b/reframe_tests/job_scripts/archer2_tests.slurm index f3958fd2..6a50fa19 100644 --- a/reframe_tests/job_scripts/archer2_tests.slurm +++ b/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 diff --git a/reframe_tests/base_tests.py b/reframe_tests/tests/base_tests.py similarity index 99% rename from reframe_tests/base_tests.py rename to reframe_tests/tests/base_tests.py index fbbc6b9b..d9d037e0 100644 --- a/reframe_tests/base_tests.py +++ b/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") diff --git a/reframe_tests/reframe_tests.py b/reframe_tests/tests/reframe_tests.py similarity index 100% rename from reframe_tests/reframe_tests.py rename to reframe_tests/tests/reframe_tests.py diff --git a/reframe_tests/regression_checks/BasicModelsTest_6145b3c8.h5 b/reframe_tests/tests/regression_checks/BasicModelsTest_6145b3c8.h5 similarity index 100% rename from reframe_tests/regression_checks/BasicModelsTest_6145b3c8.h5 rename to reframe_tests/tests/regression_checks/BasicModelsTest_6145b3c8.h5 diff --git a/reframe_tests/regression_checks/BasicModelsTest_d294e091.h5 b/reframe_tests/tests/regression_checks/BasicModelsTest_d294e091.h5 similarity index 100% rename from reframe_tests/regression_checks/BasicModelsTest_d294e091.h5 rename to reframe_tests/tests/regression_checks/BasicModelsTest_d294e091.h5 diff --git a/reframe_tests/regression_checks/Test2DModelXY_e26f33ea.h5 b/reframe_tests/tests/regression_checks/Test2DModelXY_e26f33ea.h5 similarity index 100% rename from reframe_tests/regression_checks/Test2DModelXY_e26f33ea.h5 rename to reframe_tests/tests/regression_checks/Test2DModelXY_e26f33ea.h5 diff --git a/reframe_tests/regression_checks/Test2DModelXZ_e21872c4.h5 b/reframe_tests/tests/regression_checks/Test2DModelXZ_e21872c4.h5 similarity index 100% rename from reframe_tests/regression_checks/Test2DModelXZ_e21872c4.h5 rename to reframe_tests/tests/regression_checks/Test2DModelXZ_e21872c4.h5 diff --git a/reframe_tests/regression_checks/Test2DModelYZ_3e050c27.h5 b/reframe_tests/tests/regression_checks/Test2DModelYZ_3e050c27.h5 similarity index 100% rename from reframe_tests/regression_checks/Test2DModelYZ_3e050c27.h5 rename to reframe_tests/tests/regression_checks/Test2DModelYZ_3e050c27.h5 diff --git a/reframe_tests/regression_checks/TestAscan_e9940356.h5 b/reframe_tests/tests/regression_checks/TestAscan_e9940356.h5 similarity index 100% rename from reframe_tests/regression_checks/TestAscan_e9940356.h5 rename to reframe_tests/tests/regression_checks/TestAscan_e9940356.h5 diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_0d642269.h5 b/reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_0d642269.h5 similarity index 100% rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_0d642269.h5 rename to reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_0d642269.h5 diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_3b4b184a.h5 b/reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_3b4b184a.h5 similarity index 100% rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_3b4b184a.h5 rename to reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_3b4b184a.h5 diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_a8674323.h5 b/reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_a8674323.h5 similarity index 100% rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_a8674323.h5 rename to reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_a8674323.h5 diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_ce6262f3.h5 b/reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_ce6262f3.h5 similarity index 100% rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_ce6262f3.h5 rename to reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_ce6262f3.h5 diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_f30e6d10.h5 b/reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_f30e6d10.h5 similarity index 100% rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_f30e6d10.h5 rename to reframe_tests/tests/regression_checks/TestBoxGeometryDefaultPml_f30e6d10.h5 diff --git a/reframe_tests/regression_checks/TestBoxGeometryNoPml_0e734b72.h5 b/reframe_tests/tests/regression_checks/TestBoxGeometryNoPml_0e734b72.h5 similarity index 100% rename from reframe_tests/regression_checks/TestBoxGeometryNoPml_0e734b72.h5 rename to reframe_tests/tests/regression_checks/TestBoxGeometryNoPml_0e734b72.h5 diff --git a/reframe_tests/regression_checks/TestBoxGeometryNoPml_0ebe9cc0.h5 b/reframe_tests/tests/regression_checks/TestBoxGeometryNoPml_0ebe9cc0.h5 similarity index 100% rename from reframe_tests/regression_checks/TestBoxGeometryNoPml_0ebe9cc0.h5 rename to reframe_tests/tests/regression_checks/TestBoxGeometryNoPml_0ebe9cc0.h5 diff --git a/reframe_tests/regression_checks/TestBoxGeometryNoPml_7804157f.h5 b/reframe_tests/tests/regression_checks/TestBoxGeometryNoPml_7804157f.h5 similarity index 100% rename from reframe_tests/regression_checks/TestBoxGeometryNoPml_7804157f.h5 rename to reframe_tests/tests/regression_checks/TestBoxGeometryNoPml_7804157f.h5 diff --git a/reframe_tests/regression_checks/TestBscan_efecb66e.h5 b/reframe_tests/tests/regression_checks/TestBscan_efecb66e.h5 similarity index 100% rename from reframe_tests/regression_checks/TestBscan_efecb66e.h5 rename to reframe_tests/tests/regression_checks/TestBscan_efecb66e.h5 diff --git a/reframe_tests/regression_checks/TestDispersiveMaterials_99243fd2.h5 b/reframe_tests/tests/regression_checks/TestDispersiveMaterials_99243fd2.h5 similarity index 100% rename from reframe_tests/regression_checks/TestDispersiveMaterials_99243fd2.h5 rename to reframe_tests/tests/regression_checks/TestDispersiveMaterials_99243fd2.h5 diff --git a/reframe_tests/regression_checks/TestEdgeGeometry_c4eb9ee8.h5 b/reframe_tests/tests/regression_checks/TestEdgeGeometry_c4eb9ee8.h5 similarity index 100% rename from reframe_tests/regression_checks/TestEdgeGeometry_c4eb9ee8.h5 rename to reframe_tests/tests/regression_checks/TestEdgeGeometry_c4eb9ee8.h5 diff --git a/reframe_tests/regression_checks/TestHertzianDipoleSource_ca97d05d.h5 b/reframe_tests/tests/regression_checks/TestHertzianDipoleSource_ca97d05d.h5 similarity index 100% rename from reframe_tests/regression_checks/TestHertzianDipoleSource_ca97d05d.h5 rename to reframe_tests/tests/regression_checks/TestHertzianDipoleSource_ca97d05d.h5 diff --git a/reframe_tests/regression_checks/TestMagneticDipoleSource_58b9b32a.h5 b/reframe_tests/tests/regression_checks/TestMagneticDipoleSource_58b9b32a.h5 similarity index 100% rename from reframe_tests/regression_checks/TestMagneticDipoleSource_58b9b32a.h5 rename to reframe_tests/tests/regression_checks/TestMagneticDipoleSource_58b9b32a.h5 diff --git a/reframe_tests/regression_checks/TestSingleCellPml_c05c95d0.h5 b/reframe_tests/tests/regression_checks/TestSingleCellPml_c05c95d0.h5 similarity index 100% rename from reframe_tests/regression_checks/TestSingleCellPml_c05c95d0.h5 rename to reframe_tests/tests/regression_checks/TestSingleCellPml_c05c95d0.h5 diff --git a/reframe_tests/regression_checks/TestSubgrids_36a9f022.h5 b/reframe_tests/tests/regression_checks/TestSubgrids_36a9f022.h5 similarity index 100% rename from reframe_tests/regression_checks/TestSubgrids_36a9f022.h5 rename to reframe_tests/tests/regression_checks/TestSubgrids_36a9f022.h5 diff --git a/reframe_tests/regression_checks/TestTransmissionLineSource_ced17afa.h5 b/reframe_tests/tests/regression_checks/TestTransmissionLineSource_ced17afa.h5 similarity index 100% rename from reframe_tests/regression_checks/TestTransmissionLineSource_ced17afa.h5 rename to reframe_tests/tests/regression_checks/TestTransmissionLineSource_ced17afa.h5 diff --git a/reframe_tests/src/2d_tests/2D_ExHyHz.in b/reframe_tests/tests/src/2d_tests/2D_ExHyHz.in similarity index 100% rename from reframe_tests/src/2d_tests/2D_ExHyHz.in rename to reframe_tests/tests/src/2d_tests/2D_ExHyHz.in diff --git a/reframe_tests/src/2d_tests/2D_ExHyHz_hs.in b/reframe_tests/tests/src/2d_tests/2D_ExHyHz_hs.in similarity index 100% rename from reframe_tests/src/2d_tests/2D_ExHyHz_hs.in rename to reframe_tests/tests/src/2d_tests/2D_ExHyHz_hs.in diff --git a/reframe_tests/src/2d_tests/2D_EyHxHz.in b/reframe_tests/tests/src/2d_tests/2D_EyHxHz.in similarity index 100% rename from reframe_tests/src/2d_tests/2D_EyHxHz.in rename to reframe_tests/tests/src/2d_tests/2D_EyHxHz.in diff --git a/reframe_tests/src/2d_tests/2D_EzHxHy.in b/reframe_tests/tests/src/2d_tests/2D_EzHxHy.in similarity index 100% rename from reframe_tests/src/2d_tests/2D_EzHxHy.in rename to reframe_tests/tests/src/2d_tests/2D_EzHxHy.in diff --git a/reframe_tests/src/bscan_tests/cylinder_Bscan_2D.in b/reframe_tests/tests/src/bscan_tests/cylinder_Bscan_2D.in similarity index 100% rename from reframe_tests/src/bscan_tests/cylinder_Bscan_2D.in rename to reframe_tests/tests/src/bscan_tests/cylinder_Bscan_2D.in diff --git a/reframe_tests/src/example_models/cylinder_Ascan_2D.in b/reframe_tests/tests/src/example_models/cylinder_Ascan_2D.in similarity index 100% rename from reframe_tests/src/example_models/cylinder_Ascan_2D.in rename to reframe_tests/tests/src/example_models/cylinder_Ascan_2D.in diff --git a/reframe_tests/src/geometry_tests/box_geometry/box_full_model.in b/reframe_tests/tests/src/geometry_tests/box_geometry/box_full_model.in similarity index 100% rename from reframe_tests/src/geometry_tests/box_geometry/box_full_model.in rename to reframe_tests/tests/src/geometry_tests/box_geometry/box_full_model.in diff --git a/reframe_tests/src/geometry_tests/box_geometry/box_half_model.in b/reframe_tests/tests/src/geometry_tests/box_geometry/box_half_model.in similarity index 100% rename from reframe_tests/src/geometry_tests/box_geometry/box_half_model.in rename to reframe_tests/tests/src/geometry_tests/box_geometry/box_half_model.in diff --git a/reframe_tests/src/geometry_tests/box_geometry/box_outside_pml.in b/reframe_tests/tests/src/geometry_tests/box_geometry/box_outside_pml.in similarity index 100% rename from reframe_tests/src/geometry_tests/box_geometry/box_outside_pml.in rename to reframe_tests/tests/src/geometry_tests/box_geometry/box_outside_pml.in diff --git a/reframe_tests/src/geometry_tests/box_geometry/box_single_rank.in b/reframe_tests/tests/src/geometry_tests/box_geometry/box_single_rank.in similarity index 100% rename from reframe_tests/src/geometry_tests/box_geometry/box_single_rank.in rename to reframe_tests/tests/src/geometry_tests/box_geometry/box_single_rank.in diff --git a/reframe_tests/src/geometry_tests/box_geometry/box_single_rank_outside_pml.in b/reframe_tests/tests/src/geometry_tests/box_geometry/box_single_rank_outside_pml.in similarity index 100% rename from reframe_tests/src/geometry_tests/box_geometry/box_single_rank_outside_pml.in rename to reframe_tests/tests/src/geometry_tests/box_geometry/box_single_rank_outside_pml.in diff --git a/reframe_tests/src/geometry_tests/edge_geometry/antenna_wire_dipole_fs.in b/reframe_tests/tests/src/geometry_tests/edge_geometry/antenna_wire_dipole_fs.in similarity index 100% rename from reframe_tests/src/geometry_tests/edge_geometry/antenna_wire_dipole_fs.in rename to reframe_tests/tests/src/geometry_tests/edge_geometry/antenna_wire_dipole_fs.in diff --git a/reframe_tests/src/material_tests/hertzian_dipole_dispersive.in b/reframe_tests/tests/src/material_tests/hertzian_dipole_dispersive.in similarity index 100% rename from reframe_tests/src/material_tests/hertzian_dipole_dispersive.in rename to reframe_tests/tests/src/material_tests/hertzian_dipole_dispersive.in diff --git a/reframe_tests/src/material_tests/magnetic_dipole_hs.in b/reframe_tests/tests/src/material_tests/magnetic_dipole_hs.in similarity index 100% rename from reframe_tests/src/material_tests/magnetic_dipole_hs.in rename to reframe_tests/tests/src/material_tests/magnetic_dipole_hs.in diff --git a/reframe_tests/src/pml_tests/single_cell_pml_2d.in b/reframe_tests/tests/src/pml_tests/single_cell_pml_2d.in similarity index 100% rename from reframe_tests/src/pml_tests/single_cell_pml_2d.in rename to reframe_tests/tests/src/pml_tests/single_cell_pml_2d.in diff --git a/reframe_tests/src/snapshot_tests/whole_domain.in b/reframe_tests/tests/src/snapshot_tests/whole_domain.in similarity index 100% rename from reframe_tests/src/snapshot_tests/whole_domain.in rename to reframe_tests/tests/src/snapshot_tests/whole_domain.in diff --git a/reframe_tests/src/snapshot_tests/whole_domain_2d.in b/reframe_tests/tests/src/snapshot_tests/whole_domain_2d.in similarity index 100% rename from reframe_tests/src/snapshot_tests/whole_domain_2d.in rename to reframe_tests/tests/src/snapshot_tests/whole_domain_2d.in diff --git a/reframe_tests/src/source_tests/hertzian_dipole_fs.in b/reframe_tests/tests/src/source_tests/hertzian_dipole_fs.in similarity index 100% rename from reframe_tests/src/source_tests/hertzian_dipole_fs.in rename to reframe_tests/tests/src/source_tests/hertzian_dipole_fs.in diff --git a/reframe_tests/src/source_tests/magnetic_dipole_fs.in b/reframe_tests/tests/src/source_tests/magnetic_dipole_fs.in similarity index 100% rename from reframe_tests/src/source_tests/magnetic_dipole_fs.in rename to reframe_tests/tests/src/source_tests/magnetic_dipole_fs.in diff --git a/reframe_tests/src/source_tests/transmission_line_fs.in b/reframe_tests/tests/src/source_tests/transmission_line_fs.in similarity index 100% rename from reframe_tests/src/source_tests/transmission_line_fs.in rename to reframe_tests/tests/src/source_tests/transmission_line_fs.in diff --git a/reframe_tests/src/subgrid_tests/cylinder_fs.py b/reframe_tests/tests/src/subgrid_tests/cylinder_fs.py similarity index 100% rename from reframe_tests/src/subgrid_tests/cylinder_fs.py rename to reframe_tests/tests/src/subgrid_tests/cylinder_fs.py diff --git a/reframe_tests/src/subgrid_tests/gssi_400_over_fractal_subsurface.py b/reframe_tests/tests/src/subgrid_tests/gssi_400_over_fractal_subsurface.py similarity index 100% rename from reframe_tests/src/subgrid_tests/gssi_400_over_fractal_subsurface.py rename to reframe_tests/tests/src/subgrid_tests/gssi_400_over_fractal_subsurface.py