Skip to content

Commit 6b29f9a

Browse files
cmsbuildcmsbuild
authored
Merge pull request #42713 from fwyzard/update_gpu_workflows_133x
Update GPU workflows
2 parents a7b898f + 2950ac6 commit 6b29f9a

File tree

3 files changed

+112
-60
lines changed

3 files changed

+112
-60
lines changed

‎Configuration/PyReleaseValidation/python/relval_2017.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
from Configuration.PyReleaseValidation.relval_upgrade import workflows as _upgrade_workflows
1212

13-
#just define all of them
14-
1513
#WFs to run in IB:
1614
# 2017 (ele guns 10, 35, 1000; pho guns 10, 35; mu guns 1, 10, 100, 1000, QCD 3TeV, QCD Flat)
1715
# (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
@@ -34,10 +32,6 @@
3432
# (ZMM, TTbar, ZEE, MinBias, TTbar PU, TTbar PU premix, ZEE PU, TTbar design)
3533
# (TTbar trackingOnly, pixelTrackingOnly, trackingMkFit, trackdnn)
3634
# (TTbar with JME NanoAOD)
37-
# (Patatrack pixel-only: ZMM - on CPU: quadruplets, triplets)
38-
# (Patatrack pixel-only: TTbar - on CPU: quadruplets, triplets)
39-
# (Patatrack ECAL-only: TTbar - on CPU)
40-
# (Patatrack HCAL-only: TTbar - on CPU)
4135
# (TTbar 0T, TTbar PU 0T)
4236
# (TTbar FastSim, TTbar FastSim PU, MinBiasFS for mixing)
4337
# (TTbar PU MLPF ecal_deepsc)
@@ -47,6 +41,10 @@
4741
# (TTbar DigiNoHLT)
4842
# 2023 (TTbar, TTbar PU, TTbar PU premix)
4943
# (TTbar trackingMkFit)
44+
# (Patatrack pixel-only: TTbar - on CPU: quadruplets, triplets)
45+
# (Patatrack ECAL-only: TTbar - on CPU)
46+
# (Patatrack HCAL-only: TTbar - on CPU)
47+
# (Patatrack pixel-only: ZMM - on CPU: quadruplets, triplets)
5048
# (TTbar FastSim, TTbar FastSim PU, MinBiasFS for mixing))
5149
# 2024 (TTbar, TTbar PU, TTbar PU premix)
5250
numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
@@ -71,10 +69,6 @@
7169
#11725.0,11925.0,
7270
11634.1,11634.5,11634.7,11634.71,11634.72,11634.91,
7371
11634.15,
74-
11650.501,11650.505,
75-
11634.501,11634.505,
76-
11634.511,
77-
11634.521,
7872
11634.24,11834.24,
7973
13234.0,13434.0,13240.303,
8074
11834.13, 11834.19,
@@ -84,8 +78,14 @@
8478
11634.601,
8579
12434.0,12634.0,12634.99,
8680
12434.7,
81+
12434.501,12434.505,
82+
12434.511,
83+
12434.521,
84+
12450.501,12450.505,
8785
14034.0,14234.0,14040.303,
8886
12834.0,13034.0,13034.99,]
87+
8988
for numWF in numWFIB:
90-
if not numWF in _upgrade_workflows: continue
89+
if not numWF in _upgrade_workflows:
90+
continue
9191
workflows[numWF] = _upgrade_workflows[numWF]

‎Configuration/PyReleaseValidation/python/relval_gpu.py‎

Lines changed: 78 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,64 +11,96 @@
1111

1212
from Configuration.PyReleaseValidation.relval_upgrade import workflows as _upgrade_workflows
1313

14-
# just define all of them
14+
# mc WFs to run in IB:
1515

