Skip to content

Commit 767079a

Browse files
committed
Update information line on threads + workers
1 parent 569e0c7 commit 767079a

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

highs/mip/HighsMipSolverData.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,14 +1094,19 @@ void HighsMipSolverData::runSetup() {
10941094
"%" HIGHSINT_FORMAT " continuous, "
10951095
"%" HIGHSINT_FORMAT " domain fixed)\n"
10961096
" %" HIGHSINT_FORMAT " nonzero%s\n"
1097-
" %" HIGHSINT_FORMAT " threads and "
1098-
"%" HIGHSINT_FORMAT " max workers\n",
1097+
" Thread count %" HIGHSINT_FORMAT " (of "
1098+
"%" HIGHSINT_FORMAT " threads). "
1099+
"Using %" HIGHSINT_FORMAT " max workers. "
1100+
"Parallel search %s\n",
10991101
// clang-format on
11001102
mipsolver.numRow(), mipsolver.numRow() == 1 ? "" : "s", num_col,
11011103
num_col == 1 ? "" : "s", num_binary, num_general_integer,
11021104
num_implied_integer, num_continuous, num_domain_fixed,
11031105
mipsolver.numNonzero(), mipsolver.numNonzero() == 1 ? "" : "s",
1104-
HighsInt{highs::parallel::num_threads()}, mipsolver.getMaxNumWorkers());
1106+
HighsInt{highs::parallel::num_threads()},
1107+
HighsInt{static_cast<int>(std::thread::hardware_concurrency())},
1108+
mipsolver.getMaxNumWorkers(),
1109+
mipsolver.getMaxNumWorkers() > 1 ? "on" : "off");
11051110
} else {
11061111
highsLogUser(mipsolver.options_mip_->log_options, HighsLogType::kInfo,
11071112
"Model after restart has "

0 commit comments

Comments
 (0)