From 773ed189add3d479d915f8ef3b1caf81f7e29161 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Fri, 14 Feb 2025 16:54:02 +0100 Subject: [PATCH 1/6] ci: Add LCG 107 builds --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67789fdb8a4..93669ceffde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -497,3 +497,17 @@ lcg_106a: - gcc13 - gcc14 - clang16 + +lcg_107: + extends: .lcg_base_job + + variables: + LCG_VERSION: "107" + + parallel: + matrix: + - OS: [alma9] + COMPILER: + - gcc13 + - gcc14 + - clang19 From 17e821796c48e654212b626e49ce85595b131f70 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Mon, 17 Feb 2025 10:39:43 +0100 Subject: [PATCH 2/6] add preset for lcg, use system json, switch to lcg107a --- .gitlab-ci.yml | 4 ++-- CMakePresets.json | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93669ceffde..8d3dba9483b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -459,7 +459,7 @@ linux_ubuntu_2204_clang: script: - > cmake -B build -S src - --preset=gitlab-ci + --preset=gitlab-ci-lcg -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DPython_EXECUTABLE=$(which python3) -DACTS_BUILD_PLUGIN_GEOMODEL=OFF # GeoModel is not in LCG at this point @@ -502,7 +502,7 @@ lcg_107: extends: .lcg_base_job variables: - LCG_VERSION: "107" + LCG_VERSION: "107a" parallel: matrix: diff --git a/CMakePresets.json b/CMakePresets.json index fc7275cbd4e..866768ecda4 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -94,7 +94,7 @@ }, { "name": "gitlab-ci-clangtidy", - "displayName": "GitLab-CI", + "displayName": "GitLab-CI clang-tidy", "inherits": "ci-common", "cacheVariables": { "ACTS_BUILD_ODD": "OFF", @@ -102,6 +102,14 @@ "ACTS_RUN_CLANG_TIDY": "ON" } }, + { + "name": "gitlab-ci-lcg", + "displayName": "GitLab-CI LCG", + "inherits": "ci-common", + "cacheVariables": { +"ACTS_USE_SYSTEM_NLOHMANN_JSON": "ON" + } + }, { "name": "gitlab-ci-exatrkx", "displayName": "GitLab-CI", From dfc9655b9023c5555f8230c6dcd3686902b10d27 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Mon, 17 Feb 2025 11:11:33 +0100 Subject: [PATCH 3/6] go back to lcg107 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d3dba9483b..f2625185522 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -502,7 +502,7 @@ lcg_107: extends: .lcg_base_job variables: - LCG_VERSION: "107a" + LCG_VERSION: "107" parallel: matrix: From eaa6d79822488f88fb25690369391ef56fb28fda Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Mon, 17 Feb 2025 11:33:19 +0100 Subject: [PATCH 4/6] fix detray helper --- Plugins/Json/src/DetrayJsonHelper.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Plugins/Json/src/DetrayJsonHelper.cpp b/Plugins/Json/src/DetrayJsonHelper.cpp index 9accb3d9f2b..fb3ede2ade1 100644 --- a/Plugins/Json/src/DetrayJsonHelper.cpp +++ b/Plugins/Json/src/DetrayJsonHelper.cpp @@ -19,14 +19,14 @@ namespace Acts::DetrayJsonHelper { std::tuple> maskFromBounds( const Acts::SurfaceBounds& sBounds, bool portal) { - auto bType = sBounds.type(); - auto bValues = sBounds.values(); + SurfaceBounds::BoundsType bType = sBounds.type(); + std::vector bValues = sBounds.values(); // Return value unsigned int type = 13u; std::vector boundaries = bValues; // Special treatment for some portals if (portal && bType == SurfaceBounds::BoundsType::eCylinder) { - boundaries = {bValues[0u], -bValues[1u], bValues[1u]}; + boundaries = {bValues.at(0u), -bValues.at(1u), bValues.at(1u)}; type = 4u; } else { switch (bType) { @@ -37,20 +37,21 @@ std::tuple> maskFromBounds( type = 5u; // ACTS: eMinX = 0, eMinY = 1, eMaxX = 2, eMaxY = 3, // detray: e_half_x, e_half_y - boundaries = {0.5 * (bValues[2] - bValues[0]), - 0.5 * (bValues[3] - bValues[1])}; + boundaries = std::vector{0.5 * (bValues.at(2) - bValues.at(0)), + 0.5 * (bValues.at(3) - bValues.at(1))}; } break; case SurfaceBounds::BoundsType::eCylinder: { - boundaries = {bValues[0u], -bValues[1u], bValues[1u]}; + boundaries = + std::vector{bValues.at(0u), -bValues.at(1u), bValues.at(1u)}; type = 2u; } break; case SurfaceBounds::BoundsType::eTrapezoid: { type = 7u; - boundaries = {bValues[0u], bValues[1u], bValues[2u], - 1 / (2 * bValues[2u])}; + boundaries = std::vector{bValues.at(0u), bValues.at(1u), bValues.at(2u), + 1 / (2 * bValues.at(2u))}; } break; case SurfaceBounds::BoundsType::eDisc: { - boundaries = {bValues[0u], bValues[1u]}; + boundaries = std::vector{bValues[0u], bValues[1u]}; type = 6u; } break; default: From 0030aa0b1df7d52bba9b2992d0034edbbcd3558d Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Mon, 17 Feb 2025 11:33:42 +0100 Subject: [PATCH 5/6] fix include --- Tests/UnitTests/Core/MagneticField/MultiRangeBFieldTests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/UnitTests/Core/MagneticField/MultiRangeBFieldTests.cpp b/Tests/UnitTests/Core/MagneticField/MultiRangeBFieldTests.cpp index 3644db058b4..a59dbcc2eb6 100644 --- a/Tests/UnitTests/Core/MagneticField/MultiRangeBFieldTests.cpp +++ b/Tests/UnitTests/Core/MagneticField/MultiRangeBFieldTests.cpp @@ -6,7 +6,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include +#include #include #include "Acts/MagneticField/MagneticFieldContext.hpp" From 480436a755b57775fdddb6c8a194c2a4bea5214b Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Mon, 17 Feb 2025 11:33:52 +0100 Subject: [PATCH 6/6] update prefix and config --- .gitlab-ci.yml | 2 -- CMakePresets.json | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2625185522..0b00d99c9c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -461,8 +461,6 @@ linux_ubuntu_2204_clang: cmake -B build -S src --preset=gitlab-ci-lcg -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" - -DPython_EXECUTABLE=$(which python3) - -DACTS_BUILD_PLUGIN_GEOMODEL=OFF # GeoModel is not in LCG at this point - ccache -z - cmake --build build -- -j6 diff --git a/CMakePresets.json b/CMakePresets.json index 866768ecda4..acc024413aa 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -107,7 +107,8 @@ "displayName": "GitLab-CI LCG", "inherits": "ci-common", "cacheVariables": { -"ACTS_USE_SYSTEM_NLOHMANN_JSON": "ON" + "ACTS_USE_SYSTEM_NLOHMANN_JSON": "ON", + "ACTS_BUILD_PLUGIN_GEOMODEL": "OFF" } }, {