Skip to content

Commit ef7405e

Browse files
zferguszfergus
committed
Updated dependencies
1 parent c5961a6 commit ef7405e

10 files changed

+26
-36
lines changed

‎CMakeLists.txt

-5
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,5 @@ if(FINITE_DIFF_BUILD_UNIT_TESTS)
8585
include(CTest)
8686
enable_testing()
8787

88-
# Include Catch2 and provide function `catch_discover_tests` to register tests.
89-
include(catch2)
90-
FetchContent_GetProperties(catch2)
91-
include("${catch2_SOURCE_DIR}/contrib/Catch.cmake")
92-
9388
add_subdirectory(tests)
9489
endif()

‎cmake/recipes/catch2.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include(FetchContent)
1919
FetchContent_Declare(
2020
catch2
2121
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
22-
GIT_TAG v2.13.7
22+
GIT_TAG v3.0.1
2323
GIT_SHALLOW TRUE
2424
)
2525
FetchContent_MakeAvailable(catch2)

‎cmake/recipes/eigen.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ else()
2525
FetchContent_Declare(
2626
eigen
2727
GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
28-
GIT_TAG tags/3.3.7
28+
GIT_TAG tags/3.4.0
2929
GIT_SHALLOW TRUE
3030
)
3131
FetchContent_GetProperties(eigen)

‎cmake/recipes/spdlog.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include(FetchContent)
1919
FetchContent_Declare(
2020
spdlog
2121
GIT_REPOSITORY https://github.com/gabime/spdlog.git
22-
GIT_TAG v1.9.2
22+
GIT_TAG v1.10.0
2323
GIT_SHALLOW TRUE
2424
)
2525

‎tests/CMakeLists.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
################################################################################
44

