Merge pull request #61 from Pressio/60-bump-version-to-0170-and-fix-any-resulting-bugs

Author: Francesco Rizzi

.gitignore

@@ -1,5 +1,15 @@
+# artifacts
 docs/generated_docs
 build
-end-to-end-roms/__pycache__/
-end-to-end-roms/customizations_2d_swe/__pycache__/
+install
+
+# pressio repos
+pressio-demoapps
+pressio-rom
+pressio-ops
+pressio-log
+
+# misc
+.vscode
+__pycache__
 .idea

CMakeLists.txt

@@ -31,11 +31,21 @@ get_version_number("version.txt" PressioTutorials_VERSION_PATCH)
 set(PressioTutorials_VERSION "${PressioTutorials_VERSION_MAJOR}.${PressioTutorials_VERSION_MINOR}.${PressioTutorials_VERSION_PATCH}")
 message("pressio-tutorials version = ${PressioTutorials_VERSION}")
 
-set(pressio_version ${CMAKE_CURRENT_SOURCE_DIR}/tpls/pressio/version.txt)
-get_version_number(${pressio_version} MyPressio_VERSION_MAJOR)
-get_version_number(${pressio_version} MyPressio_VERSION_MINOR)
-get_version_number(${pressio_version} MyPressio_VERSION_PATCH)
-message("pressio version           = ${MyPressio_VERSION_MAJOR}.${MyPressio_VERSION_MINOR}.${MyPressio_VERSION_PATCH}")
+#===================================================
+# fetch pressio libraries
+#===================================================
+
+set(PRESSIO_REPOS "demoapps" "rom" "ops" "log")
+foreach(repo IN LISTS PRESSIO_REPOS)
+  if (NOT EXISTS ${CMAKE_SOURCE_DIR}/tpls/pressio-${repo})
+    execute_process(
+      COMMAND git clone --branch ${PressioTutorials_VERSION}
+              https://github.com/Pressio/pressio-${repo}.git
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tpls
+      OUTPUT_QUIET
+    )
+  endif()
+endforeach()
 
 #===================================================
 # c++ standard

docs/source/build.rst

@@ -28,7 +28,7 @@ Steps
    cd $BUILDDIR && make -j4
 
    # ensure you have all required Python packages installed
-   pip3 install <path-to-your-cloned-repo>/py_requirements.txt
+   pip3 install -r <path-to-your-cloned-repo>/py_requirements.txt
 
 
 Verify the build
@@ -50,7 +50,9 @@ More details on dependencies
 
 The tutorials have the following dependencies:
 
-- pressio-rom C++ library: contains the C++ code that this tutorials repo convers
+- pressio-rom C++ library: contains the C++ code that this tutorials repo covers
 - pressio-demoapps: provides a suite of physics problems that are used in the tutorials to demonstrate the functionalities of pressio
 - Eigen: is the library used by pressio-demoapps
 - Python: is used in pressio-demoapps to implement all the ROM workflow drivers
+
+During configuration, all Pressio repositories will be automatically cloned inside of the tutorials directory.

docs/source/conf.py

@@ -45,7 +45,7 @@
 project = "pressio-tutorials"
 copyright = u"2021, National Technology & Engineering Solutions of Sandia, LLC (NTESS)"
 
-version = "0.16.0"
+version = "0.17.0"
 
 # The full version, including alpha/beta/rc tags.
 release = version

end-to-end-roms/CMakeLists.txt

