#60: update eigen; remove pressio repos and clone on configuration; update code to pressio 0.15.0 (16+17 changes to come)

Author: cwschilly

.gitignore

@@ -3,3 +3,4 @@ build
 end-to-end-roms/__pycache__/
 end-to-end-roms/customizations_2d_swe/__pycache__/
 .idea
+tpls/pressio-*

CMakeLists.txt

@@ -31,8 +31,11 @@ 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}")
 
-# Get Pressio libraries
-set(PRESSIO_REPOS "rom" "ops" "log")
+#===================================================
+# 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(

docs/source/build.rst

@@ -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,7 +4,7 @@ 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-rom/include

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

@@ -46,8 +46,8 @@
 //@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_advancers.hpp"
@@ -111,8 +111,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 +147,6 @@ int main(int argc, char *argv[])
     std::cout << "elapsed " << fs.count() << std::endl;
   }
 
-  pressio::log::finalize();
+  PRESSIOLOG_FINALIZE();
   return 0;
 }

tpls/eigen-3.4.0/Eigen/Cholesky

@@ -0,0 +1,45 @@
+// This file is part of Eigen, a lightweight C++ template library
+// for linear algebra.
+//
+// This Source Code Form is subject to the terms of the Mozilla
+// Public License v. 2.0. If a copy of the MPL was not distributed
+// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#ifndef EIGEN_CHOLESKY_MODULE_H
+#define EIGEN_CHOLESKY_MODULE_H
+
+#include "Core"
+#include "Jacobi"
+
+#include "src/Core/util/DisableStupidWarnings.h"
+
+/** \defgroup Cholesky_Module Cholesky module
+  *
+  *
+  *
+  * This module provides two variants of the Cholesky decomposition for selfadjoint (hermitian) matrices.
+  * Those decompositions are also accessible via the following methods:
+  *  - MatrixBase::llt()
+  *  - MatrixBase::ldlt()
+  *  - SelfAdjointView::llt()
+  *  - SelfAdjointView::ldlt()
+  *
+  * \code
+  * #include <Eigen/Cholesky>
+  * \endcode
+  */
+
+#include "src/Cholesky/LLT.h"
+#include "src/Cholesky/LDLT.h"
+#ifdef EIGEN_USE_LAPACKE
+#ifdef EIGEN_USE_MKL
+#include "mkl_lapacke.h"
+#else
+#include "src/misc/lapacke.h"
+#endif
+#include "src/Cholesky/LLT_LAPACKE.h"
+#endif
+
+#include "src/Core/util/ReenableStupidWarnings.h"
+
+#endif // EIGEN_CHOLESKY_MODULE_H