Added more clocks

Author: jajhall

check/TestPdlp.cpp

@@ -392,11 +392,11 @@ TEST_CASE("hi-pdlp", "[pdlp]") {
 }
 
 TEST_CASE("hi-pdlp-timer", "[pdlp]") {
-  std::string model = "adlittle";
+  std::string model = "shell";
   std::string model_file =
       std::string(HIGHS_DIR) + "/check/instances/" + model + ".mps";
   Highs h;
-  // h.setOptionValue("output_flag", dev_run);
+  //  h.setOptionValue("output_flag", dev_run);
   REQUIRE(h.readModel(model_file) == HighsStatus::kOk);
   REQUIRE(h.setOptionValue("solver", kHiPdlpString) == HighsStatus::kOk);
   HighsInt pdlp_features_off = 

cmake/sources-python.cmake

@@ -372,6 +372,7 @@ set(highs_headers_python
     highs/parallel/HighsTask.h
     highs/parallel/HighsTaskExecutor.h
     highs/pdlp/CupdlpWrapper.h
+    highs/pdlp/HiPdlpTimer.h
     highs/pdlp/HiPdlpWrapper.h
     highs/pdlp/hipdlp/defs.hpp
     highs/pdlp/hipdlp/linalg.hpp

highs/pdlp/HiPdlpTimer.h

@@ -25,9 +25,14 @@ enum iClockHipdlp {
   // IterateUpdate clocks
   kHipdlpClockMatrixMultiply,
   kHipdlpClockMatrixTransposeMultiply,
-  kHipdlpClockProjection,
+  kHipdlpClockProjectX,
+  kHipdlpClockProjectY,
   kHipdlpClockStepSizeAdjustment,
   // AverageIterate clocks
+  kHipdlpClockAverageIterateUpdateX,
+  kHipdlpClockAverageIterateUpdateY,
+  kHipdlpClockAverageIterateComputeX,
+  kHipdlpClockAverageIterateComputeY,
   kHipdlpClockAverageIterateMatrixMultiply,
   kHipdlpClockAverageIterateMatrixTransposeMultiply,
 
@@ -56,8 +61,10 @@ class HipdlpTimer {
       timer_pointer->clock_def("Ax");
     clock[kHipdlpClockMatrixTransposeMultiply] =
       timer_pointer->clock_def("Aty");
-    clock[kHipdlpClockProjection] =
-      timer_pointer->clock_def("Projection");
+    clock[kHipdlpClockProjectX] =
+      timer_pointer->clock_def("Project X");
+    clock[kHipdlpClockProjectY] =
+      timer_pointer->clock_def("Project Y");
     clock[kHipdlpClockStepSizeAdjustment] =
       timer_pointer->clock_def("Step size adjustment");
     clock[kHipdlpClockConvergenceCheck] =
@@ -66,6 +73,14 @@ class HipdlpTimer {
       timer_pointer->clock_def("Restart check");
     clock[kHipdlpClockAverageIterate] =
       timer_pointer->clock_def("Average iterate");
+    clock[kHipdlpClockAverageIterateUpdateX] =
+      timer_pointer->clock_def("Average iterate update X");
+    clock[kHipdlpClockAverageIterateUpdateY] =
+      timer_pointer->clock_def("Average iterate update Y");
+    clock[kHipdlpClockAverageIterateComputeX] =
+      timer_pointer->clock_def("Average iterate compute X");
+    clock[kHipdlpClockAverageIterateComputeY] =
+      timer_pointer->clock_def("Average iterate compute Y");
     clock[kHipdlpClockAverageIterateMatrixMultiply] =
       timer_pointer->clock_def("Average iterate Ax");
     clock[kHipdlpClockAverageIterateMatrixTransposeMultiply] =
@@ -113,14 +128,18 @@ class HipdlpTimer {
   void reportHipdlpIterateUpdateClock(const HighsTimerClock& hipdlp_timer_clock) {
     const std::vector<HighsInt> hipdlp_clock_list{
       kHipdlpClockMatrixMultiply, kHipdlpClockMatrixTransposeMultiply,
-      kHipdlpClockProjection, kHipdlpClockStepSizeAdjustment
+      kHipdlpClockProjectX, kHipdlpClockProjectY, kHipdlpClockStepSizeAdjustment
     };
     reportHipdlpClockList("HipdlpIterUpd", hipdlp_clock_list, hipdlp_timer_clock,
 			  kHipdlpClockIterateUpdate);
   };
 
   void reportHipdlpAverageIterateClock(const HighsTimerClock& hipdlp_timer_clock) {
     const std::vector<HighsInt> hipdlp_clock_list{
+      kHipdlpClockAverageIterateUpdateX,
+      kHipdlpClockAverageIterateUpdateY,
+      kHipdlpClockAverageIterateComputeX,
+      kHipdlpClockAverageIterateComputeY,
       kHipdlpClockAverageIterateMatrixMultiply,
       kHipdlpClockAverageIterateMatrixTransposeMultiply
     };

highs/pdlp/HiPdlpWrapper.cpp

@@ -79,7 +79,6 @@ HighsStatus solveLpHiPdlp(const HighsOptions& options, HighsTimer& timer,
                             pdlp_solution.row_dual.data(), lp.num_row_);
   pdlp.reportHipdlpTimer();
 
-  pdlp.solveReturn();
   // --- Print Summary ---
   pdlp.logSummary();