Hopefully valgrind now OK on test-1966

Author: jajhall

highs/interfaces/highs_c_api.h

@@ -117,21 +117,32 @@ static const char* const kHighsCallbackDataOutPdlpIterationCountName =
     "pdlp_iteration_count";
 static const char* const kHighsCallbackDataOutObjectiveFunctionValueName =
     "objective_function_value";
-static const char* const kHighsCallbackDataOutMipNodeCountName = "mip_node_count";
+static const char* const kHighsCallbackDataOutMipNodeCountName =
+    "mip_node_count";
 static const char* const kHighsCallbackDataOutMipTotalLpIterationsName =
     "mip_total_lp_iterations";
-static const char* const kHighsCallbackDataOutMipPrimalBoundName = "mip_primal_bound";
-static const char* const kHighsCallbackDataOutMipDualBoundName = "mip_dual_bound";
+static const char* const kHighsCallbackDataOutMipPrimalBoundName =
+    "mip_primal_bound";
+static const char* const kHighsCallbackDataOutMipDualBoundName =
+    "mip_dual_bound";
 static const char* const kHighsCallbackDataOutMipGapName = "mip_gap";
 static const char* const kHighsCallbackDataOutMipSolutionName = "mip_solution";
-static const char* const kHighsCallbackDataOutCutpoolNumColName = "cutpool_num_col";
-static const char* const kHighsCallbackDataOutCutpoolNumCutName = "cutpool_num_cut";
-static const char* const kHighsCallbackDataOutCutpoolNumNzName = "cutpool_num_nz";
-static const char* const kHighsCallbackDataOutCutpoolStartName = "cutpool_start";
-static const char* const kHighsCallbackDataOutCutpoolIndexName = "cutpool_index";
-static const char* const kHighsCallbackDataOutCutpoolValueName = "cutpool_value";
-static const char* const kHighsCallbackDataOutCutpoolLowerName = "cutpool_lower";
-static const char* const kHighsCallbackDataOutCutpoolUpperName = "cutpool_upper";
+static const char* const kHighsCallbackDataOutCutpoolNumColName =
+    "cutpool_num_col";
+static const char* const kHighsCallbackDataOutCutpoolNumCutName =
+    "cutpool_num_cut";
+static const char* const kHighsCallbackDataOutCutpoolNumNzName =
+    "cutpool_num_nz";
+static const char* const kHighsCallbackDataOutCutpoolStartName =
+    "cutpool_start";
+static const char* const kHighsCallbackDataOutCutpoolIndexName =
+    "cutpool_index";
+static const char* const kHighsCallbackDataOutCutpoolValueName =
+    "cutpool_value";
+static const char* const kHighsCallbackDataOutCutpoolLowerName =
+    "cutpool_lower";
+static const char* const kHighsCallbackDataOutCutpoolUpperName =
+    "cutpool_upper";
 
 const HighsInt kHighsIisStrategyLight = 0;
 const HighsInt kHighsIisStrategyFromLpRowPriority = 1;  // WIP

highs/pdlp/CupdlpWrapper.cpp

@@ -205,11 +205,19 @@ HighsStatus solveLpCupdlp(const HighsOptions& options, HighsTimer& timer,
       &pdlp_num_iter);
   highs_info.pdlp_iteration_count = pdlp_num_iter;
 
-  // Print final solution using debugPdlpFinalSolutionLog
-  debugPdlpFinalSolutionLog(w->debug_pdlp_log_file_,
-                            highs_solution.col_value.data(), lp.num_col_,
-                            highs_solution.row_dual.data(), lp.num_row_);
-  if (w->debug_pdlp_log_file_) fclose(w->debug_pdlp_log_file_);
+  if (PDLP_DEBUG_LOG) {
+    // Strange, even though w->debug_pdlp_log_file_ is set NULL in
+    // cupdlp_solver.c when !PDLP_DEBUG_LOG, vagrind still considers
+    // it to be an Invalid read of size 8 here, so use PDLP_DEBUG_LOG
+    // to determine call
+    //
+    // Print final solution using debugPdlpFinalSolutionLog
+    debugPdlpFinalSolutionLog(w->debug_pdlp_log_file_,
+                              highs_solution.col_value.data(), lp.num_col_,
+                              highs_solution.row_dual.data(), lp.num_row_);
+    assert(w->debug_pdlp_log_file_);
+    if (w->debug_pdlp_log_file_) fclose(w->debug_pdlp_log_file_);
+  }
   model_status = HighsModelStatus::kUnknown;
   highs_solution.value_valid = value_valid;
   highs_solution.dual_valid = dual_valid;