Pressio · fnrizzi · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024
diff --git a/include/pressio/ode/impl/ode_explicit_stepper_with_mass_matrix.hpp b/include/pressio/ode/impl/ode_explicit_stepper_with_mass_matrix.hpp
@@ -73,7 +73,7 @@ class ExplicitStepperWithMassMatrixImpl
 
 private:
   StepScheme name_;
-  ::pressio::utils::InstanceOrReferenceWrapper<SystemType> systemObj_;
+  ::pressio::nonlinearsolvers::impl::InstanceOrReferenceWrapper<SystemType> systemObj_;
   RightHandSideType rhsInstance_;
 
   // xInstances is a container of instances of states

diff --git a/include/pressio/ode/impl/ode_explicit_stepper_without_mass_matrix.hpp b/include/pressio/ode/impl/ode_explicit_stepper_without_mass_matrix.hpp
@@ -70,7 +70,7 @@ class ExplicitStepperNoMassMatrixImpl{
 
 private:
   StepScheme name_;
-  ::pressio::utils::InstanceOrReferenceWrapper<SystemType> systemObj_;
+  ::pressio::nonlinearsolvers::impl::InstanceOrReferenceWrapper<SystemType> systemObj_;
   std::vector<RightHandSideType> rhsInstances_;
   StateType auxiliaryState_;
 

diff --git a/include/pressio/ode/impl/ode_implicit_policy_residual_jacobian_with_mass_matrix.hpp b/include/pressio/ode/impl/ode_implicit_policy_residual_jacobian_with_mass_matrix.hpp
@@ -236,7 +236,7 @@ class ResidualJacobianWithMassMatrixStandardPolicy
   }
 
 private:
-  ::pressio::utils::InstanceOrReferenceWrapper<SystemType> systemObj_;
+  ::pressio::nonlinearsolvers::impl::InstanceOrReferenceWrapper<SystemType> systemObj_;
   mutable int32_t stepTracker_ = -1;
   mutable StateType scratchState_;
   mutable MassMatrixType massMatrix_;

diff --git a/include/pressio/ode/impl/ode_implicit_policy_residual_jacobian_without_mass_matrix.hpp b/include/pressio/ode/impl/ode_implicit_policy_residual_jacobian_without_mass_matrix.hpp
@@ -299,7 +299,7 @@ class ResidualJacobianStandardPolicy
   }
 
 private:
-  ::pressio::utils::InstanceOrReferenceWrapper<SystemType> systemObj_;
+  ::pressio::nonlinearsolvers::impl::InstanceOrReferenceWrapper<SystemType> systemObj_;
   mutable int32_t stepTracker_ = -1;
 };
 

diff --git a/include/pressio/ode/impl/ode_implicit_stepper_arbitrary.hpp b/include/pressio/ode/impl/ode_implicit_stepper_arbitrary.hpp
@@ -78,7 +78,7 @@ class StepperArbitrary
   IndVarType dt_ = {};
   typename StepCount::value_type stepNumber_  = {};
 
-  ::pressio::utils::InstanceOrReferenceWrapper<SystemType> systemObj_;
+  ::pressio::nonlinearsolvers::impl::InstanceOrReferenceWrapper<SystemType> systemObj_;
   stencil_states_t stencilStates_;
   // state object to ensure the strong guarantee for handling excpetions
   StateType recoveryState_;

diff --git a/include/pressio/ode/impl/ode_implicit_stepper_standard.hpp b/include/pressio/ode/impl/ode_implicit_stepper_standard.hpp
@@ -84,7 +84,7 @@ class ImplicitStepperStandardImpl
   // for cn  : y_n
   ImplicitStencilStatesDynamicContainer<StateType> stencil_states_;
 
-  ::pressio::utils::InstanceOrReferenceWrapper<ResidualJacobianPolicyType> rj_policy_;
+  ::pressio::nonlinearsolvers::impl::InstanceOrReferenceWrapper<ResidualJacobianPolicyType> rj_policy_;
 
   // stencilRightHandSide contains:
   // for bdf1,2: nothing

diff --git a/include/pressio/solvers_nonlinear/impl/diagnostics.hpp b/include/pressio/solvers_nonlinear/impl/diagnostics.hpp
@@ -2,6 +2,8 @@
 #ifndef SOLVERS_NONLINEAR_IMPL_DIAGNOSTICS_HPP_
 #define SOLVERS_NONLINEAR_IMPL_DIAGNOSTICS_HPP_
 
