Update C++ to C++14 and Catch2 to 3.6.0 (#294)

* Update C++ standard to C++14 * Upgrade to Catch 3.6.0
nlesc-recruit · Jul 22, 2024 · 5098d73 · 5098d73
1 parent dd4f93b
commit 5098d73
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 17 deletions.
diff --git a/.clang-format b/.clang-format
@@ -81,7 +81,7 @@ IfMacros:
   - KJ_IF_MAYBE
 IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^<catch2/catch.hpp|cuda.h|cuda_runtime_api.h|nvrtc.h|cudawrappers/.*\.hpp>'
+  - Regex:           '^<cuda.h|cuda_runtime_api.h|nvrtc.h|cudawrappers/.*\.hpp>'
     Priority:        3
     SortPriority:    0
     CaseSensitive:   false

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ project adheres to [Semantic Versioning](http://semver.org/).
 - `cu::Context::{getCurrent, popCurrent, getDevice}` are no longer static
 - `inline_local_includes` is now more robust: it properly handles commented
   includes and respects the location of an include in the original source file
+- Upgrade C++ standard to C++14
+- Upgrade Catch2 to version v3.6.0
 
 ## \[0.8.0\] - 2024-07-05
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ project(
 
 include(GNUInstallDirs)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_EXTENSIONS False)
 set(CMAKE_BUILD_TYPE Release)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,11 +1,9 @@
 include(FetchContent)
 
-# We use Catch2 v2.x because it is the last version that supports C++11, see
-# https://github.com/catchorg/Catch2.
 FetchContent_Declare(
   Catch2
   GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-  GIT_TAG v2.13.9
+  GIT_TAG v3.6.0
 )
 
 FetchContent_MakeAvailable(Catch2)
@@ -28,7 +26,7 @@ foreach(component ${COMPONENTS})
   catch_discover_tests(test_${component})
 endforeach()
 
-set(LINK_LIBRARIES Catch2::Catch2 cudawrappers::cu)
+set(LINK_LIBRARIES Catch2::Catch2WithMain cudawrappers::cu)
 
 target_link_libraries(test_cu PUBLIC ${LINK_LIBRARIES})
 

diff --git a/tests/test_cu.cpp b/tests/test_cu.cpp
@@ -1,10 +1,9 @@
 #include <array>
+#include <catch2/catch_test_macros.hpp>
 #include <cstring>
 #include <iostream>
 #include <string>
 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
 #include <cudawrappers/cu.hpp>
 
 TEST_CASE("Test cu::Device", "[device]") {

diff --git a/tests/test_cufft.cpp b/tests/test_cufft.cpp
@@ -1,8 +1,8 @@
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include <fstream>
 #include <iostream>
 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
 #include <cudawrappers/cufft.hpp>
 
 #define FP16_EPSILON 1e-3f

diff --git a/tests/test_nvml.cpp b/tests/test_nvml.cpp
@@ -1,8 +1,7 @@
+#include <catch2/catch_test_macros.hpp>
 #include <string>
 #include <vector>
 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
 #include <cudawrappers/cu.hpp>
 #include <cudawrappers/nvml.hpp>
 

diff --git a/tests/test_nvrtc.cpp b/tests/test_nvrtc.cpp
@@ -1,8 +1,7 @@
+#include <catch2/catch_test_macros.hpp>
 #include <string>
 #include <vector>
 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
 #include <cudawrappers/nvrtc.hpp>
 
 TEST_CASE("Test nvrtc::Program", "[program]") {

diff --git a/tests/test_vector_add.cpp b/tests/test_vector_add.cpp
@@ -1,16 +1,16 @@
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <cstddef>
 #include <iostream>
 #include <string>
 #include <vector>
 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
 #include <cudawrappers/cu.hpp>
 #include <cudawrappers/nvrtc.hpp>
 
 bool arrays_equal(const float *a, const float *b, size_t n) {
   for (size_t i = 0; i < n; i++) {
-    if (a[i] != Approx(b[i]).epsilon(1e-6)) {
+    if (a[i] != Catch::Approx(b[i]).epsilon(1e-6)) {
       return false;
     }
   }