addresed reviews

LLNL · Sep 25, 2024 · 27d15f2 · 27d15f2
1 parent 28c4567
commit 27d15f2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -291,11 +291,15 @@ if(HIOP_USE_RAJA)
 endif()
 
 if(HIOP_USE_AXOM)
-  find_package(AXOM CONFIG
-    PATHS ${AXOM_DIR} ${AXOM_DIR}/lib/cmake/
-    REQUIRED)
-  target_link_libraries(hiop_tpl INTERFACE axom)
-  message(STATUS "Found AXOM pkg-config: ${AXOM_CONFIG}")
+  if(HIOP_USE_MPI)
+    find_package(AXOM CONFIG
+      PATHS ${AXOM_DIR} ${AXOM_DIR}/lib/cmake/
+      REQUIRED)
+    target_link_libraries(hiop_tpl INTERFACE axom)
+    message(STATUS "Found AXOM pkg-config: ${AXOM_CONFIG}")
+  elseif(HIOP_USE_MPI)
+    message(FATAL_ERROR "Error: HIOP_USE_MPI is required when HIOP_USE_AXOM is ON")
+  endif()
 endif()
 
 

diff --git a/src/Optimization/hiopAlgFilterIPM.hpp b/src/Optimization/hiopAlgFilterIPM.hpp
@@ -79,7 +79,7 @@ class Group; // forward declaration
 
 namespace hiop
 {
-   
+
 class hiopAlgFilterIPMBase {
 public:
   hiopAlgFilterIPMBase(hiopNlpFormulation* nlp_, const bool within_FR = false);

diff --git a/src/Optimization/hiopKKTLinSys.cpp b/src/Optimization/hiopKKTLinSys.cpp
@@ -947,7 +947,6 @@ bool hiopKKTLinSys::compute_directions_w_IR(const hiopResidual* resid, hiopItera
   bool bret = bicgIR_->solve(dir, resid);
 
   nlp_->runStats.kkt.nIterRefinInner += bicgIR_->get_sol_num_iter();
-  //nlp_->runStats.kkt.tmSolveInner.stop();
   if(!bret) {
     nlp_->log->printf(hovWarning, "%s", bicgIR_->get_convergence_info().c_str());
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,7 +79,7 @@ class Group; // forward declaration @@
     namespace hiop
     {
     class hiopAlgFilterIPMBase {
     public:
       hiopAlgFilterIPMBase(hiopNlpFormulation* nlp_, const bool within_FR = false);
@@ Expand Down @@