Skip to content

Commit 04cdcf2

Browse files
authored
Merge pull request #46853 from AdrianoDee/remove_cuda_wfs_and_pixel_cfgs
Removing CUDA/`gpu` from Pixel code configs and dropping all CUDA wfs
2 parents c43094a + cebdb4d commit 04cdcf2

File tree

41 files changed

+306
-1394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+306
-1394
lines changed

Calibration/LumiAlCaRecoProducers/python/ALCARECOLumiPixels_cff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
)
1010

1111
from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import siPixelDigis
12-
siPixelDigisForLumi = siPixelDigis.cpu.clone(
12+
siPixelDigisForLumi = siPixelDigis.clone(
1313
InputLabel = "hltFEDSelectorLumiPixels"
1414
)
1515

1616
from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizerPreSplitting_cfi import siPixelClustersPreSplitting
17-
siPixelClustersForLumi = siPixelClustersPreSplitting.cpu.clone(
17+
siPixelClustersForLumi = siPixelClustersPreSplitting.clone(
1818
src = "siPixelDigisForLumi"
1919
)
2020

Configuration/ProcessModifiers/python/pixelNtupletFit_cff.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

Configuration/PyReleaseValidation/README.md

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,9 @@ The offsets currently in use are:
4343
* 0.424: Alpaka, HCAL only, portable profiling
4444
* 0.492: Alpaka, full reco with pixel quadruplets
4545
* 0.496: Alpaka, full reco with pixel triplets
46-
* 0.5: Pixel tracking only + 0.1
47-
* 0.501: Patatrack, pixel only quadruplets, on CPU
48-
* 0.502: Patatrack, pixel only quadruplets, with automatic offload to GPU if available
49-
* 0.504: Patatrack, pixel only quadruplets, GPU profiling
50-
* 0.505: Patatrack, pixel only triplets, on CPU
51-
* 0.506: Patatrack, pixel only triplets, with automatic offload to GPU if available
52-
* 0.508: Patatrack, pixel only triplets, GPU profiling
53-
* 0.511: Patatrack, ECAL only, on CPU
54-
* 0.512: Patatrack, ECAL only, with automatic offload to GPU if available
55-
* 0.513: Patatrack, ECAL only, GPU vs. CPU validation
56-
* 0.514: Patatrack, ECAL only, GPU profiling
57-
* 0.521: Patatrack, HCAL only, on CPU
58-
* 0.522: Patatrack, HCAL only, with automatic offload to GPU if available
59-
* 0.524: Patatrack, HCAL only, GPU profiling
60-
* 0.591: Patatrack, full reco with pixel quadruplets, on CPU
61-
* 0.592: Patatrack, full reco with pixel quadruplets, with automatic offload to GPU if available
62-
* 0.595: Patatrack, full reco with pixel triplets, on CPU
63-
* 0.596: Patatrack, full reco with pixel triplets, with automatic offload to GPU if available
46+
* 0.5: Legacy pixel tracking only (CPU)
47+
* 0.511: Legacy ECAL reco only (CPU)
48+
* 0.521: Legacy HCAL reco only (CPU)
6449
* 0.6: HE Collapse (old depth segmentation for 2018)
6550
* 0.601: HLT as separate step
6651
* 0.7: trackingMkFit modifier

Configuration/PyReleaseValidation/python/relval_gpu.py

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242
# Alpaka pixel-only: TTbar with PU: quadruplets any backend, any backend vs cpu validation, profiling
4343

4444
numWFIB = [
45-
# 2023, Alpaka-based noPU
46-
12434.402,12434.403,12434.412,12434.422,12434.423,
4745

4846
# 2024, Alpaka-based noPU
4947
12834.402, 12834.403, 12834.404,
@@ -84,68 +82,69 @@
8482

8583
# data WFs to run in IB:
8684

87-
# data 2023 Patatrack pixel-only triplets: RunJetMET2022D on GPU (optional), RunJetMET2022D GPU-vs-CPU validation, RunJetMET2022D profiling
88-
# Patatrack ECAL-only: RunJetMET2022D on GPU (optional), RunJetMET2022D GPU-vs-CPU validation, RunJetMET2022D profiling
89-
# Patatrack HCAL-only: RunJetMET2022D on GPU (optional), RunJetMET2022D GPU-vs-CPU validation, RunJetMET2022D profiling
90-
workflows[141.008506] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU',[
91-
'RunJetMET2023B',
85+
# data 2023 Alpaka pixel-only triplets: RunJetMET2023D on GPU (optional), RunJetMET2023D GPU-vs-CPU validation, RunJetMET2023D profiling
86+
# Alpaka ECAL-only: RunJetMET2023D on GPU (optional), RunJetMET2023D GPU-vs-CPU validation, RunJetMET2023D profiling
87+
# Alpaka HCAL-only: RunJetMET2023D on GPU (optional), RunJetMET2023D GPU-vs-CPU validation, RunJetMET2023D profiling
88+
89+
workflows[141.044406] = ['Run3-2023_JetMET2023D_RecoPixelOnlyTripletsGPU',[
90+
'RunJetMET2023D',
9291
'HLTDR3_2023',
93-
'RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPU',
92+
'RECODR3_reHLT_Alpaka_PixelOnlyTripletsGPU',
9493
'HARVESTRUN3_pixelTrackingOnly'
9594
]]
96-
workflows[141.008507] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU_Validation',[
97-
'RunJetMET2023B',
95+
workflows[141.044407] = ['Run3-2023_JetMET2023D_RecoPixelOnlyTripletsGPU_Validation',[
96+
'RunJetMET2023D',
9897
'HLTDR3_2023',
99-
'RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPUValidation',
98+
'RECODR3_reHLT_Alpaka_PixelOnlyTripletsGPUValidation',
10099
'HARVESTRUN3_pixelTrackingOnlyGPUValidation'
101100
]]
102-
workflows[141.008508] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU_Profiling',[
103-
'RunJetMET2023B',
101+
workflows[141.044408] = ['Run3-2023_JetMET2023D_RecoPixelOnlyTripletsGPU_Profiling',[
102+
'RunJetMET2023D',
104103
'HLTDR3_2023',
105-
'RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPUProfiling'
104+
'RECODR3_reHLT_Alpaka_PixelOnlyTripletsGPUProfiling'
106105
]]
107106

108-
workflows[141.008512] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU',[
109-
'RunJetMET2023B',
107+
workflows[141.044412] = ['Run3-2023_JetMET2023D_RecoECALOnlyGPU',[
108+
'RunJetMET2023D',
110109
'HLTDR3_2023',
111-
'RECODR3_reHLT_ECALOnlyGPU',
110+
'RECODR3_reHLT_Alpaka_ECALOnlyGPU',
112111
'HARVESTRUN3_ECALOnly'
113112
]]
114-
workflows[141.008513] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU_Validation',[
115-
'RunJetMET2023B',
113+
workflows[141.044413] = ['Run3-2023_JetMET2023D_RecoECALOnlyGPU_Validation',[
114+
'RunJetMET2023D',
116115
'HLTDR3_2023',
117-
'RECODR3_reHLT_ECALOnlyGPUValidation',
116+
'RECODR3_reHLT_Alpaka_ECALOnlyGPUValidation',
118117
'HARVESTRUN3_ECALOnlyGPUValidation'
119118
]]
120-
workflows[141.008514] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU_Profiling',[
121-
'RunJetMET2023B',
119+
workflows[141.044414] = ['Run3-2023_JetMET2023D_RecoECALOnlyGPU_Profiling',[
120+
'RunJetMET2023D',
122121
'HLTDR3_2023',
123-
'RECODR3_reHLT_ECALOnlyGPUProfiling'
122+
'RECODR3_reHLT_Alpaka_ECALOnlyGPUProfiling'
124123
]]
125124

126-
workflows[141.008522] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU',[
127-
'RunJetMET2023B',
125+
workflows[141.044422] = ['Run3-2023_JetMET2023D_RecoHCALOnlyGPU',[
126+
'RunJetMET2023D',
128127
'HLTDR3_2023',
129-
'RECODR3_reHLT_HCALOnlyGPU',
128+
'RECODR3_reHLT_Alpaka_HCALOnlyGPU',
130129
'HARVESTRUN3_HCALOnly'
131130
]]
132-
workflows[141.008523] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU_Validation',[
133-
'RunJetMET2023B',
131+
workflows[141.044423] = ['Run3-2023_JetMET2023D_RecoHCALOnlyGPU_Validation',[
132+
'RunJetMET2023D',
134133
'HLTDR3_2023',
135-
'RECODR3_reHLT_HCALOnlyGPUValidation',
134+
'RECODR3_reHLT_Alpaka_HCALOnlyGPUValidation',
136135
'HARVESTRUN3_HCALOnlyGPUValidation'
137136
]]
138-
workflows[141.008524] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU_Profiling',[
139-
'RunJetMET2023B',
137+
workflows[141.044424] = ['Run3-2023_JetMET2023D_RecoHCALOnlyGPU_Profiling',[
138+
'RunJetMET2023D',
140139
'HLTDR3_2023',
141-
'RECODR3_reHLT_HCALOnlyGPUProfiling'
140+
'RECODR3_reHLT_Alpaka_HCALOnlyGPUProfiling'
142141
]]
143142

144-
workflows[141.008583] = ['Run3-2023_JetMET2023B_GPUValidation',[
145-
'RunJetMET2023B',
146-
'RecoData_Patatrack_AllGPU_Validation_2023',
147-
'HARVESTData_Patatrack_AllGPU_Validation_2023'
143+
workflows[141.044483] = ['Run3-2023_JetMET2023D_GPUValidation',[
144+
'RunJetMET2023D',
145+
'RecoData_Alpaka_AllGPU_Validation_2023',
146+
'HARVESTData_Alpaka_AllGPU_Validation_2023'
148147
]]
149148

150-
# 2023 HIon MC Patatrack pixel-only quadruplets on HydjetQ_MinBias_5362GeV_2023_ppReco on GPU (optional)
151-
workflows[160.03502] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackGPU','MINIHI2023PROD']]
149+
# 2023 HIon MC Alpaka pixel-only quadruplets on HydjetQ_MinBias_5362GeV_2023_ppReco on GPU (optional)
150+
workflows[160.03502] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_AlpakaGPU','MINIHI2023PROD']]

Configuration/PyReleaseValidation/python/relval_standard.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,9 @@
544544
workflows[141.114] = ['',['RunParkingDoubleMuonLowMass2023C','HLTDR3_2023','SKIMPARKINGDOUBLEMUONLOWMASS0RUN3_reHLT_2023','HARVESTRUN3_2023']]
545545

546546
### run3-2023 (2023 data) - Pixel-only (triplets), ECAL-only and HCAL-only
547-
workflows[141.008505] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsCPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_Patatrack_PixelOnlyTripletsCPU','HARVESTRUN3_pixelTrackingOnly']]
548-
workflows[141.008511] = ['Run3-2023_JetMET2023B_RecoECALOnlyCPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_ECALOnlyCPU','HARVESTRUN3_ECALOnly']]
549-
workflows[141.008521] = ['Run3-2023_JetMET2023B_RecoHCALOnlyCPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_HCALOnlyCPU','HARVESTRUN3_HCALOnly']]
547+
workflows[141.008405] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsCPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_Alpaka_PixelOnlyTripletsCPU','HARVESTRUN3_pixelTrackingOnly']]
548+
workflows[141.008411] = ['Run3-2023_JetMET2023B_RecoECALOnlyCPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_Alpaka_ECALOnlyCPU','HARVESTRUN3_ECALOnly']]
549+
workflows[141.008421] = ['Run3-2023_JetMET2023B_RecoHCALOnlyCPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_Alpaka_HCALOnlyCPU','HARVESTRUN3_HCALOnly']]
550550

551551
### run3-2023 (2023 HI UPC data)
552552
workflows[141.901] = ['',['RunUPC2023','RECODR3_2023_UPC','HARVESTDPROMPTR3']]
@@ -845,7 +845,7 @@
845845
workflows[160.3] = ['',['ZMM_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']]
846846
workflows[160.4] = ['',['ZEE_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']]
847847
# Patatrack Pixel Tracks on CPU
848-
workflows[160.501] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackCPU','MINIHI2023PROD']]
848+
workflows[160.401] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_AlpakaCPU','MINIHI2023PROD']]
849849
### Run 3 cond., 2024
850850
workflows[161] = ['',['HydjetQ_B12_5362GeV_2024','DIGIHI2024','RECOHI2024MB','ALCARECOHI2023PPRECO','HARVESTHI2024']]
851851
workflows[161.02] = ['',['HydjetQ_B12_5362GeV_2024','DIGIHI2024','RAWPRIMESIMHI18','RECOHI2024MBAPPROXCLUSTERS','ALCARECOHI2024','HARVESTHI2024S4']]

0 commit comments

Comments
 (0)