Skip to content
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.

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

Removing CUDA/gpu from Pixel code configs and dropping all CUDA wfs #46853

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
)

from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import siPixelDigis
siPixelDigisForLumi = siPixelDigis.cpu.clone(
siPixelDigisForLumi = siPixelDigis.clone(
InputLabel = "hltFEDSelectorLumiPixels"
)

from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizerPreSplitting_cfi import siPixelClustersPreSplitting
siPixelClustersForLumi = siPixelClustersPreSplitting.cpu.clone(
siPixelClustersForLumi = siPixelClustersPreSplitting.clone(
src = "siPixelDigisForLumi"
)

Expand Down
7 changes: 0 additions & 7 deletions Configuration/ProcessModifiers/python/pixelNtupletFit_cff.py

This file was deleted.

21 changes: 3 additions & 18 deletions Configuration/PyReleaseValidation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,9 @@ The offsets currently in use are:
* 0.424: Alpaka, HCAL only, portable profiling
* 0.492: Alpaka, full reco with pixel quadruplets
* 0.496: Alpaka, full reco with pixel triplets
* 0.5: Pixel tracking only + 0.1
* 0.501: Patatrack, pixel only quadruplets, on CPU
* 0.502: Patatrack, pixel only quadruplets, with automatic offload to GPU if available
* 0.504: Patatrack, pixel only quadruplets, GPU profiling
* 0.505: Patatrack, pixel only triplets, on CPU
* 0.506: Patatrack, pixel only triplets, with automatic offload to GPU if available
* 0.508: Patatrack, pixel only triplets, GPU profiling
* 0.511: Patatrack, ECAL only, on CPU
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should keep .511 and .521 (just remove Patatrack from the names): those are CPU-only using the legacy modules, might still be useful for comparison and validation.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For the pixel part technically these run the CPU Patatrack (so legacy until clusters and then ... non-legacy). I can restore them moving them to use fully the legacy reco.

Copy link
Contributor

Choose a reason for hiding this comment

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

.511 and .521 should be ECAL only and HCAL only, no Pixel.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah sorry I have misread!

* 0.512: Patatrack, ECAL only, with automatic offload to GPU if available
* 0.513: Patatrack, ECAL only, GPU vs. CPU validation
* 0.514: Patatrack, ECAL only, GPU profiling
* 0.521: Patatrack, HCAL only, on CPU
* 0.522: Patatrack, HCAL only, with automatic offload to GPU if available
* 0.524: Patatrack, HCAL only, GPU profiling
* 0.591: Patatrack, full reco with pixel quadruplets, on CPU
* 0.592: Patatrack, full reco with pixel quadruplets, with automatic offload to GPU if available
* 0.595: Patatrack, full reco with pixel triplets, on CPU
* 0.596: Patatrack, full reco with pixel triplets, with automatic offload to GPU if available
* 0.5: Legacy pixel tracking only (CPU)
* 0.511: Legacy ECAL reco only (CPU)
* 0.521: Legacy HCAL reco only (CPU)
* 0.6: HE Collapse (old depth segmentation for 2018)
* 0.601: HLT as separate step
* 0.7: trackingMkFit modifier
Expand Down
75 changes: 37 additions & 38 deletions Configuration/PyReleaseValidation/python/relval_gpu.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
# Alpaka pixel-only: TTbar with PU: quadruplets any backend, any backend vs cpu validation, profiling

numWFIB = [
# 2023, Alpaka-based noPU
12434.402,12434.403,12434.412,12434.422,12434.423,

# 2024, Alpaka-based noPU
12834.402, 12834.403, 12834.404,
Expand Down Expand Up @@ -86,68 +84,69 @@

# data WFs to run in IB:

# data 2023 Patatrack pixel-only triplets: RunJetMET2022D on GPU (optional), RunJetMET2022D GPU-vs-CPU validation, RunJetMET2022D profiling
# Patatrack ECAL-only: RunJetMET2022D on GPU (optional), RunJetMET2022D GPU-vs-CPU validation, RunJetMET2022D profiling
# Patatrack HCAL-only: RunJetMET2022D on GPU (optional), RunJetMET2022D GPU-vs-CPU validation, RunJetMET2022D profiling
workflows[141.008506] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU',[
'RunJetMET2023B',
# data 2023 Alpaka pixel-only triplets: RunJetMET2023D on GPU (optional), RunJetMET2023D GPU-vs-CPU validation, RunJetMET2023D profiling
# Alpaka ECAL-only: RunJetMET2023D on GPU (optional), RunJetMET2023D GPU-vs-CPU validation, RunJetMET2023D profiling
# Alpaka HCAL-only: RunJetMET2023D on GPU (optional), RunJetMET2023D GPU-vs-CPU validation, RunJetMET2023D profiling

workflows[141.044406] = ['Run3-2023_JetMET2023D_RecoPixelOnlyTripletsGPU',[
'RunJetMET2023D',
'HLTDR3_2023',
'RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPU',
'RECODR3_reHLT_Alpaka_PixelOnlyTripletsGPU',
'HARVESTRUN3_pixelTrackingOnly'
]]
workflows[141.008507] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU_Validation',[
'RunJetMET2023B',
workflows[141.044407] = ['Run3-2023_JetMET2023D_RecoPixelOnlyTripletsGPU_Validation',[
'RunJetMET2023D',
'HLTDR3_2023',
'RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPUValidation',
'RECODR3_reHLT_Alpaka_PixelOnlyTripletsGPUValidation',
'HARVESTRUN3_pixelTrackingOnlyGPUValidation'
]]
workflows[141.008508] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU_Profiling',[
'RunJetMET2023B',
workflows[141.044408] = ['Run3-2023_JetMET2023D_RecoPixelOnlyTripletsGPU_Profiling',[
'RunJetMET2023D',
'HLTDR3_2023',
'RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPUProfiling'
'RECODR3_reHLT_Alpaka_PixelOnlyTripletsGPUProfiling'
]]

workflows[141.008512] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU',[
'RunJetMET2023B',
workflows[141.044412] = ['Run3-2023_JetMET2023D_RecoECALOnlyGPU',[
'RunJetMET2023D',
'HLTDR3_2023',
'RECODR3_reHLT_ECALOnlyGPU',
'RECODR3_reHLT_Alpaka_ECALOnlyGPU',
'HARVESTRUN3_ECALOnly'
]]
workflows[141.008513] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU_Validation',[
'RunJetMET2023B',
workflows[141.044413] = ['Run3-2023_JetMET2023D_RecoECALOnlyGPU_Validation',[
'RunJetMET2023D',
'HLTDR3_2023',
'RECODR3_reHLT_ECALOnlyGPUValidation',
'RECODR3_reHLT_Alpaka_ECALOnlyGPUValidation',
'HARVESTRUN3_ECALOnlyGPUValidation'
]]
workflows[141.008514] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU_Profiling',[
'RunJetMET2023B',
workflows[141.044414] = ['Run3-2023_JetMET2023D_RecoECALOnlyGPU_Profiling',[
'RunJetMET2023D',
'HLTDR3_2023',
'RECODR3_reHLT_ECALOnlyGPUProfiling'
'RECODR3_reHLT_Alpaka_ECALOnlyGPUProfiling'
]]

workflows[141.008522] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU',[
'RunJetMET2023B',
workflows[141.044422] = ['Run3-2023_JetMET2023D_RecoHCALOnlyGPU',[
'RunJetMET2023D',
'HLTDR3_2023',
'RECODR3_reHLT_HCALOnlyGPU',
'RECODR3_reHLT_Alpaka_HCALOnlyGPU',
'HARVESTRUN3_HCALOnly'
]]
workflows[141.008523] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU_Validation',[
'RunJetMET2023B',
workflows[141.044423] = ['Run3-2023_JetMET2023D_RecoHCALOnlyGPU_Validation',[
'RunJetMET2023D',
'HLTDR3_2023',
'RECODR3_reHLT_HCALOnlyGPUValidation',
'RECODR3_reHLT_Alpaka_HCALOnlyGPUValidation',
'HARVESTRUN3_HCALOnlyGPUValidation'
]]
workflows[141.008524] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU_Profiling',[
'RunJetMET2023B',
workflows[141.044424] = ['Run3-2023_JetMET2023D_RecoHCALOnlyGPU_Profiling',[
'RunJetMET2023D',
'HLTDR3_2023',
'RECODR3_reHLT_HCALOnlyGPUProfiling'
'RECODR3_reHLT_Alpaka_HCALOnlyGPUProfiling'
]]

workflows[141.008583] = ['Run3-2023_JetMET2023B_GPUValidation',[
'RunJetMET2023B',
'RecoData_Patatrack_AllGPU_Validation_2023',
'HARVESTData_Patatrack_AllGPU_Validation_2023'
workflows[141.044483] = ['Run3-2023_JetMET2023D_GPUValidation',[
'RunJetMET2023D',
'RecoData_Alpaka_AllGPU_Validation_2023',
'HARVESTData_Alpaka_AllGPU_Validation_2023'
]]

# 2023 HIon MC Patatrack pixel-only quadruplets on HydjetQ_MinBias_5362GeV_2023_ppReco on GPU (optional)
workflows[160.03502] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackGPU','MINIHI2023PROD']]
# 2023 HIon MC Alpaka pixel-only quadruplets on HydjetQ_MinBias_5362GeV_2023_ppReco on GPU (optional)
workflows[160.03502] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_AlpakaGPU','MINIHI2023PROD']]
8 changes: 4 additions & 4 deletions Configuration/PyReleaseValidation/python/relval_standard.py
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,9 @@
workflows[141.114] = ['',['RunParkingDoubleMuonLowMass2023C','HLTDR3_2023','SKIMPARKINGDOUBLEMUONLOWMASS0RUN3_reHLT_2023','HARVESTRUN3_2023']]

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

### run3-2023 (2023 HI UPC data)
workflows[141.901] = ['',['RunUPC2023','RECODR3_2023_UPC','HARVESTDPROMPTR3']]
Expand Down Expand Up @@ -876,7 +876,7 @@
workflows[160.3] = ['',['ZMM_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']]
workflows[160.4] = ['',['ZEE_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']]
# Patatrack Pixel Tracks on CPU
workflows[160.501] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackCPU','MINIHI2023PROD']]
workflows[160.401] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_AlpakaCPU','MINIHI2023PROD']]
### Run 3 cond., 2024
workflows[161] = ['',['HydjetQ_B12_5362GeV_2024','DIGIHI2024','RECOHI2024MB','ALCARECOHI2023PPRECO','HARVESTHI2024']]
workflows[161.02] = ['',['HydjetQ_B12_5362GeV_2024','DIGIHI2024','RAWPRIMESIMHI18','RECOHI2024MBAPPROXCLUSTERS','ALCARECOHI2024','HARVESTHI2024S4']]
Expand Down
Loading