From 4f4ed59b9654c35cbc2686e4d73d8fc3bcf7e035 Mon Sep 17 00:00:00 2001 From: AdrianoDee Date: Tue, 13 Aug 2024 16:19:28 +0200 Subject: [PATCH] Move relval_gpu to Alpaka + add D110 wfs --- .../PyReleaseValidation/python/relval_gpu.py | 96 +++++++++---------- .../python/upgradeWorkflowComponents.py | 15 +++ .../python/customizePixelTracksForTriplets.py | 2 +- 3 files changed, 59 insertions(+), 54 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_gpu.py b/Configuration/PyReleaseValidation/python/relval_gpu.py index 2548bc7008394..fc8180cdff0a3 100644 --- a/Configuration/PyReleaseValidation/python/relval_gpu.py +++ b/Configuration/PyReleaseValidation/python/relval_gpu.py @@ -13,70 +13,60 @@ # mc WFs to run in IB: -# mc 2023 Alpaka pixel-only quadruplets: TTbar: any backend, any backend vs cpu validation, profiling +# mc 2024 +# no PU +# Alpaka pixel-only TTbar: quadruplets any backend, any backend vs cpu validation, profiling, triplets # Alpaka ECAL-only: TTbar: any backend # Alpaka HCAL-only: TTbar: any backend, any backend vs cpu validation, profiling # Alpaka with full reco and pixel-only quadruplets: TTbar: any backend -# Alpaka pixel-only quadruplets: ZMM: any backend, any backend vs cpu validation, profiling +# Alpaka pixel-only: ZMM: quadruplets any backend, any backend vs cpu validation, profiling, triplets # Alpaka pixel-only quadruplets: Single Nu E10: any backend -# Patatrack pixel-only quadruplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack pixel-only triplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack ECAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack HCAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack pixel-only quadruplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation -# Patatrack pixel-only triplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation -# full reco with Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation -# full reco with Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation -# Patatrack pixel-only quadruplets: Single Nu E10 on GPU (optional) +# with PU # Alpaka pixel-only quadruplets: TTbar with PU: any backend, any backend vs cpu validation, profiling # Alpaka ECAL-only: TTbar with PU: any backend # Alpaka HCAL-only: TTbar with PU: any backend, any backend vs cpu validation, profiling # Alpaka with full reco and pixel-only quadruplets: TTbar with PU: any backend -# Alpaka pixel-only quadruplets: ZMM with PU: any backend, any backend vs cpu validation, profiling +# Alpaka pixel-only: ZMM with PU: any backend, any backend vs cpu validation, profiling, triplets # Alpaka pixel-only quadruplets: Single Nu E10 with PU: any backend -# mc 2026 Patatrack pixel-only quadruplets: Single Nu E10: on GPU (optional) +# mc 2026 +# no PU +# Alpaka pixel-only: TTbar: quadruplets any backend, any backend vs cpu validation, profiling, triplets +# Alpaka pixel-only: Single Nu E10: on GPU (optional) +# with PU +# Alpaka pixel-only: TTbar: quadruplets any backend, any backend vs cpu validation, profiling, triplets +# Alpaka pixel-only: Single Nu E10: on GPU (optional) + numWFIB = [ - # 2023, Alpaka-based - 12434.402, 12434.403, 12434.404, - #12434.406, 12434.407, 12434.408, - 12434.412,#12434.413, 12434.414, - 12434.422, 12434.423, 12434.424, - #12434.482, 12434.483, 12434.484 - #12434.486, 12434.487, 12434.488 - 12434.492,#12434.493 - 12450.402, 12450.403, 12450.404, + # 2024, Alpaka-based noPU + 12834.402, 12834.403, 12834.404, 12834.406, + #12834.406, 12834.407, 12834.408, + 12834.412,#12834.413, 12834.414, + 12834.422, 12834.423, 12834.424, + #12834.482, 12834.483, 12834.484 + #12834.486, 12834.487, 12834.488 + 12834.492,#12834.493 + 12850.402, 12850.403, 12850.404, 12850.404, #12450.406, 12450.407, 12450.408, - 12461.402, - - # 2023, CUDA-based - 12450.502, 12450.503, 12450.504, - 12450.506, 12450.507, 12450.508, - 12434.502, 12434.503, 12434.504, - 12434.506, 12434.507, 12434.508, - 12434.512, 12434.513, 12434.514, - 12434.522, 12434.523, 12434.524, - 12434.582, 12434.583,#12434.584, - 12434.586, 12434.587,#12434.588, - 12434.592, 12434.593, - 12434.596, 12434.597, - 12461.502, - - # 2023 with PU, Alpaka-based - 12634.402, 12634.403, 12634.404, - #12634.406, 12634.407, 12634.408 - 12634.412,#12634.413, 12634.414 - 12634.422, 12634.423, 12634.424, - #12634.482, 12634.483, 12634.484 - #12634.486, 12634.487, 12634.488 - 12634.492,#12634.493 - 12650.402, 12650.403, 12650.404, - #12650.406, 12650.407, 12650.408 - 12661.402, - - # 2026, CUDA-based - 24861.502 + 12861.402, + + # 2024 with PU, Alpaka-based + 13034.402, 13034.403, 13034.404, 13034.406, + #13034.406, 13034.407, 13034.408 + 13034.412,#13034.413, 13034.414 + 13034.422, 13034.423, 13034.424, + #13034.482, 13034.483, 13034.484 + #13034.486, 13034.487, 13034.488 + 13034.492,#13034.493 + 13050.402, 13050.403, 13050.404, + #13050.406, 13050.407, 13050.408 + 13061.402, + + # 2026, Alpaka-based noPU + 29634.402, 29634.403, 29634.404, 29634.406, + 29661.402, + + # 2026, Alpaka-based PU + 29834.402, 29834.403, 29834.404, 29834.406 ] for numWF in numWFIB: diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 85c512b721783..f398e2f9513ad 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -1712,6 +1712,21 @@ def setup_(self, step, stepName, stepDict, k, properties): offset = 0.404, ) +upgradeWFs['PatatrackPixelOnlyTripletsAlpaka'] = PatatrackWorkflow( + digi = { + }, + reco = { + '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,VALIDATION:@pixelTrackingOnlyValidation,DQM:@pixelTrackingOnlyDQM', + '--procModifiers': 'alpaka', + '--customise' : 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets' + }, + harvest = { + '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM' + }, + suffix = 'Patatrack_PixelOnlyTripletsAlpaka', + offset = 0.406, +) + # end of Patatrack workflows class UpgradeWorkflow_ProdLike(UpgradeWorkflow): diff --git a/RecoTracker/Configuration/python/customizePixelTracksForTriplets.py b/RecoTracker/Configuration/python/customizePixelTracksForTriplets.py index 141a999e4979f..da3233278643a 100644 --- a/RecoTracker/Configuration/python/customizePixelTracksForTriplets.py +++ b/RecoTracker/Configuration/python/customizePixelTracksForTriplets.py @@ -3,7 +3,7 @@ def customizePixelTracksForTriplets(process): from HLTrigger.Configuration.common import producers_by_type - producers = ['CAHitNtupletCUDA','CAHitNtupletCUDAPhase1','CAHitNtupletCUDAPhase2'] + producers = ['CAHitNtupletCUDA','CAHitNtupletCUDAPhase1','CAHitNtupletCUDAPhase2','CAHitNtupletAlpakaPhase1@alpaka','CAHitNtupletAlpakaPhase2@alpaka'] for name in producers: for producer in producers_by_type(process, name): producer.includeJumpingForwardDoublets = True