[INFO] report which ILP lib we use

cbielow · Oct 26, 2023 · 7dabf9d · 7dabf9d
1 parent 9513f43
commit 7dabf9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/openms/source/DATASTRUCTURES/LPWrapper.cpp b/src/openms/source/DATASTRUCTURES/LPWrapper.cpp
@@ -55,6 +55,7 @@ namespace OpenMS
 {
   LPWrapper::LPWrapper()
   {
+    // note: should this mechanism ever change, also look at TOPP/OpenMSInfo.cpp
 #if COINOR_SOLVER == 1
     solver_ = SOLVER_COINOR;
     model_ = new CoinModel;

diff --git a/src/topp/OpenMSInfo.cpp b/src/topp/OpenMSInfo.cpp
@@ -60,6 +60,7 @@ Source path  : C:/dev/openms/src/openms
 Binary path  : C:/dev/openms_build/src/openms
 Binary arch  : 64 bit
 Build type   : Release
+LP-Solver    : COIN-OR
 OpenMP       : enabled (maxThreads = 32)
 SIMD extensions : SSE, SSE2, SSE3, SSE4.1, AVX
 
@@ -116,6 +117,11 @@ class TOPPOpenMSInfo : public TOPPBase
     cout << "Binary path  : " << OPENMS_BINARY_PATH << "\n";
     cout << "Binary arch  : " << Internal::OpenMSOSInfo::getBinaryArchitecture() << "\n";
     cout << "Build type   : " << Internal::OpenMSBuildInfo::getBuildType() << "\n";
+#if COINOR_SOLVER == 1
+    cout << "LP-Solver    : COIN-OR\n";
+#else
+    cout << "LP-Solver    : GLPK\n";
+#endif
     #ifdef _OPENMP
     cout << "OpenMP       : " << "enabled (maxThreads = " << Internal::OpenMSBuildInfo::getOpenMPMaxNumThreads() << ")" << "\n";
     #else