Skip to content

Commit ec1ecce

Browse files
Merge branch 'warning-parallel-papilo' into 'master'
add warning if PaPILO runs not sequential See merge request integer/scip!3874
2 parents 106fe1a + a173fe2 commit ec1ecce

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/scip/presol_milp.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,9 @@ SCIP_RETCODE performRationalPresolving(
532532

533533
/* call presolving (without storing information for dual postsolve) */
534534
SCIPverbMessage(scip, SCIP_VERBLEVEL_HIGH, NULL,
535-
" (%.1fs) running MILP presolver\n", SCIPgetSolvingTime(scip));
535+
" (%.1fs) running MILP presolver%s\n", SCIPgetSolvingTime(scip),
536+
presolve.getPresolveOptions().threads == 1 ? "" : " on multiple threads");
537+
536538
int oldnnz = problem.getConstraintMatrix().getNnz();
537539

538540
#if (PAPILO_VERSION_MAJOR >= 2)
@@ -1084,7 +1086,8 @@ SCIP_RETCODE performRealPresolving(
10841086

10851087
/* call the presolving */
10861088
SCIPverbMessage(scip, SCIP_VERBLEVEL_HIGH, NULL,
1087-
" (%.1fs) running MILP presolver\n", SCIPgetSolvingTime(scip));
1089+
" (%.1fs) running MILP presolver%s\n", SCIPgetSolvingTime(scip),
1090+
presolve.getPresolveOptions().threads == 1 ? "" : " on multiple threads");
10881091

10891092
/* call presolving without storing information for dual postsolve */
10901093
#if (PAPILO_VERSION_MAJOR >= 2)
@@ -1752,7 +1755,7 @@ SCIP_RETCODE SCIPincludePresolMILP(
17521755
"maximum number of threads presolving may use (0: automatic)",
17531756
&presoldata->threads, FALSE, DEFAULT_THREADS, 0, INT_MAX, NULL, NULL) );
17541757
#else
1755-
presoldata->threads = DEFAULT_THREADS;
1758+
presoldata->threads = 1;
17561759
#endif
17571760

17581761
SCIP_CALL( SCIPaddIntParam(scip,

0 commit comments

Comments
 (0)