Restore progress bar behavior during solve

jeromerobert · Dec 9, 2024 · 9d82162 · 9d82162
1 parent ce0c73e
commit 9d82162
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/c_default_interface.cpp b/src/c_default_interface.cpp
@@ -317,6 +317,7 @@ void hmat_factorization_context_init(hmat_factorization_context_t *context) {
 
 void hmat_solve_context_init(hmat_solve_context_t * context) {
     memset(context, 0, sizeof(*context));
+    context->progress = DefaultProgress::getInstance();
 }
 
 void hmat_delete_procedure(hmat_procedure_t* proc) {

diff --git a/src/c_wrapping.hpp b/src/c_wrapping.hpp
@@ -505,6 +505,10 @@ int solve_generic(hmat_matrix_t* holder, const struct hmat_solve_context_t* cont
                   "lower and upper cannot both be true in hmat_solve_context_t");
   DECLARE_CONTEXT;
   hmat::HMatInterface<T>* hmat = (hmat::HMatInterface<T>*)holder;
+  // Solve functions do not receive a progress bar as argument, they use the one
+  // stored in HMatInterface.  Temporarily modify progress bar.
+  hmat_progress_t * saved_progress = hmat->engine().progress();
+  hmat->progress(context->progress);
   try {
       if (context->nr_rhs == 0) {
           // B is an HMatrix
@@ -530,8 +534,12 @@ int solve_generic(hmat_matrix_t* holder, const struct hmat_solve_context_t* cont
       }
   } catch (const std::exception& e) {
       fprintf(stderr, "%s\n", e.what());
+      // Restore progress bar
+      hmat->progress(saved_progress);
       return 1;
   }
+  // Restore progress bar
+  hmat->progress(saved_progress);
   return 0;
 }