Skip to content

Commit

Permalink
Create new GpuTask module to monitor and compare CPU and GPU generate…
Browse files Browse the repository at this point in the history
…d Ecal reco objects
  • Loading branch information
alejands committed Jan 19, 2022
1 parent df76a09 commit c26b2fc
Show file tree
Hide file tree
Showing 8 changed files with 1,249 additions and 3 deletions.
26 changes: 25 additions & 1 deletion DQM/EcalMonitorTasks/interface/Collections.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@ namespace ecaldqm {
kEEBasicCluster,
kEBSuperCluster,
kEESuperCluster,
kEBCpuDigi,
kEECpuDigi,
kEBGpuDigi,
kEEGpuDigi,
kEBCpuUncalibRecHit,
kEECpuUncalibRecHit,
kEBGpuUncalibRecHit,
kEEGpuUncalibRecHit,
kEBCpuRecHit,
kEECpuRecHit,
kEBGpuRecHit,
kEEGpuRecHit,
nCollections
};

Expand Down Expand Up @@ -78,7 +90,19 @@ namespace ecaldqm {
"EBBasicCluster",
"EEBasicCluster",
"EBSuperCluster",
"EESuperCluster"};
"EESuperCluster",
"EBCpuDigi",
"EECpuDigi",
"EBGpuDigi",
"EEGpuDigi",
"EBCpuUncalibRecHit",
"EECpuUncalibRecHit",
"EBGpuUncalibRecHit",
"EEGpuUncalibRecHit",
"EBCpuRecHit",
"EECpuRecHit",
"EBGpuRecHit",
"EEGpuRecHit"};

} // namespace ecaldqm

Expand Down
106 changes: 106 additions & 0 deletions DQM/EcalMonitorTasks/interface/GpuTask.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
#ifndef DQM_EcalMonitorTasks_GpuTask_H
#define DQM_EcalMonitorTasks_GpuTask_H

#include "DQWorkerTask.h"

#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"

namespace ecaldqm {

class GpuTask : public DQWorkerTask {
public:
GpuTask();
~GpuTask() override {}

void addDependencies(DependencySet&) override;

bool filterRunType(short const*) override;

void beginEvent(edm::Event const&, edm::EventSetup const&, bool const&, bool&) override;
bool analyze(void const*, Collections) override;

template <typename DigiCollection>
void runOnCpuDigis(DigiCollection const&, Collections);
template <typename DigiCollection>
void runOnGpuDigis(DigiCollection const&, Collections);
void runOnCpuUncalibRecHits(EcalUncalibratedRecHitCollection const&, Collections);
void runOnGpuUncalibRecHits(EcalUncalibratedRecHitCollection const&, Collections);
void runOnCpuRecHits(EcalRecHitCollection const&, Collections);
void runOnGpuRecHits(EcalRecHitCollection const&, Collections);

private:
void setParams(edm::ParameterSet const&) override;

bool runGpuTask_;
bool gpuOnlyPlots_;
std::vector<int> uncalibOOTAmps_;

// Static cast to EB/EEDigiCollection when using
// Defined as void pointers to make compiler happy
void const* EBCpuDigis_;
void const* EECpuDigis_;

EcalUncalibratedRecHitCollection const* EBCpuUncalibRecHits_;
EcalUncalibratedRecHitCollection const* EECpuUncalibRecHits_;

EcalRecHitCollection const* EBCpuRecHits_;
EcalRecHitCollection const* EECpuRecHits_;
};

inline bool GpuTask::analyze(void const* _p, Collections _collection) {
switch (_collection) {
case kEBCpuDigi:
if (_p && runGpuTask_)
runOnCpuDigis(*static_cast<EBDigiCollection const*>(_p), _collection);
return runGpuTask_;
break;
case kEECpuDigi:
if (_p && runGpuTask_)
runOnCpuDigis(*static_cast<EEDigiCollection const*>(_p), _collection);
return runGpuTask_;
break;
case kEBGpuDigi:
if (_p && runGpuTask_)
runOnGpuDigis(*static_cast<EBDigiCollection const*>(_p), _collection);
return runGpuTask_;
break;
case kEEGpuDigi:
if (_p && runGpuTask_)
runOnGpuDigis(*static_cast<EEDigiCollection const*>(_p), _collection);
return runGpuTask_;
break;
case kEBCpuUncalibRecHit:
case kEECpuUncalibRecHit:
if (_p && runGpuTask_)
runOnCpuUncalibRecHits(*static_cast<EcalUncalibratedRecHitCollection const*>(_p), _collection);
return runGpuTask_;
break;
case kEBGpuUncalibRecHit:
case kEEGpuUncalibRecHit:
if (_p && runGpuTask_)
runOnGpuUncalibRecHits(*static_cast<EcalUncalibratedRecHitCollection const*>(_p), _collection);
return runGpuTask_;
break;
case kEBCpuRecHit:
case kEECpuRecHit:
if (_p && runGpuTask_)
runOnCpuRecHits(*static_cast<EcalRecHitCollection const*>(_p), _collection);
return runGpuTask_;
break;
case kEBGpuRecHit:
case kEEGpuRecHit:
if (_p && runGpuTask_)
runOnGpuRecHits(*static_cast<EcalRecHitCollection const*>(_p), _collection);
return runGpuTask_;
break;
default:
break;
}

return false;
}

} // namespace ecaldqm

