MIP core profiling using fundamental clocks and being reported

ERGO-Code · Sep 25, 2024 · f321644 · f321644
1 parent bf78875
commit f321644
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 33 deletions.
diff --git a/src/mip/HighsMipSolver.cpp b/src/mip/HighsMipSolver.cpp
@@ -116,7 +116,7 @@ void HighsMipSolver::run() {
     analysis_.timer_ = &this->timer_;
     analysis_.setup(*orig_model_, *options_mip_);
   }
-  analysis_.mipTimerStart(kMipClockTotal);
+  //  analysis_.mipTimerStart(kMipClockTotal);
 
   improving_solution_file_ = nullptr;
   if (!submip && options_mip_->mip_improving_solution_file != "")
@@ -581,8 +581,7 @@ void HighsMipSolver::cleanupSolve() {
 
   timer_.stop(timer_.postsolve_clock);
   timer_.stop(timer_.total_clock);
-  analysis_.mipTimerStop(kMipClockTotal);
-  //  analysis_.reportMipTimer();
+  analysis_.reportMipTimer();
 
   std::string solutionstatus = "-";
 
@@ -649,25 +648,24 @@ void HighsMipSolver::cleanupSolve() {
                  "                    %.12g (row viol.)\n",
                  solution_objective_, bound_violation_, integrality_violation_,
                  row_violation_);
-  highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-               "  Timing            %.2f (total)\n"
-               "                    %.2f (presolve)\n"
-               "                    %.2f (solve)\n"
-               "                    %.2f (postsolve)\n"
-               "  Nodes             %llu\n"
-               "  LP iterations     %llu (total)\n"
-               "                    %llu (strong br.)\n"
-               "                    %llu (separation)\n"
-               "                    %llu (heuristics)\n",
-               timer_.read(timer_.total_clock),
-               timer_.read(timer_.presolve_clock),
-               timer_.read(timer_.solve_clock),
-               timer_.read(timer_.postsolve_clock),
-               (long long unsigned)mipdata_->num_nodes,
-               (long long unsigned)mipdata_->total_lp_iterations,
-               (long long unsigned)mipdata_->sb_lp_iterations,
-               (long long unsigned)mipdata_->sepa_lp_iterations,
-               (long long unsigned)mipdata_->heuristic_lp_iterations);
+  highsLogUser(
+      options_mip_->log_options, HighsLogType::kInfo,
+      "  Timing            %.2f (total)\n"
+      "                    %.2f (presolve)\n"
+      "                    %.2f (solve)\n"
+      "                    %.2f (postsolve)\n"
+      "  Nodes             %llu\n"
+      "  LP iterations     %llu (total)\n"
+      "                    %llu (strong br.)\n"
+      "                    %llu (separation)\n"
+      "                    %llu (heuristics)\n",
+      timer_.read(timer_.total_clock), timer_.read(timer_.presolve_clock),
+      timer_.read(timer_.solve_clock), timer_.read(timer_.postsolve_clock),
+      (long long unsigned)mipdata_->num_nodes,
+      (long long unsigned)mipdata_->total_lp_iterations,
+      (long long unsigned)mipdata_->sb_lp_iterations,
+      (long long unsigned)mipdata_->sepa_lp_iterations,
+      (long long unsigned)mipdata_->heuristic_lp_iterations);
 
   assert(modelstatus_ != HighsModelStatus::kNotset);
 }

diff --git a/src/presolve/HPresolve.cpp b/src/presolve/HPresolve.cpp
@@ -4256,10 +4256,10 @@ HPresolve::Result HPresolve::presolve(HighsPostsolveStack& postsolve_stack) {
         HighsInt numNonz = Avalue.size() - freeslots.size();
 #ifndef NDEBUG
         std::string time_str =
-            " " + std::to_string(this->timer->read(run_clock)) + "s";
+            " " + std::to_string(this->timer->readRunHighsClock()) + "s";
 #else
         std::string time_str =
-            " " + std::to_string(int(this->timer->read(run_clock))) + "s";
+            " " + std::to_string(int(this->timer->readRunHighsClock())) + "s";
 #endif
         highsLogUser(options->log_options, HighsLogType::kInfo,
                      "%" HIGHSINT_FORMAT " rows, %" HIGHSINT_FORMAT
@@ -4268,13 +4268,11 @@ HPresolve::Result HPresolve::presolve(HighsPostsolveStack& postsolve_stack) {
       }
     };
 
-    // Need to check for time-out in checkLimits. However, when
-    // presolve is called from the MIP solver timer->solve_clock is
-    // running, and when presolve is called before the LP solver, the
-    // HighsClock is running. So have to set run_clock accordingly.
+    // Need to check for time-out in checkLimits, so make sure that
+    // the timer is well defined, and that its total time clock is
+    // running
     assert(this->timer);
     assert(this->timer->runningRunHighsClock());
-    if (this->timer->runningRunHighsClock()) run_clock = timer->run_highs_clock;
 
     HPRESOLVE_CHECKED_CALL(initialRowAndColPresolve(postsolve_stack));
 
@@ -4482,10 +4480,8 @@ HPresolve::Result HPresolve::checkLimits(HighsPostsolveStack& postsolve_stack) {
 
   if ((numreductions & 1023u) == 0) {
     assert(timer);
-    assert(run_clock >= 0);
-    if (timer->read(run_clock) >= options->time_limit) {
+    if (timer->readRunHighsClock() >= options->time_limit)
       return Result::kStopped;
-    }
   }
   return numreductions >= reductionLimit ? Result::kStopped : Result::kOk;
 }

diff --git a/src/presolve/HPresolve.h b/src/presolve/HPresolve.h
@@ -43,7 +43,6 @@ class HPresolve {
   HighsTimer* timer;
   HighsMipSolver* mipsolver = nullptr;
   double primal_feastol;
-  HighsInt run_clock = -1;
 
   // triplet storage
   std::vector<double> Avalue;