mnir fixes

polyfem · Sep 29, 2023 · 40b2093 · 40b2093
1 parent 7ec7323
commit 40b2093
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/polysolve/nonlinear/Solver.cpp b/src/polysolve/nonlinear/Solver.cpp
@@ -372,14 +372,13 @@ namespace polysolve::nonlinear
 
     void Solver::log_times()
     {
-        // TODO
         m_logger.debug(
             "[{}] grad {:.3g}s, assembly {:.3g}s, inverting {:.3g}s, "
             "line_search {:.3g}s, constraint_set_update {:.3g}s, "
             "obj_fun {:.3g}s, checking_for_nan_inf {:.3g}s, "
             "broad_phase_ccd {:.3g}s, ccd {:.3g}s, "
             "classical_line_search {:.3g}s",
-            // fmt::format(fmt::fg(fmt::terminal_color::magenta), "timing"),
+            fmt::format(fmt::fg(fmt::terminal_color::magenta), "timing"),
             grad_time, assembly_time, inverting_time, line_search_time,
             constraint_set_update_time + (m_line_search ? m_line_search->constraint_set_update_time : 0),
             obj_fun_time, m_line_search ? m_line_search->checking_for_nan_inf_time : 0,

diff --git a/src/polysolve/nonlinear/Utils.cpp b/src/polysolve/nonlinear/Utils.cpp
@@ -10,7 +10,7 @@ namespace polysolve::nonlinear
         throw std::runtime_error(msg);
     }
 
-    inline Eigen::SparseMatrix<double> sparse_identity(int rows, int cols)
+    Eigen::SparseMatrix<double> sparse_identity(int rows, int cols)
     {
         Eigen::SparseMatrix<double> I(rows, cols);
         I.setIdentity();

diff --git a/src/polysolve/nonlinear/line_search/LineSearch.cpp b/src/polysolve/nonlinear/line_search/LineSearch.cpp
@@ -113,13 +113,13 @@ namespace polysolve::nonlinear::line_search
             return std::nan("");
         }
 
-        { // clang-format off
-				//#pragma STDC FENV_ACCESS ON
-				const int current_round = std::fegetround();
-				std::fesetround(FE_DOWNWARD);
-				step_size *= max_step_size; // TODO: check me if correct
-				std::fesetround(current_round);
-				} // clang-format on
+        {
+            // #pragma STDC FENV_ACCESS ON
+            const int current_round = std::fegetround();
+            std::fesetround(FE_DOWNWARD);
+            step_size *= max_step_size; // TODO: check me if correct
+            std::fesetround(current_round);
+        }
 
         // m_logger->trace("\t\tpre TOI={}, ss={}", max_step_size, step_size);