16-
# WFs to run in IB:
17-
# mc 2022 Patatrack pixel-only quadruplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling
18-
# Patatrack pixel-only triplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling
19-
# Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
20-
# Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
21-
# Patatrack ECAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
22-
# Patatrack HCAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
23-
# Patatrack pixel-only quadruplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
24-
# Patatrack pixel-only triplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
25-
# full reco with Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
26-
# full reco with Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
27-
28-
# mc 2023 Patatrack pixel-only quadruplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling
29-
# Patatrack pixel-only triplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling
30-
# Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
31-
# Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
32-
# Patatrack ECAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
33-
# Patatrack HCAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
34-
# Patatrack pixel-only quadruplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
35-
# Patatrack pixel-only triplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
36-
# full reco with Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
37-
# full reco with Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
16+
# mc 2023 Patatrack pixel-only quadruplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling
17+
# Patatrack pixel-only triplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling
18+
# Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
19+
# Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
20+
# Patatrack ECAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
21+
# Patatrack HCAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
22+
# Patatrack pixel-only quadruplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling (to be implemented)
23+
# Patatrack pixel-only triplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling (to be implemented)
24+
# full reco with Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation
25+
# full reco with Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation
3826
numWFIB = [
39-
# 2022
40-
11650.502, 11650.503, 11650.504,
41-
11650.506, 11650.507, 11650.508,
42-
11634.502, 11634.503, 11634.504,
43-
11634.506, 11634.507, 11634.508,
44-
11634.512, 11634.513, 11634.514,
45-
11634.522, 11634.523, 11634.524,
46-
11634.582, 11634.583, # 11634.524,
47-
11634.586, 11634.587, # 11634.528,
48-
11634.592, 11634.593,
49-
11634.596, 11634.597,
50-
5127
# 2023
5228
12450.502, 12450.503, 12450.504,
5329
12450.506, 12450.507, 12450.508,
5430
12434.502, 12434.503, 12434.504,
5531
12434.506, 12434.507, 12434.508,
5632
12434.512, 12434.513, 12434.514,
5733
12434.522, 12434.523, 12434.524,
58-
12434.582, 12434.583,
59-
12434.586, 12434.587,
34+
12434.582, 12434.583, # 12434.584,
35+
12434.586, 12434.587, # 12434.588,
6036
12434.592, 12434.593,
6137
12434.596, 12434.597,
6238
]
39+
6340
for numWF in numWFIB:
64-
if not numWF in _upgrade_workflows: continue
41+
if not numWF in _upgrade_workflows:
42+
continue
6543
workflows[numWF] = _upgrade_workflows[numWF]
6644

67-
# data 2023 Patatrack pixel-only triplets: RunJetMET2022D on GPU (optional)
68-
# Patatrack ECAL-only: RunJetMET2022D on GPU (optional)
69-
# Patatrack HCAL-only: RunJetMET2022D on GPU (optional)
70-
workflows[141.008506] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPU','HARVESTRUN3_pixelTrackingOnly']]
71-
workflows[141.008512] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_ECALOnlyGPU','HARVESTRUN3_ECALOnly']]
72-
workflows[141.008522] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_HCALOnlyGPU','HARVESTRUN3_HCALOnly']]
73-
#2023 HIon MC Patatrack pixel-only quadruplets on HydjetQ_MinBias_5362GeV_2023_ppReco on GPU (optional)
74-
workflows[160.502] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackGPU','MINIHI2023PROD']]
45+
46+
# data WFs to run in IB:
47+
48+
# data 2023 Patatrack pixel-only triplets: RunJetMET2022D on GPU (optional), RunJetMET2022D GPU-vs-CPU validation, RunJetMET2022D profiling
49+
# Patatrack ECAL-only: RunJetMET2022D on GPU (optional), RunJetMET2022D GPU-vs-CPU validation, RunJetMET2022D profiling
50+
# Patatrack HCAL-only: RunJetMET2022D on GPU (optional), RunJetMET2022D GPU-vs-CPU validation, RunJetMET2022D profiling
51+
workflows[141.008506] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU',[
52+
'RunJetMET2023B',
53+
'HLTDR3_2023',
54+
'RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPU',
55+
'HARVESTRUN3_pixelTrackingOnly'
56+
]]
57+
workflows[141.008507] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU_Validation',[
58+
'RunJetMET2023B',
59+
'HLTDR3_2023',
60+
'RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPUValidation',
61+
'HARVESTRUN3_pixelTrackingOnlyGPUValidation'
62+
]]
63+
workflows[141.008508] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU_Profiling',[
64+
'RunJetMET2023B',
65+
'HLTDR3_2023',
66+
'RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPUProfiling'
67+
]]
68+
69+
workflows[141.008512] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU',[
70+
'RunJetMET2023B',
71+
'HLTDR3_2023',
72+
'RECODR3_reHLT_ECALOnlyGPU',
73+
'HARVESTRUN3_ECALOnly'
74+
]]
75+
workflows[141.008513] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU_Validation',[
76+
'RunJetMET2023B',
77+
'HLTDR3_2023',
78+
'RECODR3_reHLT_ECALOnlyGPUValidation',
79+
'HARVESTRUN3_ECALOnlyGPUValidation'
80+
]]
81+
workflows[141.008514] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU_Profiling',[
82+
'RunJetMET2023B',
83+
'HLTDR3_2023',
84+
'RECODR3_reHLT_ECALOnlyGPUProfiling'
85+
]]
86+
87+
workflows[141.008522] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU',[
88+
'RunJetMET2023B',
89+
'HLTDR3_2023',
90+
'RECODR3_reHLT_HCALOnlyGPU',
91+
'HARVESTRUN3_HCALOnly'
92+
]]
93+
workflows[141.008523] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU_Validation',[
94+
'RunJetMET2023B',
95+
'HLTDR3_2023',
96+
'RECODR3_reHLT_HCALOnlyGPUValidation',
97+
'HARVESTRUN3_HCALOnlyGPUValidation'
98+
]]
99+
workflows[141.008524] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU_Profiling',[
100+
'RunJetMET2023B',
101+
'HLTDR3_2023',
102+
'RECODR3_reHLT_HCALOnlyGPUProfiling'
103+
]]
104+
105+
# 2023 HIon MC Patatrack pixel-only quadruplets on HydjetQ_MinBias_5362GeV_2023_ppReco on GPU (optional)
106+
workflows[160.502] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackGPU','MINIHI2023PROD']]

