Merge pull request #2291 from ERGO-Code/valgrind-scheduler

Reset global scheduler

Author: galabovaa

app/RunHighs.cpp

@@ -9,12 +9,8 @@
  * @brief HiGHS main
  */
 #include "Highs.h"
-// #include "io/HighsIO.h"
 #include "HighsRuntimeOptions.h"
 
-// uncomment if we will be shutting down task executor from exe
-// #include "parallel/HighsParallel.h"
-
 int main(int argc, char** argv) {
   // Create the Highs instance.
   Highs highs;
@@ -31,10 +27,6 @@ int main(int argc, char** argv) {
   // When loading the options file, any messages are reported using
   // the default HighsLogOptions
 
-  // Replace command line options parsing library
-  // cxxopts now Cpp17 with
-  // CLI11 for Cpp11
-
   CLI::App app{""};
   argv = app.ensure_utf8(argv);
 
@@ -117,8 +109,9 @@ int main(int argc, char** argv) {
 
   // highs.writeInfo("Info.md");
 
-  // Shut down task executor: optional and wip
-  // HighsTaskExecutor::shutdown(true);
+  // Shut down task executor for explicit release of memory.
+  // Valgrind still reachable otherwise.
+  highs.resetGlobalScheduler(true);
 
   return (int)run_status;
 }

check/CMakeLists.txt

@@ -28,57 +28,57 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
 
   # Make test executable
   set(TEST_SOURCES
-      TestHighsVersion.cpp
       TestAlienBasis.cpp
-      TestDualize.cpp
+      TestBasis.cpp
+      TestBasisSolves.cpp
       TestCallbacks.cpp
       TestCheckSolution.cpp
+      TestCrossover.cpp
+      TestDualize.cpp
       TestEkk.cpp
       TestFactor.cpp
-      TestMain.cpp
-      TestNames.cpp
-      TestOptions.cpp
-      TestIO.cpp
-      TestSort.cpp
-      TestSetup.cpp
       TestFilereader.cpp
-      TestHighsGFkSolve.cpp
-      TestInfo.cpp
-      TestBasis.cpp
-      TestBasisSolves.cpp
-      TestCrossover.cpp
       TestHighsCDouble.cpp
+      TestHighsGFkSolve.cpp
       TestHighsHash.cpp
+      TestHighsHessian.cpp
       TestHighsIntegers.cpp
+      TestHighsModel.cpp
       TestHighsParallel.cpp
       TestHighsRbTree.cpp
-      TestHighsHessian.cpp
-      TestHighsModel.cpp
       TestHighsSparseMatrix.cpp
+      TestHighsVersion.cpp
       TestHSet.cpp
       TestICrash.cpp
       TestIis.cpp
+      TestInfo.cpp
+      TestIO.cpp
       TestIpm.cpp
       TestIpx.cpp
       TestLogging.cpp
       TestLPFileFormat.cpp
-      TestLpValidation.cpp
       TestLpModification.cpp
       TestLpOrientation.cpp
+      TestLpSolvers.cpp
+      TestLpValidation.cpp
+      TestMain.cpp
+      TestMipSolver.cpp
       TestModelProperties.cpp
       TestMultiObjective.cpp
+      TestNames.cpp
+      TestOptions.cpp
       TestPdlp.cpp
       TestPresolve.cpp
       TestQpSolver.cpp
-      TestRays.cpp
       TestRanging.cpp
+      TestRays.cpp
       TestSemiVariables.cpp
+      TestSetup.cpp
+      TestSort.cpp
+      TestSpecialLps.cpp
       TestThrow.cpp
       TestTspSolver.cpp
       TestUserScale.cpp
-      TestSpecialLps.cpp
-      TestLpSolvers.cpp
-      TestMipSolver.cpp
       Avgas.cpp)
 
   set(OPT_LEVEL_CHANGED OFF)

check/TestAlienBasis.cpp

@@ -606,6 +606,8 @@ void testAlienBasis(const bool avgas, const HighsInt seed) {
     REQUIRE(highs.setBasis(basis) == HighsStatus::kOk);
     highs.run();
   }
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("AlienBasis-reuse-basis", "[highs_test_alien_basis]") {
@@ -671,6 +673,8 @@ TEST_CASE("AlienBasis-reuse-basis", "[highs_test_alien_basis]") {
   REQUIRE(highs.setBasis(basis) == HighsStatus::kOk);
   highs.run();
   if (dev_run) highs.writeSolution("", 1);
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("AlienBasis-singular-basis", "[highs_test_alien_basis]") {
@@ -708,4 +712,6 @@ TEST_CASE("AlienBasis-singular-basis", "[highs_test_alien_basis]") {
   basic_variables.resize(lp.num_row_);
   return_status = highs.getBasicVariables(basic_variables.data());
   REQUIRE(return_status == HighsStatus::kError);
+
+  highs.resetGlobalScheduler(true);
 }

check/TestBasis.cpp

@@ -73,6 +73,8 @@ TEST_CASE("Basis-file", "[highs_basis_file]") {
 
   std::remove(basis_file.c_str());
   std::remove(invalid_basis_file.c_str());
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("Basis-data", "[highs_basis_data]") {
@@ -101,6 +103,8 @@ TEST_CASE("Basis-data", "[highs_basis_data]") {
 
   testBasisRestart(highs, basis_file, false);
   testBasisReloadModel(highs, basis_file, false);
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("set-pathological-basis", "[highs_basis_data]") {
@@ -136,6 +140,8 @@ TEST_CASE("set-pathological-basis", "[highs_basis_data]") {
   highs.setBasis(basis);
   highs.run();
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kUnbounded);
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("Basis-no-basic", "[highs_basis_data]") {
@@ -160,6 +166,8 @@ TEST_CASE("Basis-no-basic", "[highs_basis_data]") {
   if (dev_run) highs.writeSolution("", 1);
   REQUIRE(highs.getInfo().objective_function_value == -0.5);
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kOptimal);
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("Basis-singular", "[highs_basis_data]") {

check/TestBasisSolves.cpp

@@ -563,6 +563,8 @@ TEST_CASE("Basis-solves", "[highs_basis_solves]") {
   // Solve
   highs.run();
   REQUIRE(highs.getInfo().simplex_iteration_count == 0);
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("Kappa", "[highs_basis_solves]") {
@@ -610,4 +612,6 @@ TEST_CASE("Kappa", "[highs_basis_solves]") {
     highs.run();
     REQUIRE(highs.getKappa(kappa) == HighsStatus::kError);
   }
+
+  highs.resetGlobalScheduler(true);
 }

check/TestCallbacks.cpp

@@ -231,7 +231,7 @@ std::function<void(int, const std::string&, const HighsCallbackDataOut*,
             data_out->objective_function_value, message.c_str());
     };
 
-TEST_CASE("my-callback-logging", "[highs-callback]") {
+TEST_CASE("my-callback-logging", "[highs_callback]") {
   bool output_flag = true;  // Still runs quietly
   bool log_to_console = false;
   HighsInt log_dev_level = kHighsLogDevLevelInfo;
@@ -281,7 +281,7 @@ TEST_CASE("my-callback-logging", "[highs-callback]") {
   }
 }
 
-TEST_CASE("highs-callback-logging", "[highs-callback]") {
+TEST_CASE("highs-callback-logging", "[highs_callback]") {
   // Uses userInterruptCallback to start logging lines with
   // "userInterruptCallback(kUserCallbackData): " since
   // Highs::setCallback has second argument p_user_callback_data
@@ -295,9 +295,11 @@ TEST_CASE("highs-callback-logging", "[highs-callback]") {
   highs.startCallback(kCallbackLogging);
   highs.readModel(filename);
   highs.run();
+  
+  highs.resetGlobalScheduler(true);
 }
 
-TEST_CASE("highs-callback-solution-basis-logging", "[highs-callback]") {
+TEST_CASE("highs-callback-solution-basis-logging", "[highs_callback]") {
   std::string filename = std::string(HIGHS_DIR) + "/check/instances/avgas.mps";
   int user_callback_data = kUserCallbackData;
   void* p_user_callback_data =
@@ -310,9 +312,11 @@ TEST_CASE("highs-callback-solution-basis-logging", "[highs-callback]") {
   highs.startCallback(kCallbackLogging);
   if (dev_run) highs.writeSolution("", kSolutionStylePretty);
   if (dev_run) highs.writeBasis("");
+  
+  highs.resetGlobalScheduler(true);
 }
 
-TEST_CASE("highs-callback-simplex-interrupt", "[highs-callback]") {
+TEST_CASE("highs-callback-simplex-interrupt", "[highs_callback]") {
   std::string filename =
       std::string(HIGHS_DIR) + "/check/instances/adlittle.mps";
   Highs highs;
@@ -325,9 +329,11 @@ TEST_CASE("highs-callback-simplex-interrupt", "[highs-callback]") {
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kInterrupt);
   REQUIRE(highs.getInfo().simplex_iteration_count >
           adlittle_simplex_iteration_limit);
+  
+  highs.resetGlobalScheduler(true);
 }
 
-TEST_CASE("highs-callback-ipm-interrupt", "[highs-callback]") {
+TEST_CASE("highs-callback-ipm-interrupt", "[highs_callback]") {
   std::string filename =
       std::string(HIGHS_DIR) + "/check/instances/adlittle.mps";
   Highs highs;
@@ -340,9 +346,11 @@ TEST_CASE("highs-callback-ipm-interrupt", "[highs-callback]") {
   REQUIRE(status == HighsStatus::kWarning);
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kInterrupt);
   REQUIRE(highs.getInfo().ipm_iteration_count > adlittle_ipm_iteration_limit);
+  
+  highs.resetGlobalScheduler(true);
 }
 
-TEST_CASE("highs-callback-mip-interrupt", "[highs-callback]") {
+TEST_CASE("highs-callback-mip-interrupt", "[highs_callback]") {
   std::string filename = std::string(HIGHS_DIR) + "/check/instances/egout.mps";
   Highs highs;
   highs.setOptionValue("output_flag", dev_run);
@@ -354,9 +362,11 @@ TEST_CASE("highs-callback-mip-interrupt", "[highs-callback]") {
   REQUIRE(status == HighsStatus::kWarning);
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kInterrupt);
   REQUIRE(highs.getInfo().objective_function_value > egout_optimal_objective);
+  
+  highs.resetGlobalScheduler(true);
 }
 
-TEST_CASE("highs-callback-mip-improving", "[highs-callback]") {
+TEST_CASE("highs-callback-mip-improving", "[highs_callback]") {
   std::string filename = std::string(HIGHS_DIR) + "/check/instances/egout.mps";
   Highs highs;
   highs.setOptionValue("output_flag", dev_run);
@@ -367,9 +377,11 @@ TEST_CASE("highs-callback-mip-improving", "[highs-callback]") {
   highs.startCallback(kCallbackMipImprovingSolution);
   highs.readModel(filename);
   highs.run();
+  
+  highs.resetGlobalScheduler(true);
 }
 
-TEST_CASE("highs-callback-mip-data", "[highs-callback]") {
+TEST_CASE("highs-callback-mip-data", "[highs_callback]") {
   std::string filename = std::string(HIGHS_DIR) + "/check/instances/egout.mps";
   Highs highs;
   highs.setOptionValue("output_flag", dev_run);
@@ -379,9 +391,11 @@ TEST_CASE("highs-callback-mip-data", "[highs-callback]") {
   highs.startCallback(kCallbackMipLogging);
   highs.readModel(filename);
   highs.run();
+  
+  highs.resetGlobalScheduler(true);
 }
 
-TEST_CASE("highs-callback-mip-solution", "[highs-callback]") {
+TEST_CASE("highs-callback-mip-solution", "[highs_callback]") {
   std::string filename = std::string(HIGHS_DIR) + "/check/instances/egout.mps";
   Highs highs;
   highs.setOptionValue("output_flag", dev_run);
@@ -399,19 +413,23 @@ TEST_CASE("highs-callback-mip-solution", "[highs-callback]") {
   highs.setCallback(userMipSolutionCallback, p_user_callback_data);
   highs.startCallback(kCallbackMipSolution);
   highs.run();
+  
+  highs.resetGlobalScheduler(true);
 }
 
-TEST_CASE("highs-callback-mip-cut-pool", "[highs-callback]") {
+TEST_CASE("highs-callback-mip-cut-pool", "[highs_callback]") {
   std::string filename = std::string(HIGHS_DIR) + "/check/instances/flugpl.mps";
   Highs highs;
   highs.setOptionValue("output_flag", dev_run);
   highs.readModel(filename);
   highs.setCallback(userMipCutPoolCallback);
   highs.startCallback(kCallbackMipGetCutPool);
   highs.run();
+  
+  highs.resetGlobalScheduler(true);
 }
 
-TEST_CASE("highs-callback-mip-user-solution", "[highs-callback]") {
+TEST_CASE("highs-callback-mip-user-solution", "[highs_callback]") {
   //  const std::vector<std::string> model = {"rgn", "flugpl", "gt2", "egout",
   //  "bell5", "lseu", "sp150x300d"};//, "p0548", "dcmulti"}; const
   //  std::vector<HighsInt> require_origin = {0, 1, 2, 3, 4, 5, 6};
@@ -451,4 +469,6 @@ TEST_CASE("highs-callback-mip-user-solution", "[highs-callback]") {
         std::max(1.0, std::fabs(objective_function_value0));
     REQUIRE(objective_diff < 1e-12);
   }
+  
+  highs.resetGlobalScheduler(true);
 }

check/TestCheckSolution.cpp

@@ -288,6 +288,8 @@ TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
   }
   assert(other_tests);
   std::remove(solution_file.c_str());
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("set-pathological-solution", "[highs_check_solution]") {
@@ -314,6 +316,8 @@ TEST_CASE("set-pathological-solution", "[highs_check_solution]") {
   highs.setSolution(solution);
   highs.run();
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kUnbounded);
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("check-set-lp-solution", "[highs_check_solution]") {
@@ -357,6 +361,8 @@ TEST_CASE("check-set-rowwise-lp-solution", "[highs_check_solution]") {
   highs.run();
   double objective2 = highs.getInfo().objective_function_value;
   REQUIRE(fabs(objective1 - objective2) / max(1.0, objective1) < 1e-5);
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("check-set-mip-solution-extra-row", "[highs_check_solution]") {
@@ -387,6 +393,8 @@ TEST_CASE("check-set-mip-solution-extra-row", "[highs_check_solution]") {
   highs.run();
   if (dev_run) highs.writeSolution("", 1);
   std::remove(solution_file_name.c_str());
+
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("check-set-illegal-solution", "[highs_check_solution]") {
@@ -447,6 +455,8 @@ TEST_CASE("read-miplib-solution", "[highs_check_solution]") {
   REQUIRE(h.readSolution(miplib_sol_file) == HighsStatus::kOk);
   REQUIRE(h.run() == HighsStatus::kOk);
   std::remove(miplib_sol_file.c_str());
+
+  h.resetGlobalScheduler(true);
 }
 
 void runWriteReadCheckSolution(Highs& highs, const std::string& test_name,
@@ -499,6 +509,8 @@ void runWriteReadCheckSolution(Highs& highs, const std::string& test_name,
   REQUIRE(status == require_model_status);
 
   std::remove(solution_file.c_str());
+
+  highs.resetGlobalScheduler(true);
 }
 
 void runSetLpSolution(const std::string model) {
@@ -566,4 +578,6 @@ void runSetLpSolution(const std::string model) {
   highs.clear();
 
   std::remove(solution_file.c_str());
+
+  highs.resetGlobalScheduler(true);
 }