#endif
12 changes: 12 additions & 0 deletions DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,14 @@ void EcalDQMonitorTask::formSchedule(std::vector<ecaldqm::Collections> const& _p
sch.first = &EcalDQMonitorTask::runOnCollection<EESrFlagCollection>;
break;
case ecaldqm::kEBDigi:
case ecaldqm::kEBCpuDigi:
case ecaldqm::kEBGpuDigi:
collectionTokens_[*colItr] = edm::EDGetToken(consumes<EBDigiCollection>(tag));
sch.first = &EcalDQMonitorTask::runOnCollection<EBDigiCollection>;
break;
case ecaldqm::kEEDigi:
case ecaldqm::kEECpuDigi:
case ecaldqm::kEEGpuDigi:
collectionTokens_[*colItr] = edm::EDGetToken(consumes<EEDigiCollection>(tag));
sch.first = &EcalDQMonitorTask::runOnCollection<EEDigiCollection>;
break;
Expand All @@ -112,13 +116,21 @@ void EcalDQMonitorTask::formSchedule(std::vector<ecaldqm::Collections> const& _p
case ecaldqm::kEELaserLedUncalibRecHit:
case ecaldqm::kEBTestPulseUncalibRecHit:
case ecaldqm::kEETestPulseUncalibRecHit:
case ecaldqm::kEBCpuUncalibRecHit:
case ecaldqm::kEECpuUncalibRecHit:
case ecaldqm::kEBGpuUncalibRecHit:
case ecaldqm::kEEGpuUncalibRecHit:
collectionTokens_[*colItr] = edm::EDGetToken(consumes<EcalUncalibratedRecHitCollection>(tag));
sch.first = &EcalDQMonitorTask::runOnCollection<EcalUncalibratedRecHitCollection>;
break;
case ecaldqm::kEBRecHit:
case ecaldqm::kEBReducedRecHit:
case ecaldqm::kEERecHit:
case ecaldqm::kEEReducedRecHit:
case ecaldqm::kEBCpuRecHit:
case ecaldqm::kEECpuRecHit:
case ecaldqm::kEBGpuRecHit:
case ecaldqm::kEEGpuRecHit:
collectionTokens_[*colItr] = edm::EDGetToken(consumes<EcalRecHitCollection>(tag));
sch.first = &EcalDQMonitorTask::runOnCollection<EcalRecHitCollection>;
break;
Expand Down
14 changes: 13 additions & 1 deletion DQM/EcalMonitorTasks/python/CollectionTags_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,17 @@
EBBasicCluster = cms.untracked.InputTag("particleFlowClusterECAL"),
EEBasicCluster = cms.untracked.InputTag("particleFlowClusterECAL"),
EBSuperCluster = cms.untracked.InputTag("particleFlowSuperClusterECAL", "particleFlowSuperClusterECALBarrel"),
EESuperCluster = cms.untracked.InputTag("particleFlowSuperClusterECAL", "particleFlowSuperClusterECALEndcapWithPreshower")
EESuperCluster = cms.untracked.InputTag("particleFlowSuperClusterECAL", "particleFlowSuperClusterECALEndcapWithPreshower"),
EBCpuDigi = cms.untracked.InputTag("ecalDigis@cpu", "ebDigis"),
EECpuDigi = cms.untracked.InputTag("ecalDigis@cpu", "eeDigis"),
EBGpuDigi = cms.untracked.InputTag("ecalDigis@cuda", "ebDigis"),
EEGpuDigi = cms.untracked.InputTag("ecalDigis@cuda", "eeDigis"),
EBCpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cpu", "EcalUncalibRecHitsEB"),
EECpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cpu", "EcalUncalibRecHitsEE"),
EBGpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cuda", "EcalUncalibRecHitsEB"),
EEGpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cuda", "EcalUncalibRecHitsEE"),
EBCpuRecHit = cms.untracked.InputTag("ecalRecHit@cpu", "EcalRecHitsEB"),
EECpuRecHit = cms.untracked.InputTag("ecalRecHit@cpu", "EcalRecHitsEE"),
EBGpuRecHit = cms.untracked.InputTag("ecalRecHit@cuda", "EcalRecHitsEB"),
EEGpuRecHit = cms.untracked.InputTag("ecalRecHit@cuda", "EcalRecHitsEE")
)
11 changes: 11 additions & 0 deletions DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import FWCore.ParameterSet.Config as cms

from DQM.EcalMonitorTasks.EcalMonitorTask_cfi import *

# Customization to run the CPU vs GPU comparison task if the job runs on a GPU enabled machine
from Configuration.ProcessModifiers.gpu_cff import gpu
from DQM.EcalMonitorTasks.GpuTask_cfi import ecalGpuTask

gpu.toModify(ecalGpuTask.params, runGpuTask = cms.untracked.bool(True))
gpu.toModify(ecalMonitorTask.workers, func = lambda workers: workers.append("GpuTask"))
gpu.toModify(ecalMonitorTask, workerParameters = dict(GpuTask = ecalGpuTask))
Loading

0 comments on commit c26b2fc

Please sign in to comment.