‎Configuration/PyReleaseValidation/python/relval_steps.py‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2687,9 +2687,18 @@ def gen2023HiMix(fragment,howMuch):
26872687
step3_pixel_ntuplet_gpu = {
26882688
'--procModifiers': 'pixelNtupletFit,gpu'
26892689
}
2690+
step3_pixel_ntuplet_gpu_validation = {
2691+
'--procModifiers': 'pixelNtupletFit,gpuValidation'
2692+
}
26902693
step3_pixel_triplets = {
26912694
'--customise': 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets'
26922695
}
2696+
step3_pixel_profiling = {
2697+
'--customise': 'RecoTracker/Configuration/customizePixelOnlyForProfiling.customizePixelOnlyForProfilingGPUOnly'
2698+
}
2699+
step3_pixel_triplets_profiling = {
2700+
'--customise': 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,RecoTracker/Configuration/customizePixelOnlyForProfiling.customizePixelOnlyForProfilingGPUOnly'
2701+
}
26932702
step3_gpu = {
26942703
'--procModifiers': 'gpu',
26952704
}
@@ -2900,12 +2909,20 @@ def gen2023HiMix(fragment,howMuch):
29002909
steps['RECODR3_reHLT_pixelTrackingOnly']=merge([{'-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,DQM:@pixelTrackingOnlyDQM'},steps['RECODR3_reHLT_2023']])
29012910
steps['RECODR3_reHLT_Patatrack_PixelOnlyCPU']=merge([step3_pixel_ntuplet_cpu, steps['RECODR3_reHLT_pixelTrackingOnly']])
29022911
steps['RECODR3_reHLT_Patatrack_PixelOnlyGPU']=merge([step3_pixel_ntuplet_gpu, steps['RECODR3_reHLT_pixelTrackingOnly']])
2912+
steps['RECODR3_reHLT_Patatrack_PixelOnlyGPUValidation']=merge([{'--accelerators':'gpu-nvidia'},step3_pixel_ntuplet_gpu_validation,steps['RECODR3_reHLT_Patatrack_PixelOnlyGPU']])
2913+
steps['RECODR3_reHLT_Patatrack_PixelOnlyGPUProfiling']=merge([{'-s':'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly','--customise':'RecoTracker/Configuration/customizePixelOnlyForProfiling.customizePixelOnlyForProfilingGPUOnly'},steps['RECODR3_reHLT_Patatrack_PixelOnlyGPU']])
29032914
steps['RECODR3_reHLT_Patatrack_PixelOnlyTripletsCPU']=merge([step3_pixel_ntuplet_cpu, step3_pixel_triplets, steps['RECODR3_reHLT_pixelTrackingOnly']])
29042915
steps['RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPU']=merge([step3_pixel_ntuplet_gpu, step3_pixel_triplets, steps['RECODR3_reHLT_pixelTrackingOnly']])
2916+
steps['RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPUValidation']=merge([{'--accelerators':'gpu-nvidia'},step3_pixel_ntuplet_gpu_validation,steps['RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPU']])
2917+
steps['RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPUProfiling']=merge([{'-s':'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly','--customise':'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,RecoTracker/Configuration/customizePixelOnlyForProfiling.customizePixelOnlyForProfilingGPUOnly'},steps['RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPU']])
29052918
steps['RECODR3_reHLT_ECALOnlyCPU']=merge([{'-s': 'RAW2DIGI:RawToDigi_ecalOnly,RECO:reconstruction_ecalOnly,DQM:@ecalOnly'},steps['RECODR3_reHLT_2023']])
29062919
steps['RECODR3_reHLT_ECALOnlyGPU']=merge([step3_gpu, steps['RECODR3_reHLT_ECALOnlyCPU']])
2920+
steps['RECODR3_reHLT_ECALOnlyGPUValidation']=merge([{'--accelerators':'gpu-nvidia','--procModifiers':'gpuValidation'},steps['RECODR3_reHLT_ECALOnlyGPU']])
2921+
steps['RECODR3_reHLT_ECALOnlyGPUProfiling']=merge([{'-s':'RAW2DIGI:RawToDigi_ecalOnly,RECO:reconstruction_ecalOnly', '--customise':'RecoLocalCalo/Configuration/customizeEcalOnlyForProfiling.customizeEcalOnlyForProfilingGPUOnly'},steps['RECODR3_reHLT_ECALOnlyGPU']])
29072922
steps['RECODR3_reHLT_HCALOnlyCPU']=merge([{'-s': 'RAW2DIGI:RawToDigi_hcalOnly,RECO:reconstruction_hcalOnly,DQM:@hcalOnly+@hcal2Only'},steps['RECODR3_reHLT_2023']])
29082923
steps['RECODR3_reHLT_HCALOnlyGPU']=merge([step3_gpu, steps['RECODR3_reHLT_HCALOnlyCPU']])
2924+
steps['RECODR3_reHLT_HCALOnlyGPUValidation']=merge([{'--accelerators':'gpu-nvidia','--procModifiers':'gpuValidation'},steps['RECODR3_reHLT_HCALOnlyGPU']])
2925+
steps['RECODR3_reHLT_HCALOnlyGPUProfiling']=merge([{'-s':'RAW2DIGI:RawToDigi_hcalOnly,RECO:reconstruction_hcalOnly','--customise':'RecoLocalCalo/Configuration/customizeHcalOnlyForProfiling.customizeHcalOnlyForProfilingGPUOnly'},steps['RECODR3_reHLT_HCALOnlyGPU']])
29092926

