Move to C++20 and remove vector_utils_legacy (#343)

key4hep · Aug 27, 2024 · 7ffc2d4 · 7ffc2d4
1 parent 06986a3
commit 7ffc2d4
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 334 deletions.
diff --git a/.github/workflows/lcg_linux_with_podio.yml b/.github/workflows/lcg_linux_with_podio.yml
@@ -10,13 +10,9 @@ jobs:
       matrix:
         LCG: ["dev3/x86_64-el9-clang16-opt",
               "dev4/x86_64-el9-clang16-opt",
-              "dev4/x86_64-el9-gcc13-opt"]
+              "dev4/x86_64-el9-gcc13-opt",
+              "LCG_106/x86_64-el9-gcc13-opt"]
         CXX_STANDARD: [20]
-        include:
-          - LCG: "LCG_106/x86_64-el9-gcc13-opt"
-            CXX_STANDARD: 17
-          - LCG: "dev4/x86_64-ubuntu2004-gcc9-opt"
-            CXX_STANDARD: 17
     steps:
     - uses: actions/checkout@v3
     - uses: cvmfs-contrib/github-action-cvmfs@v3

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -19,7 +19,7 @@ jobs:
           cd podio
           mkdir build install
           cd build
-          cmake .. -DCMAKE_CXX_STANDARD=17 \
+          cmake .. -DCMAKE_CXX_STANDARD=20 \
             -DENABLE_SIO=ON \
             -DBUILD_TESTING=OFF \
             -DCMAKE_INSTALL_PREFIX=$(pwd)/../install \
@@ -40,7 +40,7 @@ jobs:
           mkdir build
           cd build
           cmake .. -DENABLE_SIO=ON \
-            -DCMAKE_CXX_STANDARD=17 \
+            -DCMAKE_CXX_STANDARD=20 \
             -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror "\
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -DUSE_EXTERNAL_CATCH2=OFF

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,9 +38,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 # - Define the C++ Standard to use (Simplest Possible)
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "")
 
-if(NOT CMAKE_CXX_STANDARD MATCHES "17|20")
+if(NOT CMAKE_CXX_STANDARD MATCHES "20|23")
   message(FATAL_ERROR "Unsupported C++ standard: ${CMAKE_CXX_STANDARD}")
 endif()
 

diff --git a/test/hepmc/edm4hep_testhepmc.cc b/test/hepmc/edm4hep_testhepmc.cc
@@ -114,7 +114,7 @@ int main() {
     std::cout << "Converting particle with PDG ID: " << particle_i->pdg_id() << std::endl;
     std::cout << "\t and id: " << particle_i->id() << std::endl;
 
-    if (hepmcToEdmMap.find(particle_i->id()) == hepmcToEdmMap.end()) {
+    if (!hepmcToEdmMap.contains(particle_i->id())) {
       auto edm_particle = convert(particle_i);
       hepmcToEdmMap.insert({particle_i->id(), edm_particle});
     }
@@ -124,7 +124,7 @@ int main() {
     if (nullptr != prodvertex) {
 
       for (auto particle_mother : prodvertex->particles_in()) {
-        if (hepmcToEdmMap.find(particle_mother->id()) == hepmcToEdmMap.end()) {
+        if (!hepmcToEdmMap.contains(particle_mother->id())) {
           auto edm_particle = convert(particle_mother);
           hepmcToEdmMap.insert({particle_mother->id(), edm_particle});
         }
@@ -136,7 +136,7 @@ int main() {
     if (nullptr != prodvertex) {
 
       for (auto particle_daughter : prodvertex->particles_in()) {
-        if (hepmcToEdmMap.find(particle_daughter->id()) == hepmcToEdmMap.end()) {
+        if (!hepmcToEdmMap.contains(particle_daughter->id())) {
           auto edm_particle = convert(particle_daughter);
           hepmcToEdmMap.insert({particle_daughter->id(), edm_particle});
         }

diff --git a/test/utils/test_covmatrix_utils.cpp b/test/utils/test_covmatrix_utils.cpp
@@ -14,10 +14,6 @@ TEST_CASE("CovarianceMatrix indexing", "[cov_matrix_utils]") {
 
   STATIC_REQUIRE(get_cov_dim(21) == 6);
   STATIC_REQUIRE(get_cov_dim(1) == 1);
-#if !__cpp_consteval
-  // This will fail to compile if we have consteval
-  REQUIRE_THROWS_AS(get_cov_dim(14), std::invalid_argument);
-#endif
 
   // clang-format off
   // For better interpretability of the tests below, these are the indices of a

diff --git a/utils/include/edm4hep/utils/cov_matrix_utils.h b/utils/include/edm4hep/utils/cov_matrix_utils.h
@@ -49,11 +49,7 @@ namespace utils {
      *
      * @returns the dimension of the covariance matrix
      */
-#if cpp_consteval
     consteval std::size_t get_cov_dim(std::size_t N) {
-#else
-    constexpr std::size_t get_cov_dim(std::size_t N) {
-#endif
       switch (N) {
       case 21:
         return 6;

diff --git a/utils/include/edm4hep/utils/vector_utils.h b/utils/include/edm4hep/utils/vector_utils.h
@@ -1,12 +1,6 @@
 #ifndef EDM4HEP_UTILS_VECTOR_HH
 #define EDM4HEP_UTILS_VECTOR_HH
 
-// These ultilies require concepts. If not available, use the fallback
-// vector_utils_legacy.h instead to capture most functionality.
-#if !__cpp_concepts
-#include <edm4hep/utils/vector_utils_legacy.h>
-#else
-
 #include <edm4hep/Vector3f.h>
 
 #include <cmath>
@@ -327,4 +321,3 @@ inline constexpr V operator/(const V& v, const double d) {
 } // namespace edm4hep
 
 #endif
-#endif