From dfeee1f19be3c6ac3d86401acead974d1beafb9c Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 27 Feb 2021 15:42:32 -0500 Subject: [PATCH] run neighbor list on CPU for hybrid pair styles --- unittest/force-styles/test_pair_style.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/unittest/force-styles/test_pair_style.cpp b/unittest/force-styles/test_pair_style.cpp index f25923a01b..61815ec5f4 100644 --- a/unittest/force-styles/test_pair_style.cpp +++ b/unittest/force-styles/test_pair_style.cpp @@ -814,10 +814,17 @@ TEST(PairStyle, omp) TEST(PairStyle, gpu) { if (!LAMMPS::is_installed_pkg("GPU")) GTEST_SKIP(); - const char *args[] = {"PairStyle", "-log", "none", "-echo", "screen", "-nocite", "-sf", "gpu"}; + const char *args_neigh[] = {"PairStyle", "-log", "none", "-echo", "screen", "-nocite", "-sf", "gpu"}; + const char *args_noneigh[] = {"PairStyle", "-log", "none", "-echo", "screen", "-nocite", "-sf", "gpu", "-pk", "gpu", "0", "neigh", "no"}; - char **argv = (char **)args; - int argc = sizeof(args) / sizeof(char *); + char **argv = (char **)args_neigh; + int argc = sizeof(args_neigh) / sizeof(char *); + + // cannot use GPU neighbor list with hybrid pair style (yet) + if (test_config.pair_style.substr(0, 6) == "hybrid") { + argv = (char **)args_noneigh; + argc = sizeof(args_noneigh) / sizeof(char *); + } ::testing::internal::CaptureStdout(); LAMMPS *lmp = init_lammps(argc, argv, test_config, false);