29102927
steps['RECONANORUN3_reHLT_2022']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQMFakeHLT+@miniAODDQM+@nanoAODDQM','--datatier':'RECO,MINIAOD,NANOAOD,DQMIO','--eventcontent':'RECO,MINIAOD,NANOEDMAOD,DQM'},steps['RECODR3_reHLT_2022']])
29112928
steps['RECONANORUN3_ZB_reHLT_2022']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM+@nanoAODDQM'},steps['RECONANORUN3_reHLT_2022']])
@@ -3586,9 +3603,12 @@ def gen2023HiMix(fragment,howMuch):
35863603
steps['HARVESTRUN3_ZB_2023B']=merge([{'--era':'Run3', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2022']])
35873604
steps['HARVESTRUN3_ZB_2023']=merge([{'--era':'Run3_2023', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2022']])
35883605
steps['HARVESTRUN3_COS_2023']=merge([{'--scenario':'cosmics', '--era':'Run3_2023', '-s':'HARVESTING:dqmHarvesting'},steps['HARVESTRUN3_2022']])
3589-
steps['HARVESTRUN3_pixelTrackingOnly'] = merge([ {'-s':'HARVESTING:@pixelTrackingOnlyDQM'}, steps['HARVESTRUN3_2023'] ])
3590-
steps['HARVESTRUN3_ECALOnly'] = merge([ {'-s':'HARVESTING:@ecal'}, steps['HARVESTRUN3_2023'] ])
3591-
steps['HARVESTRUN3_HCALOnly'] = merge([ {'-s':'HARVESTING:@hcalOnly'}, steps['HARVESTRUN3_2023'] ])
3606+
steps['HARVESTRUN3_pixelTrackingOnly'] = merge([ {'-s':'HARVESTING:@pixelTrackingOnlyDQM'}, steps['HARVESTRUN3_2023']])
3607+
steps['HARVESTRUN3_pixelTrackingOnlyGPUValidation'] = merge([ {'--procModifiers':'gpuValidation'}, steps['HARVESTRUN3_pixelTrackingOnly']])
3608+
steps['HARVESTRUN3_ECALOnly'] = merge([ {'-s':'HARVESTING:@ecal'}, steps['HARVESTRUN3_2023']])
3609+
steps['HARVESTRUN3_ECALOnlyGPUValidation'] = merge([ {'--procModifiers':'gpuValidation'}, steps['HARVESTRUN3_ECALOnly']])
3610+
steps['HARVESTRUN3_HCALOnly'] = merge([ {'-s':'HARVESTING:@hcalOnly'}, steps['HARVESTRUN3_2023']])
3611+
steps['HARVESTRUN3_HCALOnlyGPUValidation'] = merge([ {'--procModifiers':'gpuValidation'}, steps['HARVESTRUN3_HCALOnly']])
35923612

35933613

35943614
#MC

0 commit comments

Comments
 (0)