+#include <iostream>
+
 namespace pressio{
 namespace nonlinearsolvers{
 namespace impl{

diff --git a/...s/utils_instance_or_reference_wrapper.hpp → ...ar/impl/instance_or_reference_wrapper.hpp b/...s/utils_instance_or_reference_wrapper.hpp → ...ar/impl/instance_or_reference_wrapper.hpp
@@ -2,7 +2,7 @@
 //@HEADER
 // ************************************************************************
 //
-// utils_instance_or_reference_wrapper.hpp
+// instance_or_reference_wrapper.hpp
 //                     		  Pressio
 //                             Copyright 2019
 //    National Technology & Engineering Solutions of Sandia, LLC (NTESS)
@@ -46,12 +46,10 @@
 //@HEADER
 */
 
-#ifndef UTILS_UTILS_INSTANCE_OR_REFERENCE_WRAPPER_HPP_
-#define UTILS_UTILS_INSTANCE_OR_REFERENCE_WRAPPER_HPP_
+#ifndef SOLVERS_NONLINEAR_INSTANCE_OR_REFERENCE_WRAPPER_HPP_
+#define SOLVERS_NONLINEAR_INSTANCE_OR_REFERENCE_WRAPPER_HPP_
 
-#include <iostream>
-
-namespace pressio{ namespace utils{
+namespace pressio{ namespace nonlinearsolvers{ namespace impl{
 
 template <class T>
 class InstanceOrReferenceWrapper;
@@ -126,5 +124,5 @@ class InstanceOrReferenceWrapper<T const &>
   T const& get() const { return refObj_.get(); }
 };
 
-}} // end of namespace pressio::utils
-#endif  // UTILS_UTILS_INSTANCE_OR_REFERENCE_WRAPPER_HPP_
+}}} // end of namespace pressio::nonlinearsolvers::impl
+#endif  // SOLVERS_NONLINEAR_INSTANCE_OR_REFERENCE_WRAPPER_HPP_
diff --git a/include/pressio/solvers_nonlinear/impl/registries.hpp b/include/pressio/solvers_nonlinear/impl/registries.hpp
@@ -3,6 +3,7 @@
 #define SOLVERS_REGISTRIES_HPP_
 
 #include "levmar_damping.hpp"
+#include "instance_or_reference_wrapper.hpp"
 
 namespace pressio{
 namespace nonlinearsolvers{
@@ -33,7 +34,7 @@ class RegistryNewton
   state_t d2_;
   r_t d3_;
   j_t d4_;
-  utils::InstanceOrReferenceWrapper<InnSolverType> d5_;
+  InstanceOrReferenceWrapper<InnSolverType> d5_;
   SystemType const * d6_;
 
 public:
@@ -85,7 +86,7 @@ class RegistryGaussNewtonNormalEqs
   j_t d4_;
   gradient_t d5_;
   hessian_t d6_;
-  utils::InstanceOrReferenceWrapper<InnSolverType> d7_;
+  InstanceOrReferenceWrapper<InnSolverType> d7_;
   SystemType const * d8_;
 
 public:
@@ -146,8 +147,8 @@ class RegistryWeightedGaussNewtonNormalEqs
   j_t d6_;
   gradient_t d7_;
   hessian_t d8_;
-  utils::InstanceOrReferenceWrapper<InnSolverType> d9_;
-  utils::InstanceOrReferenceWrapper<WeightingOpType> d10_;
+  InstanceOrReferenceWrapper<InnSolverType> d9_;
+  InstanceOrReferenceWrapper<WeightingOpType> d10_;
   SystemType const * d11_;
 
 public:
@@ -211,7 +212,7 @@ class RegistryGaussNewtonQr
   j_t d4_;
   gradient_t d5_;
   QTr_t d6_;
-  utils::InstanceOrReferenceWrapper<QRSolverType> d7_;
+  InstanceOrReferenceWrapper<QRSolverType> d7_;
   SystemType const * d8_;
 
 public:
@@ -273,7 +274,7 @@ class RegistryLevMarNormalEqs
   hessian_t d6_;
   hessian_t d7_;
   lm_damp_t d8_;
-  utils::InstanceOrReferenceWrapper<InnSolverType> d9_;
+  InstanceOrReferenceWrapper<InnSolverType> d9_;
   SystemType const * d10_;
 
 public:

diff --git a/include/pressio/utils.hpp b/include/pressio/utils.hpp
@@ -50,9 +50,7 @@
 #define PRESSIO_UTILS_HPP_
 
 #include "./mpl.hpp"
-#include <iomanip>
 
-#include "./utils/utils_instance_or_reference_wrapper.hpp"
 #include "./utils/logger/utils_logger.hpp"
 
 #endif
diff --git a/tests/functional_small/ode_advancers/to_target_time_with_time_step_recovery.cc b/tests/functional_small/ode_advancers/to_target_time_with_time_step_recovery.cc
@@ -2,6 +2,8 @@
 //#include "pressio/ode_steppers_implicit.hpp"
 #include "pressio/ode_advancers.hpp"
 
+#include <iostream>
+
 struct MyFakeSolver
 {
   template<typename system_t, typename state_t>

diff --git a/tests/functional_small/solvers_nonlinear/gaussnewton_normaleqs_problem3_eigen.cc b/tests/functional_small/solvers_nonlinear/gaussnewton_normaleqs_problem3_eigen.cc
@@ -3,6 +3,8 @@
 #include "pressio/solvers_nonlinear_gaussnewton.hpp"
 #include "./problems/problem3.hpp"
 
+#include <iomanip>
+
 template <typename problem_t, typename state_t, typename solver>
 void testC1(std::string & sentinel,
             problem_t & problem,

diff --git a/tests/functional_small/solvers_nonlinear/gaussnewton_normaleqs_problem5_eigen.cc b/tests/functional_small/solvers_nonlinear/gaussnewton_normaleqs_problem5_eigen.cc
@@ -3,6 +3,8 @@
 #include "pressio/solvers_nonlinear_gaussnewton.hpp"
 #include "./problems/problem5.hpp"
 
+#include <iomanip>
+
 int main()
 {
   namespace plog   = pressio::log;

diff --git a/tests/functional_small/solvers_nonlinear/gaussnewton_normaleqs_problem9_eigen.cc b/tests/functional_small/solvers_nonlinear/gaussnewton_normaleqs_problem9_eigen.cc
@@ -3,6 +3,8 @@
 #include "pressio/solvers_nonlinear_gaussnewton.hpp"
 #include "./problems/problem9.hpp"
 
+#include <iomanip>
+
 int main()
 {
   namespace plog = pressio::log;

diff --git a/tests/functional_small/solvers_nonlinear/gaussnewton_qr_problem3_eigen.cc b/tests/functional_small/solvers_nonlinear/gaussnewton_qr_problem3_eigen.cc
@@ -3,6 +3,8 @@
 #include "pressio/solvers_nonlinear_gaussnewton.hpp"
 #include "./problems/problem3.hpp"
 
+#include <iomanip>
+
 template <typename state_t, typename solver>
 void testC1(std::string & sentinel,
             state_t & x,

diff --git a/tests/functional_small/solvers_nonlinear/gaussnewton_qr_problem8_eigen.cc b/tests/functional_small/solvers_nonlinear/gaussnewton_qr_problem8_eigen.cc
@@ -3,6 +3,8 @@
 #include "pressio/solvers_nonlinear_gaussnewton.hpp"
 #include "./problems/problem8.hpp"
 
+#include <iomanip>
+
 template <typename state_t, typename solver>
 void testC1(std::string & sentinel,
             state_t & x,

diff --git a/tests/functional_small/solvers_nonlinear/levmar_normaleqs_problem9_eigen.cc b/tests/functional_small/solvers_nonlinear/levmar_normaleqs_problem9_eigen.cc
@@ -3,6 +3,8 @@
 #include "pressio/solvers_nonlinear_levmarq.hpp"
 #include "./problems/problem9.hpp"
 
+#include <iomanip>
+
 template <typename problem_t, typename solver_t>
 void testC1(std::string & sentinel,
             problem_t & problem,

diff --git a/tests/functional_small/solvers_nonlinear/weighted_gaussnewton_normaleqs_problem3_eigen.cc b/tests/functional_small/solvers_nonlinear/weighted_gaussnewton_normaleqs_problem3_eigen.cc
@@ -3,6 +3,8 @@
 #include "pressio/solvers_nonlinear_gaussnewton.hpp"
 #include "./problems/problem3.hpp"
 
+#include <iomanip>
+
 template<class scalar_t>
 struct IdentityWeigher{