sleipnirgroup-jormungandr 0.5.4.dev6__tar.gz → 0.5.4.dev8__tar.gz

{sleipnirgroup_jormungandr-0.5.4.dev6 → sleipnirgroup_jormungandr-0.5.4.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sleipnirgroup-jormungandr
-Version: 0.5.4.dev6
+Version: 0.5.4.dev8
 Summary: Reverse mode autodiff library and NLP solver DSL
 License-Expression: BSD-3-Clause
 License-File: LICENSE.txt

{sleipnirgroup_jormungandr-0.5.4.dev6 → sleipnirgroup_jormungandr-0.5.4.dev8}/include/sleipnir/optimization/solver/interior_point.hpp

@@ -161,6 +161,7 @@ ExitStatus interior_point(
   solve_profilers.emplace_back("  ↳ KKT system solve");
   solve_profilers.emplace_back("  ↳ line search");
   solve_profilers.emplace_back("    ↳ SOC");
+  solve_profilers.emplace_back("  ↳ feas. restoration");
   solve_profilers.emplace_back("  ↳ f(x)");
   solve_profilers.emplace_back("  ↳ ∇f(x)");
   solve_profilers.emplace_back("  ↳ ∇²ₓₓL");
@@ -180,17 +181,18 @@ ExitStatus interior_point(
   auto& kkt_system_solve_prof = solve_profilers[7];
   auto& line_search_prof = solve_profilers[8];
   auto& soc_prof = solve_profilers[9];
+  auto& feasibility_restoration_prof = solve_profilers[10];
 
   // Set up profiled matrix callbacks
 #ifndef SLEIPNIR_DISABLE_DIAGNOSTICS
-  auto& f_prof = solve_profilers[10];
-  auto& g_prof = solve_profilers[11];
-  auto& H_prof = solve_profilers[12];
-  auto& H_c_prof = solve_profilers[13];
-  auto& c_e_prof = solve_profilers[14];
-  auto& A_e_prof = solve_profilers[15];
-  auto& c_i_prof = solve_profilers[16];
-  auto& A_i_prof = solve_profilers[17];
+  auto& f_prof = solve_profilers[11];
+  auto& g_prof = solve_profilers[12];
+  auto& H_prof = solve_profilers[13];
+  auto& H_c_prof = solve_profilers[14];
+  auto& c_e_prof = solve_profilers[15];
+  auto& A_e_prof = solve_profilers[16];
+  auto& c_i_prof = solve_profilers[17];
+  auto& A_i_prof = solve_profilers[18];
 
   InteriorPointMatrixCallbacks<Scalar> matrices{
       matrix_callbacks.num_decision_variables,
@@ -678,6 +680,9 @@ ExitStatus interior_point(
     line_search_profiler.stop();
 
     if (call_feasibility_restoration) {
+      ScopedProfiler feasibility_restoration_profiler{
+          feasibility_restoration_prof};
+
       // If already in feasibility restoration mode, running it again won't help
       if (in_feasibility_restoration) {
         return ExitStatus::FEASIBILITY_RESTORATION_FAILED;

{sleipnirgroup_jormungandr-0.5.4.dev6 → sleipnirgroup_jormungandr-0.5.4.dev8}/include/sleipnir/optimization/solver/sqp.hpp

@@ -120,7 +120,7 @@ ExitStatus sqp(const SQPMatrixCallbacks<Scalar>& matrix_callbacks,
   solve_profilers.emplace_back("  ↳ KKT system solve");
   solve_profilers.emplace_back("  ↳ line search");
   solve_profilers.emplace_back("    ↳ SOC");
-  solve_profilers.emplace_back("  ↳ next iter prep");
+  solve_profilers.emplace_back("  ↳ feas. restoration");
   solve_profilers.emplace_back("  ↳ f(x)");
   solve_profilers.emplace_back("  ↳ ∇f(x)");
   solve_profilers.emplace_back("  ↳ ∇²ₓₓL");
@@ -138,15 +138,16 @@ ExitStatus sqp(const SQPMatrixCallbacks<Scalar>& matrix_callbacks,
   auto& kkt_system_solve_prof = solve_profilers[7];
   auto& line_search_prof = solve_profilers[8];
   auto& soc_prof = solve_profilers[9];
+  auto& feasibility_restoration_prof = solve_profilers[10];
 
   // Set up profiled matrix callbacks
 #ifndef SLEIPNIR_DISABLE_DIAGNOSTICS
-  auto& f_prof = solve_profilers[10];
-  auto& g_prof = solve_profilers[11];
-  auto& H_prof = solve_profilers[12];
-  auto& H_c_prof = solve_profilers[13];
-  auto& c_e_prof = solve_profilers[14];
-  auto& A_e_prof = solve_profilers[15];
+  auto& f_prof = solve_profilers[11];
+  auto& g_prof = solve_profilers[12];
+  auto& H_prof = solve_profilers[13];
+  auto& H_c_prof = solve_profilers[14];
+  auto& c_e_prof = solve_profilers[15];
+  auto& A_e_prof = solve_profilers[16];
 
   SQPMatrixCallbacks<Scalar> matrices{
       matrix_callbacks.num_decision_variables,
@@ -493,6 +494,9 @@ ExitStatus sqp(const SQPMatrixCallbacks<Scalar>& matrix_callbacks,
     line_search_profiler.stop();
 
     if (call_feasibility_restoration) {
+      ScopedProfiler feasibility_restoration_profiler{
+          feasibility_restoration_prof};
+
       FilterEntry initial_entry{matrices.f(x), c_e};
 
       // Feasibility restoration phase

{sleipnirgroup_jormungandr-0.5.4.dev6 → sleipnirgroup_jormungandr-0.5.4.dev8}/python/src/sleipnir/__init__.py

@@ -2,4 +2,4 @@
 
 from ._sleipnir import *
 
-__version__ = "0.5.4.dev6"
+__version__ = "0.5.4.dev8"