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.

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

Jump to bottom

Redesign all GPU workflows to detect if a GPU is present, and fall back to CPU otherwise #33428

Merged
merged 11 commits into from
May 11, 2021
Merged

Redesign all GPU workflows to detect if a GPU is present, and fall back to CPU otherwise #33428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
436e922
Remove an unused modifier from the test files
fwyzard Apr 13, 2021
32ea552
Simplify the definition of the "Patatrack" workflows
fwyzard Apr 13, 2021
db8f341
Make the Pixel 'gpu' workflow use a GPU if available, and fall-back t…
fwyzard Apr 13, 2021
9e5d3ab
Remove obsolete configuration file
fwyzard Apr 15, 2021
887df18
Make the ECAL 'gpu' workflow use a GPU if available, and fall-back to…
fwyzard Apr 15, 2021
a929ca9
Update the DQM clients workflows for ecalDigis being a SwitchProducer
fwyzard Apr 20, 2021
90a90a6
Make the SoA and/or legacy collections optional
fwyzard Apr 20, 2021
33ef057
Make the HCAL 'gpu' workflow use a GPU if available, and fall-back to…
fwyzard Apr 20, 2021
3ead0e5
Rework the definition of the Patatrack pixel workflows
fwyzard Apr 22, 2021
109fbc4
Always clone() a module used in a SwitchProducer
fwyzard Apr 27, 2021
ad06d78
Move the implementation of the gpuVertexFinder kernels to gpuVertexFi…
fwyzard Apr 27, 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
18 changes: 9 additions & 9 deletions CalibTracker/Configuration/python/Reconstruction_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import FWCore.ParameterSet.Config as cms

#local reconstruction
# local reconstruction
from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import *
from EventFilter.SiStripRawToDigi.SiStripDigis_cfi import *
from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizerPreSplitting_cfi import *
from RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi import *
from RecoLocalTracker.SiStripClusterizer.SiStripClusterizer_cfi import *
recolocal = cms.Sequence( siPixelDigis*siPixelClustersPreSplitting*siStripDigis*siStripZeroSuppression*siStripClusters)
siPixelDigis.InputLabel = 'rawDataCollector'
recolocal = cms.Sequence(siPixelDigis + siPixelClustersPreSplitting + siStripDigis + siStripZeroSuppression + siStripClusters)
siPixelDigis.cpu.InputLabel = 'rawDataCollector'

#tracking
# tracking
from RecoVertex.BeamSpotProducer.BeamSpot_cff import *
from RecoLocalTracker.SiPixelRecHits.SiPixelRecHits_cfi import *
from RecoLocalTracker.SiStripRecHitConverter.SiStripRecHitConverter_cfi import *
from RecoTracker.Configuration.RecoTracker_cff import *
from RecoTracker.Configuration.RecoTrackerP5_cff import *
from RecoPixelVertexing.Configuration.RecoPixelVertexing_cff import *
recotrack = cms.Sequence( offlineBeamSpot + siPixelRecHitsPreSplitting*siStripMatchedRecHits*recopixelvertexing*ckftracks)
recotrackP5 = cms.Sequence( offlineBeamSpot + siPixelRecHitsPreSplitting*siStripMatchedRecHits*recopixelvertexing*ctftracksP5)
recotrack = cms.Sequence(offlineBeamSpot + siPixelRecHitsPreSplitting + siStripMatchedRecHits + recopixelvertexing + ckftracks)
recotrackP5 = cms.Sequence(offlineBeamSpot + siPixelRecHitsPreSplitting + siStripMatchedRecHits + recopixelvertexing + ctftracksP5)

#Schedule
reconstruction_step = cms.Path( recolocal + recotrack )
reconstructionP5_step = cms.Path( recolocal + recotrackP5 )
# Schedule
reconstruction_step = cms.Path(recolocal + recotrack)
reconstructionP5_step = cms.Path(recolocal + recotrackP5)
5 changes: 0 additions & 5 deletions Configuration/ProcessModifiers/python/pixelNtupleFit_cff.py
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions Configuration/ProcessModifiers/python/pixelNtupletFit_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

# This modifier is for replacing the legacy pixel tracks with the "Patatrack" pixel ntuplets,
# fishbone cleaning, and either the Broken Line fit (by default) or the Riemann fit.
# It also replaces the "gap" pixel vertices with a density-based vertex reconstruction algorithm.

pixelNtupletFit = cms.Modifier()
11 changes: 7 additions & 4 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,10 +2187,13 @@ def gen2021HiMix(fragment,howMuch):
}

step3_pixel_ntuplet_cpu = {
'--customise': 'RecoPixelVertexing/Configuration/customizePixelTracksSoAonCPU.customizePixelTracksSoAonCPU'
'--procModifiers': 'pixelNtupletFit'
}
step3_pixel_ntuplet_gpu = {
'--procModifiers': 'pixelNtupletFit,gpu'
}
step3_pixel_triplets = {
'--customise': 'RecoPixelVertexing/Configuration/customizePixelTracksSoAonCPU.customizePixelTracksForTriplets'
'--customise': 'RecoPixelVertexing/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets'
}
step3_gpu = {
'--procModifiers': 'gpu',
Expand Down Expand Up @@ -2324,9 +2327,9 @@ def gen2021HiMix(fragment,howMuch):
steps['RECODR2_2018reHLT_ZBPrompt']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2018reHLT']])
steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']=merge([{'-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,DQM:@pixelTrackingOnlyDQM'},steps['RECODR2_2018reHLT_Prompt']])
steps['RECODR2_2018reHLT_Patatrack_PixelOnlyCPU']=merge([step3_pixel_ntuplet_cpu, steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']])
steps['RECODR2_2018reHLT_Patatrack_PixelOnlyGPU']=merge([step3_gpu, steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']])
steps['RECODR2_2018reHLT_Patatrack_PixelOnlyGPU']=merge([step3_pixel_ntuplet_gpu, steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']])
steps['RECODR2_2018reHLT_Patatrack_PixelOnlyTripletsCPU']=merge([step3_pixel_ntuplet_cpu, step3_pixel_triplets, steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']])
steps['RECODR2_2018reHLT_Patatrack_PixelOnlyTripletsGPU']=merge([step3_gpu, step3_pixel_triplets, steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']])
steps['RECODR2_2018reHLT_Patatrack_PixelOnlyTripletsGPU']=merge([step3_pixel_ntuplet_gpu, step3_pixel_triplets, steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']])

steps['RECODR2_2018reHLT_ECALOnlyCPU']=merge([{'-s': 'RAW2DIGI:RawToDigi_ecalOnly,RECO:reconstruction_ecalOnly,DQM:@ecalOnly'},steps['RECODR2_2018reHLT_Prompt']])
steps['RECODR2_2018reHLT_ECALOnlyGPU']=merge([step3_gpu, steps['RECODR2_2018reHLT_ECALOnlyCPU']])
Expand Down
Loading