From 27d15f2b6e7c13a9dcae285c4fd874b19e9ea432 Mon Sep 17 00:00:00 2001 From: Cosmin G Petra Date: Wed, 25 Sep 2024 07:24:00 -0700 Subject: [PATCH] addresed reviews --- CMakeLists.txt | 14 +++++++++----- src/Optimization/hiopAlgFilterIPM.hpp | 2 +- src/Optimization/hiopKKTLinSys.cpp | 1 - 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06787ee6..f356cc3c 100644 --- 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 index 4195fc9d..bf90fa97 100644 --- 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 index 2be80927..d91a3d64 100644 --- 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());