Skip to content

Commit 71f1c30

Browse files
committed
Small fixes
1 parent 4485d0e commit 71f1c30

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

docs/src/installation.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ On Windows, do not forget to specify configuration type
5151
cmake --build build --config Release
5252
```
5353

54+
If a different version of Metis is used, make sure that it is compiled with 64-bit integers, or HiGHS will fail.
55+
5456
### HiPO
5557

5658
To install HiPO, on Linux and MacOS, run

highs/io/HighsIO.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,13 @@ void highsLogHeader(const HighsLogOptions& log_options,
3030

3131
#ifdef HIPO
3232
#ifdef BLAS_LIBRARIES
33-
highsLogUser(log_options, HighsLogType::kInfo, "Using blas: %s\n",
34-
BLAS_LIBRARIES);
33+
highsLogUser(log_options, HighsLogType::kInfo, "Using blas: %s - %s\n",
34+
BLAS_LIBRARIES, hipo::getBlasIntegerModelString().c_str());
3535
#else
36-
highsLogUser(log_options, HighsLogType::kInfo, "Using blas: unknown\n");
37-
#endif
38-
39-
highsLogUser(log_options, HighsLogType::kInfo, "Blas integer model: %s\n",
36+
highsLogUser(log_options, HighsLogType::kInfo, "Using blas: unknown - %s\n",
4037
hipo::getBlasIntegerModelString().c_str());
4138
#endif
39+
#endif
4240
}
4341

4442
std::array<char, 32> highsDoubleToString(const double val,

highs/ipm/hipo/factorhighs/Analyse.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,11 +1333,6 @@ Int64 Analyse::run(Symbolic& S) {
13331333
computeBlockStart();
13341334
computeCriticalPath();
13351335

1336-
if (checkOverflow()) {
1337-
if (log_) log_->printe("Integer overflow in analyse phase\n");
1338-
return kRetIntOverflow;
1339-
}
1340-
13411336
// move relevant stuff into S
13421337
S.n_ = n_;
13431338
S.sn_ = sn_count_;
@@ -1364,6 +1359,11 @@ Int64 Analyse::run(Symbolic& S) {
13641359
if (i <= 100) S.sn_size_100_++;
13651360
}
13661361

1362+
if (checkOverflow()) {
1363+
if (log_) log_->printe("Integer overflow in analyse phase\n");
1364+
return kRetIntOverflow;
1365+
}
1366+
13671367
// permute signs of pivots
13681368
S.pivot_sign_ = std::move(signs_);
13691369
permuteVector(S.pivot_sign_, perm_);

0 commit comments

Comments
 (0)