Skip to content

Commit 50d1035

Browse files
committed
points 1. and 2.
1 parent 0825c4e commit 50d1035

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

check/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
4848
TestHighsRbTree.cpp
4949
TestHighsSparseMatrix.cpp
5050
TestHighsVersion.cpp
51-
TestHipo.cpp
5251
TestHSet.cpp
5352
TestICrash.cpp
5453
TestIis.cpp
@@ -82,6 +81,11 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
8281
TestUserScale.cpp
8382
Avgas.cpp)
8483

84+
85+
if (HIPO)
86+
list(APPEND TEST_SOURCES TestHipo.cpp)
87+
endif()
88+
8589
set(OPT_LEVEL_CHANGED OFF)
8690

8791
if(CMAKE_CXX_FLAGS_RELEASE MATCHES "-O[0-9s]" AND NOT CMAKE_CXX_FLAGS_RELEASE MATCHES "-O3")

highs/lp_data/HighsSolve.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,11 +718,18 @@ bool useHipo(const HighsOptions& options,
718718
use_hipo = false;
719719
} else if (specific_solver_option_value == kIpmString ||
720720
specific_solver_option_value == kHipoString || force_ipm) {
721+
721722
#ifdef HIPO
722723
use_hipo = true;
723724
#else
725+
if (specific_solver_option_value == kHipoString) {
726+
highsLogUser(options.log_options, HighsLogType::kError,
727+
"HiPO is not available in this build.\n");
728+
return HighsStatus::kError;
729+
724730
use_hipo = false;
725731
#endif
732+
726733
}
727734
if (options.run_centring) use_hipo = false;
728735
// Later decide between HiPO and IPX based on LP properties

0 commit comments

Comments
 (0)