Skip to content

Commit 8e7dac2

Browse files
committed
remove duplicated fix and add CI
1 parent cbbfbf9 commit 8e7dac2

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

highs/pdlp/CupdlpWrapper.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,6 @@ HighsStatus solveLpCupdlp(const HighsOptions& options, HighsTimer& timer,
291291
scaling_clear(scaling);
292292
}
293293

294-
// if (w->timers) {
295-
// timers_clear(0,w->timers);
296-
// }
297-
298294
if (cost != NULL) cupdlp_free(cost);
299295
if (csc_beg != NULL) cupdlp_free(csc_beg);
300296
if (csc_idx != NULL) cupdlp_free(csc_idx);

highs/pdlp/cupdlp/cupdlp_utils.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -337,11 +337,8 @@ cupdlp_int PDHG_Clear(CUPDLPwork *w) {
337337
CUPDLPtimers *timers = w->timers;
338338
CUPDLPscaling *scaling = w->scaling;
339339

340-
if (timers) {
341-
timers_clear(w->settings->nLogLevel, timers);
342-
}
343340

344-
// cupdlp_float begin = getTimeStamp();
341+
cupdlp_float begin = getTimeStamp();
345342
#ifndef CUPDLP_CPU
346343

347344
// CUDAmv *MV = w->MV;
@@ -389,17 +386,19 @@ cupdlp_int PDHG_Clear(CUPDLPwork *w) {
389386
resobj_clear(resobj);
390387
}
391388

392-
// #ifndef CUPDLP_CPU
393-
// timers->FreeDeviceMemTime += getTimeStamp() - begin;
394-
// #endif
389+
#ifndef CUPDLP_CPU
390+
timers->FreeDeviceMemTime += getTimeStamp() - begin;
391+
#endif
395392

396393
if (settings) {
397394
settings_clear(settings);
398395
}
399396
if (stepsize) {
400397
stepsize_clear(stepsize);
401398
}
402-
399+
if (timers) {
400+
timers_clear(w->settings->nLogLevel, timers);
401+
}
403402
if (scaling) {
404403
// scaling_clear(scaling);
405404
// if (scaling->colScale) {

0 commit comments

Comments
 (0)