55
add_executable(finitediff_tests
6-
main.cpp
7-
86
test_gradient.cpp
97
test_jacobian.cpp
108
test_hessian.cpp
@@ -21,7 +19,7 @@ include(finitediff_warnings)
2119
target_link_libraries(finitediff_tests PRIVATE finitediff::warnings)
2220

2321
include(catch2)
24-
target_link_libraries(finitediff_tests PUBLIC Catch2::Catch2)
22+
target_link_libraries(finitediff_tests PUBLIC Catch2::Catch2WithMain)
2523

2624
################################################################################
2725
# Compiler options
@@ -33,9 +31,9 @@ target_link_libraries(finitediff_tests PUBLIC Catch2::Catch2)
3331
# Register tests
3432
################################################################################
3533

36-
foreach(source IN ITEMS ${test_sources})
37-
source_group("tests" FILES "${source}")
38-
endforeach()
34+
FetchContent_GetProperties(catch2)
35+
list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
36+
include(Catch)
3937

4038
# Register tests
4139
set(PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS ON)

‎tests/main.cpp

-9
This file was deleted.

‎tests/test_flatten.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <catch2/catch.hpp>
1+
#include <catch2/catch_test_macros.hpp>
22

33
#include <finitediff.hpp>
44

‎tests/test_gradient.cpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#include <iostream>
22

3+
#include <catch2/catch_test_macros.hpp>
4+
#include <catch2/generators/catch_generators_all.hpp>
5+
36
#include <Eigen/Core>
4-
#include <catch2/catch.hpp>
57

68
#include <finitediff.hpp>
79

@@ -15,7 +17,7 @@ TEST_CASE("Test finite difference gradient of quadratic", "[gradient]")
1517
Eigen::MatrixXd A = Eigen::MatrixXd::Random(n, n);
1618
Eigen::VectorXd b = Eigen::VectorXd::Random(n);
1719

18-
const auto f = [&](const Eigen::VectorXd x) -> double {
20+
const auto f = [&](const Eigen::VectorXd& x) -> double {
1921
return (x.transpose() * A * x + b.transpose() * x)(0);
2022
};
2123

@@ -33,13 +35,13 @@ TEST_CASE("Test finite difference gradient of quadratic", "[gradient]")
3335

3436
TEST_CASE("Test finite difference gradient of Rosenbrock", "[gradient]")
3537
{
36-
const auto f = [](const Eigen::VectorXd x) {
38+
const auto f = [](const Eigen::VectorXd& x) {
3739
double t1 = 1 - x[0];
3840
double t2 = (x[1] - x[0] * x[0]);
3941
return t1 * t1 + 100 * t2 * t2;
4042
};
4143

42-
const auto fdiff = [](const Eigen::VectorXd x) {
44+
const auto fdiff = [](const Eigen::VectorXd& x) {
4345
return Eigen::Vector2d(
4446
-2 * (1 - x[0]) + 200 * (x[1] - x[0] * x[0]) * (-2 * x[0]),
4547
200 * (x[1] - x[0] * x[0]));
@@ -61,7 +63,7 @@ TEST_CASE("Test finite difference gradient of trig", "[gradient]")
6163
{
6264
int n = GENERATE(1, 2, 4, 10, 100);
6365

64-
const auto f = [&](const Eigen::VectorXd x) -> double {
66+
const auto f = [&](const Eigen::VectorXd& x) -> double {
6567
return x.array().sin().matrix().squaredNorm();
6668
};
6769

‎tests/test_hessian.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#include <iostream>
22

3+
#include <catch2/catch_test_macros.hpp>
4+
#include <catch2/generators/catch_generators_all.hpp>
5+
36
#include <Eigen/Core>
4-
#include <catch2/catch.hpp>
57

68
#include <finitediff.hpp>
79
#include <spdlog/spdlog.h>
@@ -18,7 +20,7 @@ TEST_CASE("Test finite difference hessian of quadratic", "[hessian]")
1820
Eigen::MatrixXd A = Eigen::MatrixXd::Random(n, n);
1921
Eigen::VectorXd b = Eigen::VectorXd::Random(n);
2022

21-
const auto f = [&](const Eigen::VectorXd x) -> double {
23+
const auto f = [&](const Eigen::VectorXd& x) -> double {
2224
return (x.transpose() * A * x + b.transpose() * x)(0);
2325
};
2426

@@ -36,7 +38,7 @@ TEST_CASE("Test finite difference hessian of quadratic", "[hessian]")
3638
TEST_CASE("Test finite difference hessian of Rosenbrock", "[hessian]")
3739
{
3840
AccuracyOrder accuracy = GENERATE(SECOND, FOURTH, SIXTH, EIGHTH);
39-
const auto f = [](const Eigen::VectorXd x) {
41+
const auto f = [](const Eigen::VectorXd& x) {
4042
double t1 = 1 - x[0];
4143
double t2 = (x[1] - x[0] * x[0]);
4244
return t1 * t1 + 100 * t2 * t2;
@@ -61,7 +63,7 @@ TEST_CASE("Test finite difference hessian of trig", "[hessian]")
6163
AccuracyOrder accuracy = GENERATE(SECOND, FOURTH, SIXTH, EIGHTH);
6264
int n = GENERATE(1, 2, 4, 10, 25);
6365

64-
const auto f = [&](const Eigen::VectorXd x) -> double {
66+
const auto f = [&](const Eigen::VectorXd& x) -> double {
6567
return x.array().sin().matrix().squaredNorm();
6668
};
6769

‎tests/test_jacobian.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#include <iostream>
22

3+
#include <catch2/catch_test_macros.hpp>
4+
#include <catch2/generators/catch_generators_all.hpp>
5+
36
#include <Eigen/Core>
4-
#include <catch2/catch.hpp>
57

68
#include <finitediff.hpp>
79

@@ -14,7 +16,7 @@ TEST_CASE("Test finite difference jacobian of linear", "[jacobian]")
1416
// f(x) = Ax
1517
Eigen::MatrixXd A = Eigen::MatrixXd::Random(n, n);
1618

17-
const auto f = [&](const Eigen::VectorXd x) -> Eigen::VectorXd {
19+
const auto f = [&](const Eigen::VectorXd& x) -> Eigen::VectorXd {
1820
return A * x;
1921
};
2022

@@ -34,7 +36,7 @@ TEST_CASE("Test finite difference jacobian of trig", "[jacobian]")
3436
{
3537
int n = GENERATE(1, 2, 4, 10, 100);
3638

37-
const auto f = [&](const Eigen::VectorXd x) -> Eigen::VectorXd {
39+
const auto f = [&](const Eigen::VectorXd& x) -> Eigen::VectorXd {
3840
return x.array().sin();
3941
};
4042

0 commit comments

Comments
 (0)