Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Use a job pool for analysis tutorial #5489

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
ktf merged 3 commits into from
Feb 18, 2021
Merged

Use a job pool for analysis tutorial #5489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34a3275
Use a job pool for analysis tutorial
ktf Feb 15, 2021
a9e0404
Update CMakeLists.txt
ktf Feb 17, 2021
d72bde1
Just trying...
ktf Feb 17, 2021
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
32 changes: 32 additions & 0 deletions 32 Analysis/Tutorials/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,120 +18,145 @@
o2_add_dpl_workflow(histogram-track-selection
SOURCES src/histogramTrackSelection.cxx
PUBLIC_LINK_LIBRARIES O2::AnalysisDataModel O2::AnalysisCore
JOB_POOL analysis
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(track-collection-iteration
SOURCES src/trackCollectionIteration.cxx
JOB_POOL analysis
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(track-iteration
SOURCES src/trackIteration.cxx
JOB_POOL analysis
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(full-track-iteration
SOURCES src/fullTrackIteration.cxx
JOB_POOL analysis
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(collision-tracks-iteration
SOURCES src/collisionTracksIteration.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(new-collections
SOURCES src/newCollections.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(associated-derived
SOURCES src/associatedExample.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(dynamic-columns
SOURCES src/dynamicColumns.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(histograms
SOURCES src/histograms.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(histograms-full-tracks
SOURCES src/histogramsFullTracks.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(filters
SOURCES src/filters.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(partitions
SOURCES src/partitions.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(aodwriter
SOURCES src/aodwriter.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(aodreader
SOURCES src/aodreader.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(outputs
SOURCES src/outputs.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(jet-analysis
SOURCES src/jetAnalysis.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(tracks-combinations
SOURCES src/tracksCombinations.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(event-mixing
SOURCES src/eventMixing.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(mc-histograms
SOURCES src/mcHistograms.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::AnalysisCore
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(ccdbaccess
SOURCES src/ccdbaccess.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::AnalysisCore O2::CCDB O2::Framework O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(weak-decay-iteration
JOB_POOL analysis
SOURCES src/weakDecayIteration.cxx
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(extended-columns
SOURCES src/extendedColumns.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(zdc-vzero-iteration
SOURCES src/ZDCVZeroIteration.cxx
JOB_POOL analysis
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(hist-helpers-test
SOURCES src/histHelpersTest.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::AnalysisDataModel O2::AnalysisCore
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(histogram-registry
SOURCES src/histogramRegistry.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

Expand All @@ -145,35 +170,42 @@ o2_target_root_dictionary(ConfigurableCut

o2_add_dpl_workflow(configurable-objects
SOURCES src/configurableObjects.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::ConfigurableCut
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(muon-iteration
SOURCES src/muonIteration.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(schema-evolution
SOURCES src/schemaEvolution.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(efficiency-per-run
SOURCES src/efficiencyPerRun.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(efficiency-global
SOURCES src/efficiencyGlobal.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(compatible-bcs
SOURCES src/compatibleBCs.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)

o2_add_dpl_workflow(multiplicity-event-track-selection
SOURCES src/multiplicityEventTrackSelection.cxx
JOB_POOL analysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore O2::AnalysisDataModel
COMPONENT_NAME AnalysisTutorial)
4 changes: 4 additions & 0 deletions 4 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ set(ALIGPU_BUILD_TYPE "O2")

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set_property(GLOBAL PROPERTY REPORT_UNDEFINED_PROPERTIES)

set(ANALYSIS_COMPILE_POOL 1 CACHE STRING "How many parallel analysis compilation jobs")
set_property(GLOBAL PROPERTY JOB_POOLS analysis=${ANALYSIS_COMPILE_POOL})

include(O2BuildSanityChecks)
o2_build_sanity_checks()
set(CMAKE_CXX_STANDARD 17)
Expand Down
5 changes: 4 additions & 1 deletion 5 cmake/O2AddExecutable.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function(o2_add_executable baseTargetName)
A
"IS_TEST;NO_INSTALL;IS_BENCHMARK"
"COMPONENT_NAME;TARGETVARNAME"
"SOURCES;PUBLIC_LINK_LIBRARIES")
"SOURCES;PUBLIC_LINK_LIBRARIES;JOB_POOL")

if(A_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Got trailing arguments ${A_UNPARSED_ARGUMENTS}")
Expand Down Expand Up @@ -95,6 +95,9 @@ function(o2_add_executable baseTargetName)

# set the executable output name
set_property(TARGET ${target} PROPERTY OUTPUT_NAME ${exeName})
if(A_JOB_POOL)
set_property(TARGET ${target} PROPERTY JOB_POOL_COMPILE ${A_JOB_POOL})
endif()

if(A_IS_TEST)
# tests go in a separate directory
Expand Down
5 changes: 4 additions & 1 deletion 5 cmake/O2AddWorkflow.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ include_guard()
function(o2_add_dpl_workflow baseTargetName)

cmake_parse_arguments(PARSE_ARGV 1 A "" "COMPONENT_NAME;TARGETVARNAME"
"SOURCES;PUBLIC_LINK_LIBRARIES")
"SOURCES;PUBLIC_LINK_LIBRARIES;JOB_POOL")

if(A_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Got trailing arguments ${A_UNPARSED_ARGUMENTS}")
Expand All @@ -44,6 +44,9 @@ function(o2_add_dpl_workflow baseTargetName)
${targetExeName}
PARENT_SCOPE)
endif()
if(A_JOB_POOL)
set_property(TARGET ${targetExeName} PROPERTY JOB_POOL_COMPILE ${A_JOB_POOL})
endif()

set(jsonFile $<TARGET_FILE_BASE_NAME:${targetExeName}>.json)

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.