Skip to content

Commit 14ae18c

Browse files
committed
Added GPU name and memory logging to PDLPSolver::setup; formatted
1 parent e7227d7 commit 14ae18c

File tree

4 files changed

+464
-356
lines changed

4 files changed

+464
-356
lines changed

check/TestPdlp.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,8 @@ TEST_CASE("pdlp-restart-add-row", "[pdlp]") {
341341
}
342342

343343
TEST_CASE("hi-pdlp", "[pdlp]") {
344-
std::string model =
345-
"25fv47"; //"adlittle";//"afiro";// shell// stair //25fv47 //fit2p //avgas
344+
std::string model = "25fv47"; //"adlittle";//"afiro";// shell// stair
345+
////25fv47 //fit2p //avgas
346346
std::string model_file =
347347
std::string(HIGHS_DIR) + "/check/instances/" + model + ".mps";
348348
Highs h;
@@ -352,10 +352,10 @@ TEST_CASE("hi-pdlp", "[pdlp]") {
352352
h.setOptionValue("kkt_tolerance", kkt_tolerance);
353353
h.setOptionValue("presolve", "off");
354354

355-
HighsInt pdlp_features_off = 0
356-
//+kPdlpScalingOff
357-
//+kPdlpRestartOff
358-
//+kPdlpAdaptiveStepSizeOff
355+
HighsInt pdlp_features_off = 0
356+
//+kPdlpScalingOff
357+
//+kPdlpRestartOff
358+
//+kPdlpAdaptiveStepSizeOff
359359
;
360360
h.setOptionValue("pdlp_features_off", pdlp_features_off);
361361

@@ -366,8 +366,8 @@ TEST_CASE("hi-pdlp", "[pdlp]") {
366366
h.setOptionValue("pdlp_scaling_mode", pdlp_scaling);
367367
h.setOptionValue("pdlp_step_size_strategy", 1);
368368
h.setOptionValue("pdlp_restart_strategy", 2);
369-
//h.setOptionValue("pdlp_iteration_limit", 10);
370-
// h.setOptionValue("log_dev_level", kHighsLogDevLevelVerbose);
369+
// h.setOptionValue("pdlp_iteration_limit", 10);
370+
// h.setOptionValue("log_dev_level", kHighsLogDevLevelVerbose);
371371
auto start_hipdlp = std::chrono::high_resolution_clock::now();
372372
HighsStatus run_status = h.run();
373373
auto end_hipdlp = std::chrono::high_resolution_clock::now();
@@ -408,7 +408,7 @@ TEST_CASE("hi-pdlp", "[pdlp]") {
408408
std::cout << "Objective: " << h.getInfo().objective_function_value
409409
<< std::endl;
410410
}
411-
//assert(hipdlp_iteration_count == h.getInfo().pdlp_iteration_count);
411+
// assert(hipdlp_iteration_count == h.getInfo().pdlp_iteration_count);
412412
h.resetGlobalScheduler(true);
413413
}
414414

0 commit comments

Comments
 (0)