Updated dependencies

Author: zfergus

CMakeLists.txt

@@ -85,10 +85,5 @@ if(FINITE_DIFF_BUILD_UNIT_TESTS)
     include(CTest)
     enable_testing()
 
-    # Include Catch2 and provide function `catch_discover_tests` to register tests.
-    include(catch2)
-    FetchContent_GetProperties(catch2)
-    include("${catch2_SOURCE_DIR}/contrib/Catch.cmake")
-
     add_subdirectory(tests)
 endif()

cmake/recipes/catch2.cmake

@@ -19,7 +19,7 @@ include(FetchContent)
 FetchContent_Declare(
     catch2
     GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG v2.13.7
+    GIT_TAG v3.0.1
     GIT_SHALLOW TRUE
 )
 FetchContent_MakeAvailable(catch2)

cmake/recipes/eigen.cmake

@@ -25,7 +25,7 @@ else()
     FetchContent_Declare(
         eigen
         GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
-        GIT_TAG tags/3.3.7
+        GIT_TAG tags/3.4.0
         GIT_SHALLOW TRUE
     )
     FetchContent_GetProperties(eigen)

cmake/recipes/spdlog.cmake

@@ -19,7 +19,7 @@ include(FetchContent)
 FetchContent_Declare(
     spdlog
     GIT_REPOSITORY https://github.com/gabime/spdlog.git
-    GIT_TAG v1.9.2
+    GIT_TAG v1.10.0
     GIT_SHALLOW TRUE
 )
 

tests/CMakeLists.txt

@@ -3,8 +3,6 @@
 ################################################################################
 
 add_executable(finitediff_tests
-  main.cpp
-
   test_gradient.cpp
   test_jacobian.cpp
   test_hessian.cpp
@@ -21,7 +19,7 @@ include(finitediff_warnings)
 target_link_libraries(finitediff_tests PRIVATE finitediff::warnings)
 
 include(catch2)
-target_link_libraries(finitediff_tests PUBLIC Catch2::Catch2)
+target_link_libraries(finitediff_tests PUBLIC Catch2::Catch2WithMain)
 
 ################################################################################
 # Compiler options
@@ -33,9 +31,9 @@ target_link_libraries(finitediff_tests PUBLIC Catch2::Catch2)
 # Register tests
 ################################################################################
 
-foreach(source IN ITEMS ${test_sources})
-   source_group("tests" FILES "${source}")
-endforeach()
+FetchContent_GetProperties(catch2)
+list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
+include(Catch)
 
 # Register tests
 set(PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS ON)

tests/main.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <finitediff.hpp>
 

tests/test_flatten.cpp

@@ -1,7 +1,9 @@
 #include <iostream>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators_all.hpp>
+
 #include <Eigen/Core>
-#include <catch2/catch.hpp>
 
 #include <finitediff.hpp>
 
@@ -15,7 +17,7 @@ TEST_CASE("Test finite difference gradient of quadratic", "[gradient]")
     Eigen::MatrixXd A = Eigen::MatrixXd::Random(n, n);
     Eigen::VectorXd b = Eigen::VectorXd::Random(n);
 
-    const auto f = [&](const Eigen::VectorXd x) -> double {
+    const auto f = [&](const Eigen::VectorXd& x) -> double {
         return (x.transpose() * A * x + b.transpose() * x)(0);
     };
 
@@ -33,13 +35,13 @@ TEST_CASE("Test finite difference gradient of quadratic", "[gradient]")
 
 TEST_CASE("Test finite difference gradient of Rosenbrock", "[gradient]")
 {
-    const auto f = [](const Eigen::VectorXd x) {
+    const auto f = [](const Eigen::VectorXd& x) {
         double t1 = 1 - x[0];
         double t2 = (x[1] - x[0] * x[0]);
         return t1 * t1 + 100 * t2 * t2;
     };
 
-    const auto fdiff = [](const Eigen::VectorXd x) {
+    const auto fdiff = [](const Eigen::VectorXd& x) {
         return Eigen::Vector2d(
             -2 * (1 - x[0]) + 200 * (x[1] - x[0] * x[0]) * (-2 * x[0]),
             200 * (x[1] - x[0] * x[0]));
@@ -61,7 +63,7 @@ TEST_CASE("Test finite difference gradient of trig", "[gradient]")
 {
     int n = GENERATE(1, 2, 4, 10, 100);
 
-    const auto f = [&](const Eigen::VectorXd x) -> double {
+    const auto f = [&](const Eigen::VectorXd& x) -> double {
         return x.array().sin().matrix().squaredNorm();
     };
 

tests/test_gradient.cpp

@@ -1,7 +1,9 @@
 #include <iostream>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators_all.hpp>
+
 #include <Eigen/Core>
-#include <catch2/catch.hpp>
 
 #include <finitediff.hpp>
 #include <spdlog/spdlog.h>
@@ -18,7 +20,7 @@ TEST_CASE("Test finite difference hessian of quadratic", "[hessian]")
     Eigen::MatrixXd A = Eigen::MatrixXd::Random(n, n);
     Eigen::VectorXd b = Eigen::VectorXd::Random(n);
 
-    const auto f = [&](const Eigen::VectorXd x) -> double {
+    const auto f = [&](const Eigen::VectorXd& x) -> double {
         return (x.transpose() * A * x + b.transpose() * x)(0);
     };
 
@@ -36,7 +38,7 @@ TEST_CASE("Test finite difference hessian of quadratic", "[hessian]")
 TEST_CASE("Test finite difference hessian of Rosenbrock", "[hessian]")
 {
     AccuracyOrder accuracy = GENERATE(SECOND, FOURTH, SIXTH, EIGHTH);
-    const auto f = [](const Eigen::VectorXd x) {
+    const auto f = [](const Eigen::VectorXd& x) {
         double t1 = 1 - x[0];
         double t2 = (x[1] - x[0] * x[0]);
         return t1 * t1 + 100 * t2 * t2;
@@ -61,7 +63,7 @@ TEST_CASE("Test finite difference hessian of trig", "[hessian]")
     AccuracyOrder accuracy = GENERATE(SECOND, FOURTH, SIXTH, EIGHTH);
     int n = GENERATE(1, 2, 4, 10, 25);
 
-    const auto f = [&](const Eigen::VectorXd x) -> double {
+    const auto f = [&](const Eigen::VectorXd& x) -> double {
         return x.array().sin().matrix().squaredNorm();
     };
 

tests/test_hessian.cpp

@@ -1,7 +1,9 @@
 #include <iostream>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators_all.hpp>
+
 #include <Eigen/Core>
-#include <catch2/catch.hpp>
 
 #include <finitediff.hpp>
 
@@ -14,7 +16,7 @@ TEST_CASE("Test finite difference jacobian of linear", "[jacobian]")
     // f(x) = Ax
     Eigen::MatrixXd A = Eigen::MatrixXd::Random(n, n);
 
-    const auto f = [&](const Eigen::VectorXd x) -> Eigen::VectorXd {
+    const auto f = [&](const Eigen::VectorXd& x) -> Eigen::VectorXd {
         return A * x;
     };
 
@@ -34,7 +36,7 @@ TEST_CASE("Test finite difference jacobian of trig", "[jacobian]")
 {
     int n = GENERATE(1, 2, 4, 10, 100);
 
-    const auto f = [&](const Eigen::VectorXd x) -> Eigen::VectorXd {
+    const auto f = [&](const Eigen::VectorXd& x) -> Eigen::VectorXd {
         return x.array().sin();
     };