fix code relate to PDLP_DEBUG_LOG

Author: Yanyu000

highs/pdlp/CupdlpWrapper.cpp

@@ -205,6 +205,7 @@ HighsStatus solveLpCupdlp(const HighsOptions& options, HighsTimer& timer,
       &pdlp_num_iter);
   highs_info.pdlp_iteration_count = pdlp_num_iter;
 
+#if PDLP_DEBUG_LOG
   // Print final solution using debugPdlpFinalSolutionLog
   debugPdlpFinalSolutionLog(w->debug_pdlp_log_file_,
                             highs_solution.col_value.data(), lp.num_col_,
@@ -214,6 +215,7 @@ HighsStatus solveLpCupdlp(const HighsOptions& options, HighsTimer& timer,
   // still be used
   //
   PDHG_Destroy(&w);
+#endif
 
   model_status = HighsModelStatus::kUnknown;
   highs_solution.value_valid = value_valid;

highs/pdlp/cupdlp/cupdlp_defs.h

@@ -41,7 +41,7 @@ extern "C" {
 #define CUPDLP_DUMP_LINESEARCH_STATS (1)
 #define CUPDLP_INEXACT_EPS (1e-4)
 
-#define PDLP_DEBUG_LOG (0)
+#define PDLP_DEBUG_LOG (1)
 
 typedef struct CUPDLP_CUDA_DENSE_VEC CUPDLPvec;
 typedef struct CUPDLP_DENSE_MATRIX CUPDLPdense;
@@ -434,8 +434,11 @@ struct CUPDLP_WORK {
   // cusparseDnVecDescr_t vecbuffer;
   cublasHandle_t cublashandle;
 #endif
+
+#if PDLP_DEBUG_LOG 
   FILE* debug_pdlp_log_file_;
   struct DebugPdlpData debug_pdlp_data_;
+#endif
 };
 
 #ifdef __cplusplus

highs/pdlp/cupdlp/cupdlp_restart.c

@@ -27,7 +27,9 @@ PDHG_restart_choice PDHG_Check_Restart_GPU(CUPDLPwork *work) {
   cupdlp_float muAverage = PDHG_Restart_Score_GPU(
       work->stepsize->dBeta, work->resobj->dPrimalFeasAverage,
       work->resobj->dDualFeasAverage, work->resobj->dDualityGapAverage);
+#if PDLP_DEBUG_LOG
   debugPdlpRestartLog(work->debug_pdlp_log_file_, timers->nIter, muCurrent, muAverage);
+#endif
   cupdlp_float muCandidate = 0.0;
   PDHG_restart_choice restart_choice = PDHG_RESTART_TO_AVERAGE;
   if (muCurrent < muAverage) {

highs/pdlp/cupdlp/cupdlp_solver.c

@@ -558,6 +558,8 @@ void PDHG_Init_Variables(const cupdlp_int* has_variables, CUPDLPwork *work) {
   // Ax(work, iterates->ax, iterates->x);
   // ATyCPU(work, iterates->aty, iterates->y);
   Ax(work, ax, x);
+
+#if PDLP_DEBUG_LOG
   double ax_norm;
   cupdlp_twoNorm(work, lp->nRows, ax->data, &ax_norm);
   if (work->settings->nLogLevel>0)
@@ -567,6 +569,7 @@ void PDHG_Init_Variables(const cupdlp_int* has_variables, CUPDLPwork *work) {
   double aty_norm;
   cupdlp_twoNorm(work, lp->nCols, aty->data, &aty_norm);
   work->debug_pdlp_data_.aty_norm = aty_norm;
+#endif
 
   // cupdlp_zero(iterates->xSum, cupdlp_float, lp->nCols);
   // cupdlp_zero(iterates->ySum, cupdlp_float, lp->nRows);
@@ -907,14 +910,15 @@ cupdlp_retcode PDHG_Solve(const cupdlp_int* has_variables, CUPDLPwork *pdhg) {
   timers->nIter = 0;
   timers->dSolvingBeg = getTimeStamp();
 
+#if PDLP_DEBUG_LOG
   if (PDLP_DEBUG_LOG) {
     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;
   }
-
+#endif
   // PDHG_Init_Data does nothing!
   PDHG_Init_Data(pdhg);
 
@@ -932,10 +936,16 @@ cupdlp_retcode PDHG_Solve(const cupdlp_int* has_variables, CUPDLPwork *pdhg) {
   // iter_log_since_header so that an initial header is printed
   const int iter_log_between_header = 50;
   int iter_log_since_header = iter_log_between_header;
+#if PDLP_DEBUG_LOG
   debugPdlpIterHeaderLog(pdhg->debug_pdlp_log_file_);
+#endif
   for (timers->nIter = 0; timers->nIter < settings->nIterLim; ++timers->nIter) {
+#if PDLP_DEBUG_LOG
     debugPdlpIterLog(pdhg->debug_pdlp_log_file_, timers->nIter, &pdhg->debug_pdlp_data_, pdhg->stepsize->dBeta, pdhg->stepsize->dPrimalStep, pdhg->stepsize->dDualStep);
+#endif
+
     PDHG_Compute_SolvingTime(pdhg);
+    
 #if CUPDLP_DUMP_ITERATES_STATS && CUPDLP_DEBUG
     PDHG_Dump_Stats(pdhg);
 #endif
@@ -982,6 +992,7 @@ cupdlp_retcode PDHG_Solve(const cupdlp_int* has_variables, CUPDLPwork *pdhg) {
 	iter_log_since_header++;
       }
 
+#if PDLP_DEBUG_LOG
       debugPdlpFeasOptLog(pdhg->debug_pdlp_log_file_,
 			  pdhg->timers->nIter, 
 			  pdhg->resobj->dPrimalObj,
@@ -997,7 +1008,7 @@ cupdlp_retcode PDHG_Solve(const cupdlp_int* has_variables, CUPDLPwork *pdhg) {
 			  pdhg->resobj->dPrimalFeasAverage / (1.0 + pdhg->scaling->dNormRhs),
 			  pdhg->resobj->dDualFeasAverage / (1.0 + pdhg->scaling->dNormCost), "[A]");
       debugPdlpIterHeaderLog(pdhg->debug_pdlp_log_file_);
-      
+#endif
       // Termination check printing is only done when printing is full
       int termination_print = bool_print && full_print;
       if (PDHG_Check_Termination(pdhg, termination_print)) {
@@ -1059,14 +1070,16 @@ cupdlp_retcode PDHG_Solve(const cupdlp_int* has_variables, CUPDLPwork *pdhg) {
 
     CUPDLPvec *ax = iterates->ax[timers->nIter % 2];
     CUPDLPvec *aty = iterates->aty[timers->nIter % 2];
+
+#if PDLP_DEBUG_LOG
     double debug_pdlp_data_ax_norm = 0.0;
     cupdlp_twoNorm(pdhg, problem->nRows, ax->data,
                     &debug_pdlp_data_ax_norm);
     pdhg->debug_pdlp_data_.ax_norm = debug_pdlp_data_ax_norm;
     double debug_pdlp_data_aty_norm = 0.0;
     cupdlp_twoNorm(pdhg, problem->nCols, aty->data, &debug_pdlp_data_aty_norm);
     pdhg->debug_pdlp_data_.aty_norm = debug_pdlp_data_aty_norm;
-    
+#endif
     // CUPDLP_CALL(PDHG_Update_Iterate(pdhg));
     if (PDHG_Update_Iterate(pdhg) == RETCODE_FAILED) {
       // cupdlp_printf("Time limit reached.\n");

highs/pdlp/cupdlp/cupdlp_step.c

@@ -400,6 +400,8 @@ void PDHG_Compute_Average_Iterate(CUPDLPwork *work) {
   // ATyCPU(work, iterates->atyAverage, iterates->yAverage);
   Ax(work, iterates->axAverage, iterates->xAverage);
   ATy(work, iterates->atyAverage, iterates->yAverage);
+
+#if PDLP_DEBUG_LOG
   // print norm of x_average
   cupdlp_float debug_pdlp_data_x_average_norm = 0.0;
   cupdlp_twoNormSquared(work, lp->nCols, iterates->xAverage
@@ -414,6 +416,7 @@ void PDHG_Compute_Average_Iterate(CUPDLPwork *work) {
   cupdlp_float debug_pdlp_data_aty_average_norm = 0.0;
   cupdlp_twoNormSquared(work, lp->nCols, iterates->atyAverage->data, &debug_pdlp_data_aty_average_norm);
   work->debug_pdlp_data_.aty_average_norm = debug_pdlp_data_aty_average_norm;
+#endif
 }
 
 void PDHG_Update_Average(CUPDLPwork *work) {