@@ -4,10 +4,12 @@ add_subdirectory(
   ${CMAKE_CURRENT_BINARY_DIR}/yamlcpp)
 
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../tpls/eigen/eigen3
+  ${CMAKE_CURRENT_SOURCE_DIR}/../tpls/eigen-3.4.0
   ${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio-demoapps/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../tpls #this is needed to include the pressio_cmake_config.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio-rom/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio-ops/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio-log/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../tpls/yaml-cpp-0.7.0/include)
 
 set(exename pdaWfExe)

end-to-end-roms/cpp/lspg_pick_solver_and_run.hpp

@@ -55,7 +55,7 @@ void lspg_pick_solver_and_run(const ParserType & parser,
 			      RomStateType & reducedState)
 {
   namespace pode   = pressio::ode;
-  namespace pnlins = pressio::nonlinearsolvers;
+  namespace pnlins = pressio::nlsol;
 
   using scalar_type = typename pressio::Traits<RomStateType>::scalar_type;
   const auto startTime = static_cast<typename LspgStepperType::independent_variable_type>(0);
@@ -65,48 +65,45 @@ void lspg_pick_solver_and_run(const ParserType & parser,
   if (parser.nonlinearSolver() == "GaussNewton")
   {
   using hessian_t       = Eigen::Matrix<scalar_type, -1, -1>;
-  using solver_tag      = pressio::linearsolvers::direct::HouseholderQR;
-  using linear_solver_t = pressio::linearsolvers::Solver<solver_tag, hessian_t>;
+  using solver_tag      = pressio::linsol::direct::HouseholderQR;
+  using linear_solver_t = pressio::linsol::Solver<solver_tag, hessian_t>;
   linear_solver_t linearSolver;
 
-  auto solver = pressio::create_gauss_newton_solver(lspgStepper, linearSolver);
+  auto solver = pressio::nlsol::create_gauss_newton_solver(lspgStepper, linearSolver);
   solver.setStopCriterion(pnlins::Stop::WhenAbsolutel2NormOfGradientBelowTolerance);
   solver.setStopTolerance(parser.nonlinearSolverTolerance());
 
-  pode::advance_n_steps(lspgStepper, reducedState, startTime,
-			parser.timeStepSize(), numSteps,
-			observer, solver);
+  auto policy = pode::steps_fixed_dt(startTime, numSteps, parser.timeStepSize());
+  pode::advance(lspgStepper, reducedState, policy, solver, observer);
   }
 
   else if (parser.nonlinearSolver() == "GaussNewtonQR")
   {
   using mat_t = typename LspgStepperType::jacobian_type;
   using qr_solver_t = pressio::qr::QRSolver<mat_t, pressio::qr::Householder>;
   qr_solver_t qrSolver;
-  auto solver = pressio::experimental::create_gauss_newton_qr_solver(lspgStepper, qrSolver);
+  auto solver = pressio::nlsol::experimental::create_gauss_newton_qr_solver(lspgStepper, qrSolver);
   solver.setStopCriterion(pnlins::Stop::WhenAbsolutel2NormOfGradientBelowTolerance);
   solver.setStopTolerance(parser.nonlinearSolverTolerance());
 
-  pode::advance_n_steps(lspgStepper, reducedState, startTime,
-			parser.timeStepSize(), numSteps,
-			observer, solver);
+  auto policy = pode::steps_fixed_dt(startTime, numSteps, parser.timeStepSize());
+  pode::advance(lspgStepper, reducedState, policy, solver, observer);
   }
 
   else if (parser.nonlinearSolver() == "LevenbergMarquardt")
   {
   using hessian_t       = Eigen::Matrix<scalar_type, -1, -1>;
-  using solver_tag      = pressio::linearsolvers::direct::HouseholderQR;
-  using linear_solver_t = pressio::linearsolvers::Solver<solver_tag, hessian_t>;
+  using solver_tag      = pressio::linsol::direct::HouseholderQR;
+  using linear_solver_t = pressio::linsol::Solver<solver_tag, hessian_t>;
   linear_solver_t linearSolver;
 
-  auto solver = pressio::create_levenberg_marquardt_solver(lspgStepper, linearSolver);
+  auto solver = pressio::nlsol::create_levenberg_marquardt_solver(lspgStepper, linearSolver);
   solver.setUpdateCriterion(pnlins::Update::LMSchedule2);
   solver.setStopCriterion(pnlins::Stop::WhenAbsolutel2NormOfGradientBelowTolerance);
   solver.setStopTolerance(parser.nonlinearSolverTolerance());
 
-  pode::advance_n_steps(lspgStepper, reducedState, startTime,
-			parser.timeStepSize(), numSteps,
-			observer, solver);
+  auto policy = pode::steps_fixed_dt(startTime, numSteps, parser.timeStepSize());
+  pode::advance(lspgStepper, reducedState, policy, solver, observer);
   }
 }
 #endif

end-to-end-roms/cpp/main.cc

@@ -46,10 +46,9 @@
 //@HEADER
 */
 
+#include "pressio_cmake_config.h"
 #include "pressiodemoapps/swe2d.hpp"
-
-#include "pressio/ode_steppers_explicit.hpp"
-#include "pressio/ode_steppers_implicit.hpp"
+#include "pressio/ode_steppers.hpp"
 #include "pressio/ode_advancers.hpp"
 
 #include "parsers.hpp"
@@ -111,8 +110,8 @@ std::string check_and_get_inputfile(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  pressio::log::initialize(pressio::logto::terminal);
-  pressio::log::setVerbosity({pressio::log::level::info});
+  PRESSIOLOG_INITIALIZE(pressiolog::LogLevel::info);
+
 
   // local scope because it is helps
   {
@@ -147,6 +146,6 @@ int main(int argc, char *argv[])
     std::cout << "elapsed " << fs.count() << std::endl;
   }
 
-  pressio::log::finalize();
+  PRESSIOLOG_FINALIZE();
   return 0;
 }

end-to-end-roms/cpp/observer.hpp

@@ -66,7 +66,7 @@ class StateObserver
   std::enable_if_t< pressio::is_vector_eigen<ObservableType>::value >
   operator()(pressio::ode::StepCount step,
 	     const TimeType /*timeIn*/,
-	     const ObservableType & state)
+	     const ObservableType & state) const
   {
     if (step.get() % sampleFreq_ == 0){
       const std::size_t ext = state.size()*sizeof(typename ObservableType::Scalar);
@@ -75,7 +75,7 @@ class StateObserver
   }
 
 private:
-  std::ofstream myfile_;
+  mutable std::ofstream myfile_;
   const int sampleFreq_ = {};
 };
 
@@ -97,7 +97,7 @@ class RhsObserver
   operator()(pressio::ode::StepCount step,
 	     pressio::ode::IntermediateStepCount /*imStepCount*/,
 	     const TimeType /*timeIn*/,
-	     const ObservableType & rhs)
+	     const ObservableType & rhs) const
   {
     if (step.get() % sampleFreq_ == 0){
       const std::size_t ext = rhs.size()*sizeof(typename ObservableType::Scalar);
@@ -106,7 +106,7 @@ class RhsObserver
   }
 
 private:
-  std::ofstream myfile_;
+  mutable std::ofstream myfile_;
   const int sampleFreq_ = {};
 };
 

end-to-end-roms/cpp/run_default_galerkin.hpp

@@ -83,8 +83,8 @@ void run_galerkin_default(const FomSystemType & fomSystem,
 
   typename FomSystemType::time_type startTime{0};
   const auto numSteps = pode::StepCount{parser.numSteps()};
-  pode::advance_n_steps(problem, reducedState, startTime,
-			parser.timeStepSize(), numSteps, observer);
+  auto policy = pode::steps_fixed_dt(startTime, numSteps, parser.timeStepSize());
+  pode::advance(problem, reducedState, policy, observer);
   }
   else{
     throw std::runtime_error("Default implicit galerkin not impl yet");

end-to-end-roms/cpp/run_default_lspg.hpp

@@ -78,7 +78,7 @@ void run_lspg_default(const FomSystemType & fomSystem,
 
   const auto odeScheme = parser.odeScheme();
   auto problem = plspg::create_unsteady_problem(odeScheme, trialSpace, fomSystem);
-  lspg_pick_solver_and_run(parser, problem.lspgStepper(), reducedState);
+  lspg_pick_solver_and_run(parser, problem, reducedState);
 }
 
 #endif