From 474b7f52f704c66da0b0c336dc731ebf2066c167 Mon Sep 17 00:00:00 2001 From: nmannall Date: Fri, 9 Feb 2024 11:59:34 +0000 Subject: [PATCH] Split up reframe tests and pytest unit tests --- {tests => reframe_tests}/.gitignore | 0 {tests => reframe_tests}/base_tests.py | 3 +-- .../SingleNodeBenchmark_2024-01-24_11-31-37.csv | 0 .../configuration/archer2_settings.py | 0 .../job_scripts/archer2_benchmarks.slurm | 0 .../job_scripts/archer2_map_single_node.slurm | 0 .../job_scripts/archer2_tests.slurm | 0 .../archer2/gprMax_0.5d_128t_2024-01-18_17-34.map | Bin .../archer2/gprMax_0.5d_16t_2024-01-18_17-34.map | Bin .../archer2/gprMax_0.5d_32t_2024-01-18_17-34.map | Bin .../archer2/gprMax_0.5d_4t_2024-01-22_14-02.map | Bin .../archer2/gprMax_0.5d_64t_2024-01-18_17-34.map | Bin .../archer2/gprMax_0.5d_64t_2024-01-19_11-52.map | Bin .../archer2/gprMax_0.5d_8t_2024-01-18_17-34.map | Bin {tests => reframe_tests}/reframe_benchmarks.py | 2 +- {tests => reframe_tests}/reframe_tests.py | 2 +- .../regression_checks/BasicModelsTest_0.h5 | Bin .../regression_checks/BasicModelsTest_1.h5 | Bin .../regression_checks/BasicModelsTest_2.h5 | Bin .../regression_checks/BasicModelsTest_3.h5 | Bin .../regression_checks/BasicModelsTest_4.h5 | Bin .../regression_checks/BasicModelsTest_5.h5 | Bin .../regression_checks/BasicModelsTest_6.h5 | Bin .../regression_checks/BasicModelsTest_7.h5 | Bin .../regression_checks/TaskfarmTest_0.h5 | Bin .../regression_checks/TaskfarmTest_1.h5 | Bin {tests => reframe_tests}/src/2D_ExHyHz.in | 0 {tests => reframe_tests}/src/2D_EyHxHz.in | 0 {tests => reframe_tests}/src/2D_EzHxHy.in | 0 {tests => reframe_tests}/src/benchmark_model_0.1.in | 0 .../src/benchmark_model_0.15.in | 0 {tests => reframe_tests}/src/benchmark_model_0.2.in | 0 {tests => reframe_tests}/src/benchmark_model_0.3.in | 0 {tests => reframe_tests}/src/benchmark_model_0.4.in | 0 {tests => reframe_tests}/src/benchmark_model_0.5.in | 0 {tests => reframe_tests}/src/benchmark_model_0.6.in | 0 {tests => reframe_tests}/src/benchmark_model_0.7.in | 0 {tests => reframe_tests}/src/benchmark_model_0.8.in | 0 {tests => reframe_tests}/src/cylinder_Ascan_2D.in | 0 {tests => reframe_tests}/src/cylinder_Bscan_2D.in | 0 .../src/hertzian_dipole_dispersive.in | 0 {tests => reframe_tests}/src/hertzian_dipole_fs.in | 0 {tests => reframe_tests}/src/hertzian_dipole_hs.in | 0 {tests => reframe_tests}/src/magnetic_dipole_fs.in | 0 {tests => reframe_tests}/utilities/data.py | 0 {tests => reframe_tests}/utilities/deferrable.py | 0 {tests => reframe_tests}/utilities/plotting.py | 0 .../utilities/process_perflog.py | 3 +-- 48 files changed, 4 insertions(+), 6 deletions(-) rename {tests => reframe_tests}/.gitignore (100%) rename {tests => reframe_tests}/base_tests.py (99%) rename {tests => reframe_tests}/benchmarks/SingleNodeBenchmark_2024-01-24_11-31-37.csv (100%) rename {tests => reframe_tests}/configuration/archer2_settings.py (100%) rename {tests => reframe_tests}/job_scripts/archer2_benchmarks.slurm (100%) rename {tests => reframe_tests}/job_scripts/archer2_map_single_node.slurm (100%) rename {tests => reframe_tests}/job_scripts/archer2_tests.slurm (100%) rename {tests => reframe_tests}/profile/archer2/gprMax_0.5d_128t_2024-01-18_17-34.map (100%) rename {tests => reframe_tests}/profile/archer2/gprMax_0.5d_16t_2024-01-18_17-34.map (100%) rename {tests => reframe_tests}/profile/archer2/gprMax_0.5d_32t_2024-01-18_17-34.map (100%) rename {tests => reframe_tests}/profile/archer2/gprMax_0.5d_4t_2024-01-22_14-02.map (100%) rename {tests => reframe_tests}/profile/archer2/gprMax_0.5d_64t_2024-01-18_17-34.map (100%) rename {tests => reframe_tests}/profile/archer2/gprMax_0.5d_64t_2024-01-19_11-52.map (100%) rename {tests => reframe_tests}/profile/archer2/gprMax_0.5d_8t_2024-01-18_17-34.map (100%) rename {tests => reframe_tests}/reframe_benchmarks.py (96%) rename {tests => reframe_tests}/reframe_tests.py (98%) rename {tests => reframe_tests}/regression_checks/BasicModelsTest_0.h5 (100%) rename {tests => reframe_tests}/regression_checks/BasicModelsTest_1.h5 (100%) rename {tests => reframe_tests}/regression_checks/BasicModelsTest_2.h5 (100%) rename {tests => reframe_tests}/regression_checks/BasicModelsTest_3.h5 (100%) rename {tests => reframe_tests}/regression_checks/BasicModelsTest_4.h5 (100%) rename {tests => reframe_tests}/regression_checks/BasicModelsTest_5.h5 (100%) rename {tests => reframe_tests}/regression_checks/BasicModelsTest_6.h5 (100%) rename {tests => reframe_tests}/regression_checks/BasicModelsTest_7.h5 (100%) rename {tests => reframe_tests}/regression_checks/TaskfarmTest_0.h5 (100%) rename {tests => reframe_tests}/regression_checks/TaskfarmTest_1.h5 (100%) rename {tests => reframe_tests}/src/2D_ExHyHz.in (100%) rename {tests => reframe_tests}/src/2D_EyHxHz.in (100%) rename {tests => reframe_tests}/src/2D_EzHxHy.in (100%) rename {tests => reframe_tests}/src/benchmark_model_0.1.in (100%) rename {tests => reframe_tests}/src/benchmark_model_0.15.in (100%) rename {tests => reframe_tests}/src/benchmark_model_0.2.in (100%) rename {tests => reframe_tests}/src/benchmark_model_0.3.in (100%) rename {tests => reframe_tests}/src/benchmark_model_0.4.in (100%) rename {tests => reframe_tests}/src/benchmark_model_0.5.in (100%) rename {tests => reframe_tests}/src/benchmark_model_0.6.in (100%) rename {tests => reframe_tests}/src/benchmark_model_0.7.in (100%) rename {tests => reframe_tests}/src/benchmark_model_0.8.in (100%) rename {tests => reframe_tests}/src/cylinder_Ascan_2D.in (100%) rename {tests => reframe_tests}/src/cylinder_Bscan_2D.in (100%) rename {tests => reframe_tests}/src/hertzian_dipole_dispersive.in (100%) rename {tests => reframe_tests}/src/hertzian_dipole_fs.in (100%) rename {tests => reframe_tests}/src/hertzian_dipole_hs.in (100%) rename {tests => reframe_tests}/src/magnetic_dipole_fs.in (100%) rename {tests => reframe_tests}/utilities/data.py (100%) rename {tests => reframe_tests}/utilities/deferrable.py (100%) rename {tests => reframe_tests}/utilities/plotting.py (100%) rename {tests => reframe_tests}/utilities/process_perflog.py (93%) diff --git a/tests/.gitignore b/reframe_tests/.gitignore similarity index 100% rename from tests/.gitignore rename to reframe_tests/.gitignore diff --git a/tests/base_tests.py b/reframe_tests/base_tests.py similarity index 99% rename from tests/base_tests.py rename to reframe_tests/base_tests.py index 198a2b18..bcbb73de 100644 --- a/tests/base_tests.py +++ b/reframe_tests/base_tests.py @@ -7,8 +7,7 @@ import reframe as rfm import reframe.utility.sanity as sn from reframe.core.builtins import performance_function, require_deps, run_after, run_before, sanity_function, variable from reframe.utility import udeps - -from tests.utilities.deferrable import path_join +from 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/tests/benchmarks/SingleNodeBenchmark_2024-01-24_11-31-37.csv b/reframe_tests/benchmarks/SingleNodeBenchmark_2024-01-24_11-31-37.csv similarity index 100% rename from tests/benchmarks/SingleNodeBenchmark_2024-01-24_11-31-37.csv rename to reframe_tests/benchmarks/SingleNodeBenchmark_2024-01-24_11-31-37.csv diff --git a/tests/configuration/archer2_settings.py b/reframe_tests/configuration/archer2_settings.py similarity index 100% rename from tests/configuration/archer2_settings.py rename to reframe_tests/configuration/archer2_settings.py diff --git a/tests/job_scripts/archer2_benchmarks.slurm b/reframe_tests/job_scripts/archer2_benchmarks.slurm similarity index 100% rename from tests/job_scripts/archer2_benchmarks.slurm rename to reframe_tests/job_scripts/archer2_benchmarks.slurm diff --git a/tests/job_scripts/archer2_map_single_node.slurm b/reframe_tests/job_scripts/archer2_map_single_node.slurm similarity index 100% rename from tests/job_scripts/archer2_map_single_node.slurm rename to reframe_tests/job_scripts/archer2_map_single_node.slurm diff --git a/tests/job_scripts/archer2_tests.slurm b/reframe_tests/job_scripts/archer2_tests.slurm similarity index 100% rename from tests/job_scripts/archer2_tests.slurm rename to reframe_tests/job_scripts/archer2_tests.slurm diff --git a/tests/profile/archer2/gprMax_0.5d_128t_2024-01-18_17-34.map b/reframe_tests/profile/archer2/gprMax_0.5d_128t_2024-01-18_17-34.map similarity index 100% rename from tests/profile/archer2/gprMax_0.5d_128t_2024-01-18_17-34.map rename to reframe_tests/profile/archer2/gprMax_0.5d_128t_2024-01-18_17-34.map diff --git a/tests/profile/archer2/gprMax_0.5d_16t_2024-01-18_17-34.map b/reframe_tests/profile/archer2/gprMax_0.5d_16t_2024-01-18_17-34.map similarity index 100% rename from tests/profile/archer2/gprMax_0.5d_16t_2024-01-18_17-34.map rename to reframe_tests/profile/archer2/gprMax_0.5d_16t_2024-01-18_17-34.map diff --git a/tests/profile/archer2/gprMax_0.5d_32t_2024-01-18_17-34.map b/reframe_tests/profile/archer2/gprMax_0.5d_32t_2024-01-18_17-34.map similarity index 100% rename from tests/profile/archer2/gprMax_0.5d_32t_2024-01-18_17-34.map rename to reframe_tests/profile/archer2/gprMax_0.5d_32t_2024-01-18_17-34.map diff --git a/tests/profile/archer2/gprMax_0.5d_4t_2024-01-22_14-02.map b/reframe_tests/profile/archer2/gprMax_0.5d_4t_2024-01-22_14-02.map similarity index 100% rename from tests/profile/archer2/gprMax_0.5d_4t_2024-01-22_14-02.map rename to reframe_tests/profile/archer2/gprMax_0.5d_4t_2024-01-22_14-02.map diff --git a/tests/profile/archer2/gprMax_0.5d_64t_2024-01-18_17-34.map b/reframe_tests/profile/archer2/gprMax_0.5d_64t_2024-01-18_17-34.map similarity index 100% rename from tests/profile/archer2/gprMax_0.5d_64t_2024-01-18_17-34.map rename to reframe_tests/profile/archer2/gprMax_0.5d_64t_2024-01-18_17-34.map diff --git a/tests/profile/archer2/gprMax_0.5d_64t_2024-01-19_11-52.map b/reframe_tests/profile/archer2/gprMax_0.5d_64t_2024-01-19_11-52.map similarity index 100% rename from tests/profile/archer2/gprMax_0.5d_64t_2024-01-19_11-52.map rename to reframe_tests/profile/archer2/gprMax_0.5d_64t_2024-01-19_11-52.map diff --git a/tests/profile/archer2/gprMax_0.5d_8t_2024-01-18_17-34.map b/reframe_tests/profile/archer2/gprMax_0.5d_8t_2024-01-18_17-34.map similarity index 100% rename from tests/profile/archer2/gprMax_0.5d_8t_2024-01-18_17-34.map rename to reframe_tests/profile/archer2/gprMax_0.5d_8t_2024-01-18_17-34.map diff --git a/tests/reframe_benchmarks.py b/reframe_tests/reframe_benchmarks.py similarity index 96% rename from tests/reframe_benchmarks.py rename to reframe_tests/reframe_benchmarks.py index 49bbde70..0690d2a8 100644 --- a/tests/reframe_benchmarks.py +++ b/reframe_tests/reframe_benchmarks.py @@ -5,7 +5,7 @@ from reframe.core.builtins import parameter, run_after """ReFrame tests for performance benchmarking Usage: - cd gprMax/tests + cd gprMax/reframe_tests reframe -C configuraiton/{CONFIG_FILE} -c reframe_benchmarks.py -c base_tests.py -r """ diff --git a/tests/reframe_tests.py b/reframe_tests/reframe_tests.py similarity index 98% rename from tests/reframe_tests.py rename to reframe_tests/reframe_tests.py index 4e2e3fe2..4d0ff0fc 100644 --- a/tests/reframe_tests.py +++ b/reframe_tests/reframe_tests.py @@ -5,7 +5,7 @@ from reframe.core.builtins import parameter, run_after """ReFrame tests for basic functionality Usage: - cd gprMax/tests + cd gprMax/reframe_tests reframe -C configuraiton/{CONFIG_FILE} -c reframe_tests.py -c base_tests.py -r """ diff --git a/tests/regression_checks/BasicModelsTest_0.h5 b/reframe_tests/regression_checks/BasicModelsTest_0.h5 similarity index 100% rename from tests/regression_checks/BasicModelsTest_0.h5 rename to reframe_tests/regression_checks/BasicModelsTest_0.h5 diff --git a/tests/regression_checks/BasicModelsTest_1.h5 b/reframe_tests/regression_checks/BasicModelsTest_1.h5 similarity index 100% rename from tests/regression_checks/BasicModelsTest_1.h5 rename to reframe_tests/regression_checks/BasicModelsTest_1.h5 diff --git a/tests/regression_checks/BasicModelsTest_2.h5 b/reframe_tests/regression_checks/BasicModelsTest_2.h5 similarity index 100% rename from tests/regression_checks/BasicModelsTest_2.h5 rename to reframe_tests/regression_checks/BasicModelsTest_2.h5 diff --git a/tests/regression_checks/BasicModelsTest_3.h5 b/reframe_tests/regression_checks/BasicModelsTest_3.h5 similarity index 100% rename from tests/regression_checks/BasicModelsTest_3.h5 rename to reframe_tests/regression_checks/BasicModelsTest_3.h5 diff --git a/tests/regression_checks/BasicModelsTest_4.h5 b/reframe_tests/regression_checks/BasicModelsTest_4.h5 similarity index 100% rename from tests/regression_checks/BasicModelsTest_4.h5 rename to reframe_tests/regression_checks/BasicModelsTest_4.h5 diff --git a/tests/regression_checks/BasicModelsTest_5.h5 b/reframe_tests/regression_checks/BasicModelsTest_5.h5 similarity index 100% rename from tests/regression_checks/BasicModelsTest_5.h5 rename to reframe_tests/regression_checks/BasicModelsTest_5.h5 diff --git a/tests/regression_checks/BasicModelsTest_6.h5 b/reframe_tests/regression_checks/BasicModelsTest_6.h5 similarity index 100% rename from tests/regression_checks/BasicModelsTest_6.h5 rename to reframe_tests/regression_checks/BasicModelsTest_6.h5 diff --git a/tests/regression_checks/BasicModelsTest_7.h5 b/reframe_tests/regression_checks/BasicModelsTest_7.h5 similarity index 100% rename from tests/regression_checks/BasicModelsTest_7.h5 rename to reframe_tests/regression_checks/BasicModelsTest_7.h5 diff --git a/tests/regression_checks/TaskfarmTest_0.h5 b/reframe_tests/regression_checks/TaskfarmTest_0.h5 similarity index 100% rename from tests/regression_checks/TaskfarmTest_0.h5 rename to reframe_tests/regression_checks/TaskfarmTest_0.h5 diff --git a/tests/regression_checks/TaskfarmTest_1.h5 b/reframe_tests/regression_checks/TaskfarmTest_1.h5 similarity index 100% rename from tests/regression_checks/TaskfarmTest_1.h5 rename to reframe_tests/regression_checks/TaskfarmTest_1.h5 diff --git a/tests/src/2D_ExHyHz.in b/reframe_tests/src/2D_ExHyHz.in similarity index 100% rename from tests/src/2D_ExHyHz.in rename to reframe_tests/src/2D_ExHyHz.in diff --git a/tests/src/2D_EyHxHz.in b/reframe_tests/src/2D_EyHxHz.in similarity index 100% rename from tests/src/2D_EyHxHz.in rename to reframe_tests/src/2D_EyHxHz.in diff --git a/tests/src/2D_EzHxHy.in b/reframe_tests/src/2D_EzHxHy.in similarity index 100% rename from tests/src/2D_EzHxHy.in rename to reframe_tests/src/2D_EzHxHy.in diff --git a/tests/src/benchmark_model_0.1.in b/reframe_tests/src/benchmark_model_0.1.in similarity index 100% rename from tests/src/benchmark_model_0.1.in rename to reframe_tests/src/benchmark_model_0.1.in diff --git a/tests/src/benchmark_model_0.15.in b/reframe_tests/src/benchmark_model_0.15.in similarity index 100% rename from tests/src/benchmark_model_0.15.in rename to reframe_tests/src/benchmark_model_0.15.in diff --git a/tests/src/benchmark_model_0.2.in b/reframe_tests/src/benchmark_model_0.2.in similarity index 100% rename from tests/src/benchmark_model_0.2.in rename to reframe_tests/src/benchmark_model_0.2.in diff --git a/tests/src/benchmark_model_0.3.in b/reframe_tests/src/benchmark_model_0.3.in similarity index 100% rename from tests/src/benchmark_model_0.3.in rename to reframe_tests/src/benchmark_model_0.3.in diff --git a/tests/src/benchmark_model_0.4.in b/reframe_tests/src/benchmark_model_0.4.in similarity index 100% rename from tests/src/benchmark_model_0.4.in rename to reframe_tests/src/benchmark_model_0.4.in diff --git a/tests/src/benchmark_model_0.5.in b/reframe_tests/src/benchmark_model_0.5.in similarity index 100% rename from tests/src/benchmark_model_0.5.in rename to reframe_tests/src/benchmark_model_0.5.in diff --git a/tests/src/benchmark_model_0.6.in b/reframe_tests/src/benchmark_model_0.6.in similarity index 100% rename from tests/src/benchmark_model_0.6.in rename to reframe_tests/src/benchmark_model_0.6.in diff --git a/tests/src/benchmark_model_0.7.in b/reframe_tests/src/benchmark_model_0.7.in similarity index 100% rename from tests/src/benchmark_model_0.7.in rename to reframe_tests/src/benchmark_model_0.7.in diff --git a/tests/src/benchmark_model_0.8.in b/reframe_tests/src/benchmark_model_0.8.in similarity index 100% rename from tests/src/benchmark_model_0.8.in rename to reframe_tests/src/benchmark_model_0.8.in diff --git a/tests/src/cylinder_Ascan_2D.in b/reframe_tests/src/cylinder_Ascan_2D.in similarity index 100% rename from tests/src/cylinder_Ascan_2D.in rename to reframe_tests/src/cylinder_Ascan_2D.in diff --git a/tests/src/cylinder_Bscan_2D.in b/reframe_tests/src/cylinder_Bscan_2D.in similarity index 100% rename from tests/src/cylinder_Bscan_2D.in rename to reframe_tests/src/cylinder_Bscan_2D.in diff --git a/tests/src/hertzian_dipole_dispersive.in b/reframe_tests/src/hertzian_dipole_dispersive.in similarity index 100% rename from tests/src/hertzian_dipole_dispersive.in rename to reframe_tests/src/hertzian_dipole_dispersive.in diff --git a/tests/src/hertzian_dipole_fs.in b/reframe_tests/src/hertzian_dipole_fs.in similarity index 100% rename from tests/src/hertzian_dipole_fs.in rename to reframe_tests/src/hertzian_dipole_fs.in diff --git a/tests/src/hertzian_dipole_hs.in b/reframe_tests/src/hertzian_dipole_hs.in similarity index 100% rename from tests/src/hertzian_dipole_hs.in rename to reframe_tests/src/hertzian_dipole_hs.in diff --git a/tests/src/magnetic_dipole_fs.in b/reframe_tests/src/magnetic_dipole_fs.in similarity index 100% rename from tests/src/magnetic_dipole_fs.in rename to reframe_tests/src/magnetic_dipole_fs.in diff --git a/tests/utilities/data.py b/reframe_tests/utilities/data.py similarity index 100% rename from tests/utilities/data.py rename to reframe_tests/utilities/data.py diff --git a/tests/utilities/deferrable.py b/reframe_tests/utilities/deferrable.py similarity index 100% rename from tests/utilities/deferrable.py rename to reframe_tests/utilities/deferrable.py diff --git a/tests/utilities/plotting.py b/reframe_tests/utilities/plotting.py similarity index 100% rename from tests/utilities/plotting.py rename to reframe_tests/utilities/plotting.py diff --git a/tests/utilities/process_perflog.py b/reframe_tests/utilities/process_perflog.py similarity index 93% rename from tests/utilities/process_perflog.py rename to reframe_tests/utilities/process_perflog.py index ccd9cdab..c4b1f77b 100644 --- a/tests/utilities/process_perflog.py +++ b/reframe_tests/utilities/process_perflog.py @@ -3,7 +3,6 @@ import re from datetime import datetime from pathlib import Path -import matplotlib.pyplot as plt import pandas as pd @@ -21,7 +20,7 @@ columns_to_keep = ["num_tasks", "num_cpus_per_task", "num_tasks_per_node", "run_ if __name__ == "__main__": # Parse command line arguments parser = argparse.ArgumentParser( - usage="cd gprMax/tests; python -m utilities.process_perflog inputfile [-o OUTPUT]", + usage="cd gprMax/reframe_tests; python -m utilities.process_perflog inputfile [-o OUTPUT]", description="Extract perfvars from reframe perflog file.", ) parser.add_argument("inputfile", help="name of input file including path")