Retune and move warnings

Author: filikat

highs/ipm/hipo/factorhighs/Symbolic.cpp

@@ -45,6 +45,7 @@ Int64 Symbolic::maxStackSize() const { return max_stack_size_; }
 bool Symbolic::parTree() const { return parallel_tree_; }
 bool Symbolic::parNode() const { return parallel_node_; }
 bool Symbolic::metisNo2hop() const { return metis_no2hop_; }
+double Symbolic::storage() const { return serial_storage_; }
 
 const std::vector<Int64>& Symbolic::ptr() const { return ptr_; }
 const std::vector<Int>& Symbolic::iperm() const { return iperm_; }
@@ -98,15 +99,6 @@ void Symbolic::print(const Log& log, bool verbose) const {
                << '\n';
   }
   log.print(log_stream);
-
-  // Warn about large fill-in
-  if (fillin_ > 50 && !metis_no2hop_) {
-    log.printw(
-        "Large fill-in in factorisation. Consider setting the "
-        "hipo_metis_no2hop option to true\n");
-  }
-
-  log.print("\n");
 }
 
 }  // namespace hipo

highs/ipm/hipo/factorhighs/Symbolic.h

@@ -129,6 +129,7 @@ class Symbolic {
   bool parTree() const;
   bool parNode() const;
   bool metisNo2hop() const;
+  double storage() const;
   const std::vector<Int64>& ptr() const;
   const std::vector<Int>& iperm() const;
   const std::vector<Int>& snParent() const;

highs/ipm/hipo/ipm/FactorHiGHSSolver.cpp

@@ -70,6 +70,21 @@ Int FactorHiGHSSolver::setup() {
   setParallel();
 
   S_.print(log_, log_.debug(1));
+
+  // Warn about large fill-in
+  if (S_.fillin() > kLargeFillin && !options_.metis_no2hop) {
+    log_.printw(
+        "Large fill-in in factorisation. Consider setting the "
+        "hipo_metis_no2hop option to true\n");
+  }
+
+  // Warn about large memory consumption
+  if (S_.storage() > kLargeStorageGB * 1024 * 1024 * 1024) {
+    log_.printw("Large amount of memory required\n");
+  }
+
+  log_.print("\n");
+
   return kStatusOk;
 }
 
@@ -496,7 +511,7 @@ Int FactorHiGHSSolver::chooseNla() {
       status = kStatusErrorAnalyse;
 
     log_.printe("Both NE and AS failed analyse phase\n");
-    if ((symb_AS.fillin() > 50 || symb_NE.fillin() > 50) &&
+    if ((symb_AS.fillin() > kLargeFillin || symb_NE.fillin() > kLargeFillin) &&
         !options_.metis_no2hop)
       log_.print(
           "Large fill-in in factorisation. Consider setting the "
@@ -629,6 +644,13 @@ void FactorHiGHSSolver::setParallel() {
       }
 #endif
 
+      // If serial memory is too large, switch off tree parallelism to avoid
+      // running out of memory
+      double num_GB = S_.storage() / 1024 / 1024 / 1024;
+      if (num_GB > kLargeStorageGB) {
+        parallel_tree = false;
+      }
+
       if (parallel_tree && parallel_node) {
         options_.parallel = kOptionParallelOn;
         log_stream << "Full preferred\n";

highs/ipm/hipo/ipm/Parameters.h

@@ -28,10 +28,12 @@ const double kSymbNzMult = 5.0;
 
 // parameters for choice of parallelism
 const double kLargeFlopsThresh = 1e7;
-const double kLargeSpeedupThresh = 1.5;
+const double kLargeSpeedupThresh = 1;
 const double kLargeSnThresh = 20.0;
-const double kSmallSnThresh = 5.0;
+const double kSmallSnThresh = 3.0;
 const Int kMinNumberSn = 10;
+const double kLargeStorageGB = 20.0;
+const double kLargeFillin = 50.0;
 
 // parameters for dense columns
 const double kDenseColThresh = 0.5;