Now casting HighsInt to int in HiPDLP logging

Author: jajhall

check/TestPdlp.cpp

@@ -258,6 +258,7 @@ TEST_CASE("pdlp-restart", "[pdlp]") {
   pdlpRestart("adlittle");
   //  pdlpRestart("shell");
   //  pdlpRestart("25fv47");
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("pdlp-restart-lp", "[pdlp]") {
@@ -285,6 +286,7 @@ TEST_CASE("pdlp-restart-lp", "[pdlp]") {
 
   h.setOptionValue("presolve", kHighsOffString);
   run_status = h.run();
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("pdlp-restart-add-row", "[pdlp]") {
@@ -328,6 +330,7 @@ TEST_CASE("pdlp-restart-add-row", "[pdlp]") {
   h.setSolution(solution);
   run_status = h.run();
   if (dev_run) h.writeSolution("", 1);
+  highs.resetGlobalScheduler(true);
 }
 
 TEST_CASE("hi-pdlp", "[pdlp]") {
@@ -349,12 +352,13 @@ TEST_CASE("hi-pdlp", "[pdlp]") {
   HighsStatus run_status = h.run();
   //  REQUIRE(run_status == HighsStatus::kOk);
   //  REQUIRE(h.getModelStatus() == HighsModelStatus::kOptimal);
-  REQUIRE(h.getInfo().pdlp_iteration_count == 11880);
+  //  REQUIRE(h.getInfo().pdlp_iteration_count == 11880);
   const bool cupdlp_test = true;
   if (cupdlp_test) {
     h.clearSolver();
     h.setOptionValue("solver", kCuPdlpString);
     h.setOptionValue("pdlp_features_off", kPdlpAllFeaturesOff);
     run_status = h.run();
   }
+  highs.resetGlobalScheduler(true);
 }

highs/pdlp/cupdlp/cupdlp_utils.c

@@ -1783,7 +1783,9 @@ void writeSol(const char *fout, cupdlp_int nCols, cupdlp_int nRows,
 }
 
 void debugPdlpIterLog(FILE* file, const int iter_num, const double beta) {
-  fprintf(file, "Iter %6d; beta = %g\n", iter_num, beta);
+  fprintf(file, "Iter %6d\n", iter_num);
+// ; beta = %g
+	  //, beta
 }
 
 void debugPdlpAxNormLog(FILE* file, const double ax_norm) {

highs/pdlp/hipdlp/pdhg.cc

@@ -834,7 +834,8 @@ double PDLPSolver::PowerMethod() {
       x_vec = z_vec;
       if (log_iters)
         highsLogUser(params_.log_options_, HighsLogType::kInfo,
-                     "%2d %12.6g %11.4g\n", iter, op_norm_sq, dl_op_norm_sq);
+                     "%2d %12.6g %11.4g\n", int(iter), op_norm_sq,
+                     dl_op_norm_sq);
     } else {
       if (power_method == kYanyuPowerMethodDev) {
         // Yanyu power method without "convergence" check
@@ -876,7 +877,7 @@ double PDLPSolver::PowerMethod() {
       previous_lambda = lambda;
       if (log_iters)
         highsLogUser(params_.log_options_, HighsLogType::kInfo,
-                     "%2d %12.6g %11.4g\n", iter, lambda, dl_lambda);
+                     "%2d %12.6g %11.4g\n", int(iter), lambda, dl_lambda);
     }
   }
   if (power_method != kYanyuPowerMethod) op_norm_sq = lambda;

highs/pdlp/hipdlp/restart.cc

@@ -94,17 +94,17 @@ RestartInfo RestartScheme::Check(int current_iter,
       if (artificial_restart) {
         highsLogUser(*log_options_, HighsLogType::kInfo,
                      "Artificial restart triggered at iteration %d\n",
-                     current_iter);
+                     int(current_iter));
         info.should_restart = true;
       } else if (sufficient_decay) {
         highsLogUser(*log_options_, HighsLogType::kInfo,
                      "Sufficient decay triggered at iteration %d\n",
-                     current_iter);
+                     int(current_iter));
         info.should_restart = true;
       } else if (necessary_decay) {
         highsLogUser(*log_options_, HighsLogType::kInfo,
                      "Necessary decay triggered at iteration %d\n",
-                     current_iter);
+                     int(current_iter));
         info.should_restart = true;
       } else {
         info.should_restart = false;

highs/pdlp/hipdlp/scaling.cc

@@ -31,7 +31,7 @@ void Scaling::Initialize(const HighsLp& lp) {
 void Scaling::LogMatrixNorms(const std::string& stage) {
   const HighsLp& lp = *lp_;
   highsLogUser(params_->log_options_, HighsLogType::kInfo,
-               "\n--- Matrix Norms %d ---\n", stage.c_str());
+               "\n--- Matrix Norms %s ---\n", stage.c_str());
 
   if (lp.num_col_ == 0 || lp.num_row_ == 0) {
     highsLogUser(params_->log_options_, HighsLogType::kInfo,
@@ -49,7 +49,7 @@ void Scaling::LogMatrixNorms(const std::string& stage) {
       max_abs_val = std::max(max_abs_val, std::abs(lp.a_matrix_.value_[iEl]));
     }
     highsLogUser(params_->log_options_, HighsLogType::kInfo, "  Col %d: %g\n",
-                 iCol, max_abs_val);
+                 int(iCol), max_abs_val);
   }
 
   // --- Calculate and Log Row Norms (Infinity Norm) ---
@@ -67,7 +67,7 @@ void Scaling::LogMatrixNorms(const std::string& stage) {
 
   for (HighsInt iRow = 0; iRow < lp.num_row_; ++iRow) {
     highsLogUser(params_->log_options_, HighsLogType::kInfo, "  Row %d: %g\n",
-                 iRow, row_max_abs_vals[iRow]);
+                 int(iRow), row_max_abs_vals[iRow]);
   }
   highsLogUser(params_->log_options_, HighsLogType::kInfo,
                "-------------------------\n");

highs/pdlp/hipdlp/step.cc

@@ -233,7 +233,7 @@ void PdlpStep::UpdateIteratesAdaptive(
     /*
     highsLogUser(*log_options_, HighsLogType::kInfo,
                  "Iteration %d: eta = %g, movement = %g nonlinearity = %g, limit
-    = %g\n", inner_iterations, current_eta, movement, nonlinearity.
+    = %g\n", int(inner_iterations), current_eta, movement, nonlinearity.
     step_size_limit);
     */
     if (current_eta <= step_size_limit) {
@@ -406,7 +406,7 @@ bool PdlpStep::UpdateIteratesMalitskyPock(
         highsLogUser(
             *log_options_, HighsLogType::kInfo,
             "Malitsky-Pock line search: iteration %d, reducing step to %g\n",
-            inner_iterations, new_primal_step_size);
+            int(inner_iterations), new_primal_step_size);
     }
   }