Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Add LCG 107a builds #4091

Merged
merged 7 commits into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -459,10 +459,8 @@ 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

- ccache -z
- cmake --build build -- -j6
Expand Down Expand Up @@ -497,3 +495,17 @@ lcg_106a:
- gcc13
- gcc14
- clang16

lcg_107:
extends: .lcg_base_job

variables:
LCG_VERSION: "107"

parallel:
matrix:
- OS: [alma9]
COMPILER:
- gcc13
- gcc14
- clang19
11 changes: 10 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,23 @@
},
{
"name": "gitlab-ci-clangtidy",
"displayName": "GitLab-CI",
"displayName": "GitLab-CI clang-tidy",
"inherits": "ci-common",
"cacheVariables": {
"ACTS_BUILD_ODD": "OFF",
"ACTS_BUILD_EXAMPLES_PYTHON_BINDINGS": "OFF",
"ACTS_RUN_CLANG_TIDY": "ON"
}
},
{
"name": "gitlab-ci-lcg",
"displayName": "GitLab-CI LCG",
"inherits": "ci-common",
"cacheVariables": {
"ACTS_USE_SYSTEM_NLOHMANN_JSON": "ON",
"ACTS_BUILD_PLUGIN_GEOMODEL": "OFF"
}
},
{
"name": "gitlab-ci-exatrkx",
"displayName": "GitLab-CI",
Expand Down
19 changes: 10 additions & 9 deletions Plugins/Json/src/DetrayJsonHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ namespace Acts::DetrayJsonHelper {

std::tuple<unsigned int, std::vector<double>> maskFromBounds(
const Acts::SurfaceBounds& sBounds, bool portal) {
auto bType = sBounds.type();
auto bValues = sBounds.values();
SurfaceBounds::BoundsType bType = sBounds.type();
std::vector<double> bValues = sBounds.values();
// Return value
unsigned int type = 13u;
std::vector<double> 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) {
Expand All @@ -37,20 +37,21 @@ std::tuple<unsigned int, std::vector<double>> 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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <boost/test/floating_point_comparison.hpp>
#include <boost/test/tools/floating_point_comparison.hpp>
#include <boost/test/unit_test.hpp>

#include "Acts/MagneticField/MagneticFieldContext.hpp"
Expand Down
Loading