From fa62e7d3b1f0ddbaa99a38790c17ceff2230696d Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Wed, 13 Mar 2019 10:04:32 -0500 Subject: [PATCH] Next prototype of the framework integration (cms-patatrack#100) Provide a mechanism for a chain of modules to share a resource, that can be e.g. CUDA device memory or a CUDA stream. Minimize data movements between the CPU and the device, and support multiple devices. Allow the same job configuration to be used on all hardware combinations. See HeterogeneousCore/CUDACore/README.md for a more detailed description and examples. --- .../StandardSequences/python/RawToDigi_cff.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Configuration/StandardSequences/python/RawToDigi_cff.py b/Configuration/StandardSequences/python/RawToDigi_cff.py index 96aaeebbfaacd..ed10c78a40c9b 100644 --- a/Configuration/StandardSequences/python/RawToDigi_cff.py +++ b/Configuration/StandardSequences/python/RawToDigi_cff.py @@ -3,7 +3,7 @@ # This object is used to selectively make changes for different running # scenarios. In this case it makes changes for Run 2. -from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import * +from EventFilter.SiPixelRawToDigi.siPixelDigis_cff import * from EventFilter.SiStripRawToDigi.SiStripDigis_cfi import * @@ -49,7 +49,7 @@ from EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff import * RawToDigiTask = cms.Task(L1TRawToDigiTask, - siPixelDigis, + siPixelDigisTask, siStripDigis, ecalDigis, ecalPreshowerDigis, @@ -64,15 +64,14 @@ ) RawToDigi = cms.Sequence(RawToDigiTask) -RawToDigiTask_noTk = RawToDigiTask.copyAndExclude([siPixelDigis, siStripDigis]) +RawToDigiTask_noTk = RawToDigiTask.copyAndExclude([siPixelDigisTask, siStripDigis]) RawToDigi_noTk = cms.Sequence(RawToDigiTask_noTk) -RawToDigiTask_pixelOnly = cms.Task(siPixelDigis) +RawToDigiTask_pixelOnly = cms.Task(siPixelDigisTask) RawToDigi_pixelOnly = cms.Sequence(RawToDigiTask_pixelOnly) scalersRawToDigi.scalersInputTag = 'rawDataCollector' -from Configuration.ProcessModifiers.gpu_cff import gpu -(~gpu).toModify(siPixelDigis, InputLabel = 'rawDataCollector') +siPixelDigis.cpu.InputLabel = 'rawDataCollector' #false by default anyways ecalDigis.DoRegional = False ecalDigis.InputLabel = 'rawDataCollector' ecalPreshowerDigis.sourceTag = 'rawDataCollector'