Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion highs/io/HighsIO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ void highsLogHeader(const HighsLogOptions& log_options,

#ifdef HIPO
#ifdef BLAS_LIBRARIES
highsLogUser(log_options, HighsLogType::kInfo, "Using blas: %s\n", BLAS_LIBRARIES);
highsLogUser(log_options, HighsLogType::kInfo, "Using blas: %s\n",
BLAS_LIBRARIES);
#else
highsLogUser(log_options, HighsLogType::kInfo, "Using blas: unknown\n");
#endif
Expand Down
11 changes: 9 additions & 2 deletions highs/mip/HighsLpRelaxation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1098,6 +1098,8 @@ HighsLpRelaxation::Status HighsLpRelaxation::run(bool resolve_on_error) {
const std::string mip_lp_solver = mipsolver.options_mip_->mip_lp_solver;
if (useIpm(mip_lp_solver)) {
bool use_hipo = mip_lp_solver == kHipoString;
// Later still, pass mip_lp_solver and take action on failure in
// solveLp
#ifndef HIPO
// Shouldn't be possible to choose HiPO if it's not in the build
assert(!use_hipo);
Expand Down Expand Up @@ -1318,10 +1320,15 @@ HighsLpRelaxation::Status HighsLpRelaxation::run(bool resolve_on_error) {
// here. Later pass mip_ipm_solver and take action on failure in
// solveLp
bool use_hipo =
#ifdef HIPO
/*
#ifdef HIPO
// Later use HiPO by default
mip_ipm_solver == kHighsChooseString ||
#endif
#endif
*/
mip_ipm_solver == kHipoString;
// Later still, pass mip_ipm_solver and take action on failure in
// solveLp
#ifndef HIPO
// Shouldn't be possible to choose HiPO if it's not in the build
assert(!use_hipo);
Expand Down
Loading