Ensured that pdhg->debug_pdlp_log_file_ is NULL in cuPDLP-C

Author: jajhall

highs/pdlp/CupdlpWrapper.cpp

@@ -209,7 +209,7 @@ HighsStatus solveLpCupdlp(const HighsOptions& options, HighsTimer& timer,
   debugPdlpFinalSolutionLog(w->debug_pdlp_log_file_,
                             highs_solution.col_value.data(), lp.num_col_,
                             highs_solution.row_dual.data(), lp.num_row_);
-  fclose(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;

highs/pdlp/HiPdlpTimer.h

@@ -69,17 +69,17 @@ class HipdlpTimer {
     clock[kHipdlpClockAverageIterate] =
         timer_pointer->clock_def("Average iterate");
     clock[kHipdlpClockAverageIterateUpdateX] =
-        timer_pointer->clock_def("Average iterate update X");
+        timer_pointer->clock_def("Update X");
     clock[kHipdlpClockAverageIterateUpdateY] =
-        timer_pointer->clock_def("Average iterate update Y");
+        timer_pointer->clock_def("Update Y");
     clock[kHipdlpClockAverageIterateComputeX] =
-        timer_pointer->clock_def("Average iterate compute X");
+        timer_pointer->clock_def("Compute X");
     clock[kHipdlpClockAverageIterateComputeY] =
-        timer_pointer->clock_def("Average iterate compute Y");
+        timer_pointer->clock_def("Compute Y");
     clock[kHipdlpClockAverageIterateMatrixMultiply] =
-        timer_pointer->clock_def("Average iterate Ax");
+        timer_pointer->clock_def("Ax  [A]");
     clock[kHipdlpClockAverageIterateMatrixTransposeMultiply] =
-        timer_pointer->clock_def("Average iterate Aty");
+        timer_pointer->clock_def("Aty [A]");
   };
 
   bool reportHipdlpClockList(
@@ -123,8 +123,7 @@ class HipdlpTimer {
       const HighsTimerClock& hipdlp_timer_clock) {
     const std::vector<HighsInt> hipdlp_clock_list{
         kHipdlpClockMatrixMultiply, kHipdlpClockMatrixTransposeMultiply,
-        kHipdlpClockProjectX, kHipdlpClockProjectY,
-        kHipdlpClockStepSizeAdjustment};
+        kHipdlpClockProjectX, kHipdlpClockProjectY};
     reportHipdlpClockList("HipdlpIterUpd", hipdlp_clock_list,
                           hipdlp_timer_clock, kHipdlpClockIterateUpdate);
   };

highs/pdlp/cupdlp/cupdlp_solver.c

@@ -911,6 +911,8 @@ cupdlp_retcode PDHG_Solve(const cupdlp_int* has_variables, CUPDLPwork *pdhg) {
     pdhg->debug_pdlp_log_file_ = fopen("cuPDLP.log", "w");
     assert(pdhg->debug_pdlp_log_file_);
     debugPdlpDataInitialise(&pdhg->debug_pdlp_data_);
+  } else {
+    pdhg->debug_pdlp_log_file_ = NULL;
   }
 
   // PDHG_Init_Data does nothing!