From ae570c05d836f683d80215e7068e786d7c914340 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 20 Apr 2021 14:53:44 -0400 Subject: [PATCH] we don't need to hardcode pair styles to skip specific tests, but use YAML file for it --- unittest/force-styles/test_pair_style.cpp | 15 --------------- .../force-styles/tests/atomic-pair-colloid.yaml | 1 + .../tests/atomic-pair-colloid_multi.yaml | 1 + .../tests/atomic-pair-colloid_multi_tri.yaml | 1 + .../tests/atomic-pair-colloid_tiled.yaml | 1 + .../tests/atomic-pair-colloid_tiled_tri.yaml | 1 + unittest/force-styles/tests/atomic-pair-eam.yaml | 1 + .../force-styles/tests/atomic-pair-eam_alloy.yaml | 1 + .../tests/atomic-pair-eam_alloy_real.yaml | 1 + .../force-styles/tests/atomic-pair-eam_cd.yaml | 1 + .../tests/atomic-pair-eam_cd_old.yaml | 1 + .../tests/atomic-pair-eam_cd_real.yaml | 1 + .../force-styles/tests/atomic-pair-eam_fs.yaml | 1 + .../tests/atomic-pair-eam_fs_real.yaml | 1 + .../force-styles/tests/atomic-pair-eam_he.yaml | 1 + .../tests/atomic-pair-eam_he_real.yaml | 1 + .../force-styles/tests/atomic-pair-eam_real.yaml | 1 + .../tests/atomic-pair-hybrid-eam.yaml | 1 + .../tests/atomic-pair-hybrid-eam_fs.yaml | 1 + .../tests/atomic-pair-yukawa_colloid.yaml | 1 + unittest/force-styles/tests/mol-pair-dpd.yaml | 2 +- .../force-styles/tests/mol-pair-dpd_tstat.yaml | 2 +- 22 files changed, 21 insertions(+), 17 deletions(-) diff --git a/unittest/force-styles/test_pair_style.cpp b/unittest/force-styles/test_pair_style.cpp index 057f2b5352..999ac54e7b 100644 --- a/unittest/force-styles/test_pair_style.cpp +++ b/unittest/force-styles/test_pair_style.cpp @@ -1188,21 +1188,6 @@ TEST(PairStyle, single) GTEST_SKIP(); } - // The single function in EAM is different from what we assume - // here, therefore we have to skip testing those pair styles. - // Pair styles colloid and yukawa/colloid are also not compatible with this single tester - if ((test_config.pair_style.substr(0, 7) == "colloid") || - (test_config.pair_style.substr(0, 14) == "yukawa/colloid") || - (test_config.pair_style.substr(0, 3) == "dpd") || - (test_config.pair_style.substr(0, 3) == "eam") || - ((test_config.pair_style.substr(0, 6) == "hybrid") && - (test_config.pair_style.find("eam") != std::string::npos))) { - if (!verbose) ::testing::internal::CaptureStdout(); - cleanup_lammps(lmp, test_config); - if (!verbose) ::testing::internal::GetCapturedStdout(); - GTEST_SKIP(); - } - // now start over if (!verbose) ::testing::internal::CaptureStdout(); diff --git a/unittest/force-styles/tests/atomic-pair-colloid.yaml b/unittest/force-styles/tests/atomic-pair-colloid.yaml index 537ac447b5..b666021c91 100644 --- a/unittest/force-styles/tests/atomic-pair-colloid.yaml +++ b/unittest/force-styles/tests/atomic-pair-colloid.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:08:59 2021 epsilon: 5e-14 +skip_tests: single prerequisites: ! | pair colloid pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-colloid_multi.yaml b/unittest/force-styles/tests/atomic-pair-colloid_multi.yaml index 025a7faa05..d224977a3e 100644 --- a/unittest/force-styles/tests/atomic-pair-colloid_multi.yaml +++ b/unittest/force-styles/tests/atomic-pair-colloid_multi.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:08:59 2021 epsilon: 5e-14 +skip_tests: single prerequisites: ! | pair colloid pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-colloid_multi_tri.yaml b/unittest/force-styles/tests/atomic-pair-colloid_multi_tri.yaml index 9ead662a06..fa52a37ce7 100644 --- a/unittest/force-styles/tests/atomic-pair-colloid_multi_tri.yaml +++ b/unittest/force-styles/tests/atomic-pair-colloid_multi_tri.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:08:59 2021 epsilon: 5e-13 +skip_tests: single prerequisites: ! | pair colloid pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-colloid_tiled.yaml b/unittest/force-styles/tests/atomic-pair-colloid_tiled.yaml index be3ba744d0..62e85584e7 100644 --- a/unittest/force-styles/tests/atomic-pair-colloid_tiled.yaml +++ b/unittest/force-styles/tests/atomic-pair-colloid_tiled.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:08:59 2021 epsilon: 5e-14 +skip_tests: single prerequisites: ! | pair colloid pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-colloid_tiled_tri.yaml b/unittest/force-styles/tests/atomic-pair-colloid_tiled_tri.yaml index cd6c7595e8..b3f0b7a06d 100644 --- a/unittest/force-styles/tests/atomic-pair-colloid_tiled_tri.yaml +++ b/unittest/force-styles/tests/atomic-pair-colloid_tiled_tri.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:08:59 2021 epsilon: 5e-13 +skip_tests: single prerequisites: ! | pair colloid pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-eam.yaml b/unittest/force-styles/tests/atomic-pair-eam.yaml index c606813d56..9c8c3ba8cd 100644 --- a/unittest/force-styles/tests/atomic-pair-eam.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:00 2021 epsilon: 6e-12 +skip_tests: single prerequisites: ! | pair eam pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-eam_alloy.yaml b/unittest/force-styles/tests/atomic-pair-eam_alloy.yaml index 072a0a97c0..5ec5bef372 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_alloy.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_alloy.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:00 2021 epsilon: 5e-12 +skip_tests: single prerequisites: ! | pair eam/alloy pre_commands: ! "" diff --git a/unittest/force-styles/tests/atomic-pair-eam_alloy_real.yaml b/unittest/force-styles/tests/atomic-pair-eam_alloy_real.yaml index 033c341f08..bff08e048b 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_alloy_real.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_alloy_real.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:00 2021 epsilon: 7.5e-12 +skip_tests: single prerequisites: ! | pair eam/alloy pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-eam_cd.yaml b/unittest/force-styles/tests/atomic-pair-eam_cd.yaml index bda14a9e5a..915253dce7 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_cd.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_cd.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:00 2021 epsilon: 5e-12 +skip_tests: single prerequisites: ! | pair eam/cd pre_commands: ! "" diff --git a/unittest/force-styles/tests/atomic-pair-eam_cd_old.yaml b/unittest/force-styles/tests/atomic-pair-eam_cd_old.yaml index 4f6891bae6..a7fa727b7f 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_cd_old.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_cd_old.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:00 2021 epsilon: 5e-12 +skip_tests: single prerequisites: ! | pair eam/cd/old pre_commands: ! "" diff --git a/unittest/force-styles/tests/atomic-pair-eam_cd_real.yaml b/unittest/force-styles/tests/atomic-pair-eam_cd_real.yaml index e2ac5f0cae..abe25cff95 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_cd_real.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_cd_real.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:00 2021 epsilon: 5e-12 +skip_tests: single prerequisites: ! | pair eam/cd pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-eam_fs.yaml b/unittest/force-styles/tests/atomic-pair-eam_fs.yaml index 89ad740424..58c533d7ec 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_fs.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_fs.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:01 2021 epsilon: 5e-12 +skip_tests: single prerequisites: ! | pair eam/fs pre_commands: ! "" diff --git a/unittest/force-styles/tests/atomic-pair-eam_fs_real.yaml b/unittest/force-styles/tests/atomic-pair-eam_fs_real.yaml index bf7f4f338b..f7739ee824 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_fs_real.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_fs_real.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:01 2021 epsilon: 7.5e-12 +skip_tests: single prerequisites: ! | pair eam/fs pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-eam_he.yaml b/unittest/force-styles/tests/atomic-pair-eam_he.yaml index 001301fe1a..f2bf098b2f 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_he.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_he.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:01 2021 epsilon: 5e-12 +skip_tests: single prerequisites: ! | pair eam/he pre_commands: ! "" diff --git a/unittest/force-styles/tests/atomic-pair-eam_he_real.yaml b/unittest/force-styles/tests/atomic-pair-eam_he_real.yaml index 236b9538a7..b2b198486e 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_he_real.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_he_real.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:02 2021 epsilon: 7.5e-12 +skip_tests: single prerequisites: ! | pair eam/he pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-eam_real.yaml b/unittest/force-styles/tests/atomic-pair-eam_real.yaml index 89e7c1ce0b..4d95f04edc 100644 --- a/unittest/force-styles/tests/atomic-pair-eam_real.yaml +++ b/unittest/force-styles/tests/atomic-pair-eam_real.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:02 2021 epsilon: 5e-12 +skip_tests: single prerequisites: ! | pair eam pre_commands: ! | diff --git a/unittest/force-styles/tests/atomic-pair-hybrid-eam.yaml b/unittest/force-styles/tests/atomic-pair-hybrid-eam.yaml index a681657b65..11f226d493 100644 --- a/unittest/force-styles/tests/atomic-pair-hybrid-eam.yaml +++ b/unittest/force-styles/tests/atomic-pair-hybrid-eam.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:02 2021 epsilon: 1e-11 +skip_tests: single prerequisites: ! | pair eam/fs pre_commands: ! "" diff --git a/unittest/force-styles/tests/atomic-pair-hybrid-eam_fs.yaml b/unittest/force-styles/tests/atomic-pair-hybrid-eam_fs.yaml index d2f511b3ea..ee63f01e63 100644 --- a/unittest/force-styles/tests/atomic-pair-hybrid-eam_fs.yaml +++ b/unittest/force-styles/tests/atomic-pair-hybrid-eam_fs.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:03 2021 epsilon: 5e-12 +skip_tests: single prerequisites: ! | pair eam/fs pre_commands: ! "" diff --git a/unittest/force-styles/tests/atomic-pair-yukawa_colloid.yaml b/unittest/force-styles/tests/atomic-pair-yukawa_colloid.yaml index 1529cf51b9..008c4be01c 100644 --- a/unittest/force-styles/tests/atomic-pair-yukawa_colloid.yaml +++ b/unittest/force-styles/tests/atomic-pair-yukawa_colloid.yaml @@ -2,6 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:09:10 2021 epsilon: 5e-14 +skip_tests: single prerequisites: ! | atom sphere pair yukawa/colloid diff --git a/unittest/force-styles/tests/mol-pair-dpd.yaml b/unittest/force-styles/tests/mol-pair-dpd.yaml index 4964a74e2a..c3900a3bc6 100644 --- a/unittest/force-styles/tests/mol-pair-dpd.yaml +++ b/unittest/force-styles/tests/mol-pair-dpd.yaml @@ -2,7 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:08:44 2021 epsilon: 5e-14 -skip_tests: gpu intel +skip_tests: gpu intel single prerequisites: ! | atom full pair dpd diff --git a/unittest/force-styles/tests/mol-pair-dpd_tstat.yaml b/unittest/force-styles/tests/mol-pair-dpd_tstat.yaml index 0348c0d601..09d52366ba 100644 --- a/unittest/force-styles/tests/mol-pair-dpd_tstat.yaml +++ b/unittest/force-styles/tests/mol-pair-dpd_tstat.yaml @@ -2,7 +2,7 @@ lammps_version: 10 Feb 2021 date_generated: Fri Feb 26 23:08:44 2021 epsilon: 5e-14 -skip_tests: gpu intel +skip_tests: gpu intel single prerequisites: ! | atom full pair dpd/tstat