Skip to content

Fix tests in Key4hep@LCG stacks #540

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.

Sign up for GitHub

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

Merged
kjvbrt merged 8 commits into from
Sep 4, 2026
Merged

Fix tests in Key4hep@LCG stacks #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf9b12c
test: support LCG nightly integration tests
jmcarcell Aug 21, 2026
577ba78
Recognize ubuntu26 in Key4hep OS detection and fix -Wpedantic error
kjvbrt Sep 3, 2026
b0fdc2b
Remove unneeded changes
jmcarcell Sep 3, 2026
ada22b0
Remove unneeded change
jmcarcell Sep 3, 2026
8113f32
Fix -Wpedantic 'extra semicolon' error in LinkSource.h
kjvbrt Sep 3, 2026
cab8ca1
Load real FastJet before Delphes to avoid symbol collision
kjvbrt Sep 3, 2026
17312b0
Force FastJet RPATH over LD_LIBRARY_PATH to avoid symbol collisions
kjvbrt Sep 4, 2026
13a8f18
Load FastJet addon before Delphes to avoid symbol collision
kjvbrt Sep 4, 2026
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
5 changes: 5 additions & 0 deletions addons/FastJet/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ fccanalyses_addon_build(FastJet
ROOT::ROOTVecOps
INSTALL_COMPONENT fastjet)

# Prefer FastJet's RPATH over LD_LIBRARY_PATH, so it doesn't pick up a
# different FastJet build (e.g. Delphes' bundled copy) found earlier on
# the search path.
target_link_options(FastJet PRIVATE -Wl,--disable-new-dtags)

@jmcarcell jmcarcell Sep 4, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks a bit weird but I don't know how to solve that. Maybe moving to using Fastjet's CMake in 3.5.1 would be enough.


add_custom_command(TARGET FastJet POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/python/*
Expand Down
2 changes: 1 addition & 1 deletion analyzers/dataframe/FCCAnalyses/LinkSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ struct selAbsPDG {
}

return result;
};
}
};

/**
Expand Down
11 changes: 9 additions & 2 deletions python/run_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,20 +432,23 @@ def run_histmaker(args, rdf_module, anapath):
LOGGER.error('Key4hep stack not setup!\nAborting...')
sys.exit(3)
k4h_stack_env = os.environ['KEY4HEP_STACK']
if 'sw-nightlies.hsf.org' in k4h_stack_env:
if ('sw-nightlies.hsf.org' in k4h_stack_env
or 'sft-nightlies.cern.ch' in k4h_stack_env):
key4hep_stack = 'nightlies'
elif 'sw.hsf.org' in k4h_stack_env:
key4hep_stack = 'release'
else:
LOGGER.error('Key4hep stack not recognized!\nAborting...')
sys.exit(3)

if 'almalinux9' in k4h_stack_env:
if 'almalinux9' in k4h_stack_env or '-el9-' in k4h_stack_env:
key4hep_os = 'alma9'
elif 'ubuntu22' in k4h_stack_env:
key4hep_os = 'ubuntu22'
elif 'ubuntu24' in k4h_stack_env:
key4hep_os = 'ubuntu24'
elif 'ubuntu26' in k4h_stack_env:
Comment thread
jmcarcell marked this conversation as resolved.
key4hep_os = 'ubuntu26'
else:
LOGGER.error('Key4hep OS not recognized!\nAborting...')
sys.exit(3)
Expand Down Expand Up @@ -741,6 +744,10 @@ def run(parser):
LOGGER.debug('Setting verbosity level "kDebug+10" for '
'RDataFrame...')

# Load real FastJet before Delphes gets pulled in via libFCCAnalyses,
# so ClusterSequence calls don't resolve into Delphes' bundled copy.
ROOT.gSystem.Load("libFastJet")

# Load the pre-compiled analyzers
LOGGER.info('Loading analyzers from libFCCAnalyses...')
ROOT.gSystem.Load("libFCCAnalyses")
Expand Down
7 changes: 5 additions & 2 deletions python/run_fccanalysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,22 +362,25 @@ def merge_config(args: argparse.Namespace,
LOGGER.error('Key4hep stack not setup!\nAborting...')
sys.exit(3)
k4h_stack_env = os.environ['KEY4HEP_STACK']
if 'sw-nightlies.hsf.org' in k4h_stack_env:
if ('sw-nightlies.hsf.org' in k4h_stack_env
or 'sft-nightlies.cern.ch' in k4h_stack_env):
config['key4hep-stack'] = 'nightlies'
elif 'sw.hsf.org' in k4h_stack_env:
config['key4hep-stack'] = 'release'
else:
LOGGER.error('Key4hep stack not recognized!\nAborting...')
sys.exit(3)

if 'almalinux9' in k4h_stack_env:
if 'almalinux9' in k4h_stack_env or '-el9-' in k4h_stack_env:
config['key4hep-os'] = 'alma9'
elif 'almalinux10' in k4h_stack_env:
config['key4hep-os'] = 'alma10'
elif 'ubuntu22' in k4h_stack_env:
config['key4hep-os'] = 'ubuntu22'
elif 'ubuntu24' in k4h_stack_env:
config['key4hep-os'] = 'ubuntu24'
elif 'ubuntu26' in k4h_stack_env:
config['key4hep-os'] = 'ubuntu26'
else:
LOGGER.error('Key4hep OS not recognized!\nAborting...')
sys.exit(3)
Expand Down