#1806: tests: fix pure virtual call from unit tests

DARMA-tasking · May 17, 2022 · 581f199 · 581f199
1 parent 9946d16
commit 581f199
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 108 deletions.
diff --git a/tests/unit/main.cc b/tests/unit/main.cc
@@ -42,6 +42,7 @@
 */
 
 #include <gtest/gtest.h>
+#include <mpi.h>
 
 #include "test_harness.h"
 
@@ -72,5 +73,14 @@ int main(int argc, char** argv) {
 
   TestHarness::store_cmdline_args(test_argc, test_argv);
 
-  return RUN_ALL_TESTS();
+  auto ret = RUN_ALL_TESTS();
+
+  // if this was a parallel test, finalize MPI
+  int init = 0;
+  MPI_Initialized(&init);
+  if (init) {
+    MPI_Finalize();
+  }
+
+  return ret;
 }
diff --git a/tests/unit/mpi_singleton.h b/tests/unit/mpi_singleton.h
diff --git a/tests/unit/runtime/test_initialization.cc b/tests/unit/runtime/test_initialization.cc
@@ -54,7 +54,7 @@ namespace vt { namespace tests { namespace unit {
 struct TestInitialization : TestParallelHarness { };
 
 TEST_F(TestInitialization, test_initialize_with_args) {
-  MPI_Comm comm = MPISingletonMultiTest::Get()->getComm();
+  MPI_Comm comm = MPI_COMM_WORLD;
 
   static char prog_name[]{"vt_program"};
   static char cli_argument[]{"--cli_argument=100"};
@@ -83,7 +83,7 @@ TEST_F(TestInitialization, test_initialize_with_args) {
 }
 
 TEST_F(TestInitialization, test_initialize_with_appconfig) {
-  MPI_Comm comm = MPISingletonMultiTest::Get()->getComm();
+  MPI_Comm comm = MPI_COMM_WORLD;
 
   static char prog_name[]{"vt_program"};
   static char cli_argument[]{"--cli_argument=100"};
@@ -120,7 +120,7 @@ TEST_F(TestInitialization, test_initialize_with_appconfig) {
 }
 
 TEST_F(TestInitialization, test_initialize_with_args_and_appconfig) {
-  MPI_Comm comm = MPISingletonMultiTest::Get()->getComm();
+  MPI_Comm comm = MPI_COMM_WORLD;
 
   static char prog_name[]{"vt_program"};
   static char cli_argument[]{"--cli_argument=100"};
@@ -164,7 +164,7 @@ TEST_F(TestInitialization, test_initialize_with_args_and_appconfig) {
 }
 
 TEST_F(TestInitialization, test_initialize_with_file_and_args) {
-  MPI_Comm comm = MPISingletonMultiTest::Get()->getComm();
+  MPI_Comm comm = MPI_COMM_WORLD;
 
   static char prog_name[]{"vt_program"};
   static char cli_argument[]{"--cli_argument=100"};
@@ -207,7 +207,7 @@ TEST_F(TestInitialization, test_initialize_with_file_and_args) {
 }
 
 TEST_F(TestInitialization, test_initialize_with_file_args_and_appconfig) {
-  MPI_Comm comm = MPISingletonMultiTest::Get()->getComm();
+  MPI_Comm comm = MPI_COMM_WORLD;
 
   static char prog_name[]{"vt_program"};
   static char cli_argument[]{"--cli_argument=100"};

diff --git a/tests/unit/test_helpers.h b/tests/unit/test_helpers.h
@@ -44,12 +44,15 @@
 #if !defined INCLUDED_UNIT_TEST_HELPERS_H
 #define INCLUDED_UNIT_TEST_HELPERS_H
 
-#include "mpi_singleton.h"
 #include "vt/context/context.h"
+#include <mpi.h>
 #include <gtest/gtest.h>
 
 namespace vt { namespace tests { namespace unit {
 
+extern int test_argc;
+extern char** test_argv;
+
 /**
  * Maximum number of ranks/nodes detected by CMake on this machine.
  * Defaults to number of processors detected on the host system.
@@ -61,7 +64,15 @@ constexpr NodeType CMAKE_DETECTED_MAX_NUM_NODES = vt_detected_max_num_nodes;
  * This is using MPI because it can be used before vt initializes.
  */
 inline bool isOversubscribed() {
-  return MPISingletonMultiTest::Get()->getNumRanks() > CMAKE_DETECTED_MAX_NUM_NODES;
+  // be sure to only call this from parallel tests
+  int init = 0;
+  MPI_Initialized(&init);
+  if (!init) {
+    MPI_Init(&test_argc, &test_argv);
+  }
+  int num_ranks = 0;
+  MPI_Comm_size(MPI_COMM_WORLD, &num_ranks);
+  return num_ranks > CMAKE_DETECTED_MAX_NUM_NODES;
 }
 
 /**

diff --git a/tests/unit/test_parallel_harness.h b/tests/unit/test_parallel_harness.h
@@ -45,10 +45,10 @@
 #define INCLUDED_UNIT_TEST_PARALLEL_HARNESS_H
 
 #include <vector>
+#include <mpi.h>
 
 #include "test_config.h"
 #include "test_harness.h"
-#include "mpi_singleton.h"
 
 #include "vt/collective/collective_ops.h"
 #include "vt/scheduler/scheduler.h"
@@ -73,15 +73,21 @@ struct TestParallelHarnessAny : TestHarnessAny<TestBase> {
     static char throw_on_abort[]{"--vt_throw_on_abort=1"};
     addArgs(throw_on_abort);
 
-    // communicator is duplicated.
-    MPI_Comm comm = MPISingletonMultiTest::Get()->getComm();
+    // initialize MPI if it hasn't already happened
+    int init = 0;
+    MPI_Initialized(&init);
+    if (!init) {
+      MPI_Init(&test_argc, &test_argv);
+    }
+    MPI_Comm comm = MPI_COMM_WORLD;
     auto const new_args = injectAdditionalArgs(test_argc, test_argv);
     auto custom_argc = new_args.first;
     auto custom_argv = new_args.second;
     vtAssert(
       custom_argv[custom_argc] == nullptr,
       "The value of argv[argc] should always be 0"
     );
+    // communicator is duplicated.
     CollectiveOps::initialize(custom_argc, custom_argv, no_workers, true, &comm);
 
 #if DEBUG_TEST_HARNESS_PRINT