Skip to content

Commit

Permalink
Remove ExternalWork from EcalUncalibRecHitProducerGPU.
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomreis
thomreis committed Aug 25, 2022
1 parent d103406 commit f857a49
Showing 1 changed file with 69 additions and 81 deletions.
150 changes: 69 additions & 81 deletions RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@
#include "DeclsForKernels.h"
#include "EcalUncalibRecHitMultiFitAlgoGPU.h"

class EcalUncalibRecHitProducerGPU : public edm::stream::EDProducer<edm::ExternalWork> {
class EcalUncalibRecHitProducerGPU : public edm::stream::EDProducer<> {
public:
explicit EcalUncalibRecHitProducerGPU(edm::ParameterSet const& ps);
~EcalUncalibRecHitProducerGPU() override;
static void fillDescriptions(edm::ConfigurationDescriptions&);

private:
void acquire(edm::Event const&, edm::EventSetup const&, edm::WaitingTaskWithArenaHolder) override;
void produce(edm::Event&, edm::EventSetup const&) override;

private:
Expand All @@ -60,13 +59,6 @@ class EcalUncalibRecHitProducerGPU : public edm::stream::EDProducer<edm::Externa

// configuration parameters
ecal::multifit::ConfigurationParameters configParameters_;

// event data
ecal::multifit::EventOutputDataGPU eventOutputDataGPU_;

cms::cuda::ContextState cudaState_;

uint32_t neb_, nee_;
};

void EcalUncalibRecHitProducerGPU::fillDescriptions(edm::ConfigurationDescriptions& confDesc) {
Expand Down Expand Up @@ -190,95 +182,91 @@ EcalUncalibRecHitProducerGPU::EcalUncalibRecHitProducerGPU(const edm::ParameterS

EcalUncalibRecHitProducerGPU::~EcalUncalibRecHitProducerGPU() {}

void EcalUncalibRecHitProducerGPU::acquire(edm::Event const& event,
edm::EventSetup const& setup,
edm::WaitingTaskWithArenaHolder holder) {
void EcalUncalibRecHitProducerGPU::produce(edm::Event& event, edm::EventSetup const& setup) {
//DurationMeasurer<std::chrono::milliseconds> timer{std::string{"produce duration"}};

// cuda products
auto const& ebDigisProduct = event.get(digisTokenEB_);
auto const& eeDigisProduct = event.get(digisTokenEE_);
// event data
ecal::multifit::EventOutputDataGPU eventOutputDataGPU;

// raii
cms::cuda::ScopedContextAcquire ctx{ebDigisProduct, std::move(holder), cudaState_};
cms::cuda::ScopedContextProduce ctx{ebDigisProduct};

// get actual obj
auto const& ebDigis = ctx.get(ebDigisProduct);
auto const& eeDigis = ctx.get(eeDigisProduct);
ecal::multifit::EventInputDataGPU inputDataGPU{ebDigis, eeDigis};
neb_ = ebDigis.size;
nee_ = eeDigis.size;
const uint32_t neb = ebDigis.size;
const uint32_t nee = eeDigis.size;

// stop here if there are no digis
if (neb_ + nee_ == 0)
return;

if ((neb_ > configParameters_.maxNumberHitsEB) || (nee_ > configParameters_.maxNumberHitsEE)) {
edm::LogError("EcalUncalibRecHitProducerGPU")
<< "Max number of channels exceeded in barrel or endcap. Number of barrel channels: " << neb_
<< " with maxNumberHitsEB=" << configParameters_.maxNumberHitsEB << ", number of endcap channels: " << nee_
<< " with maxNumberHitsEE=" << configParameters_.maxNumberHitsEE;
if (neb + nee > 0) {
if ((neb > configParameters_.maxNumberHitsEB) || (nee > configParameters_.maxNumberHitsEE)) {
edm::LogError("EcalUncalibRecHitProducerGPU")
<< "Max number of channels exceeded in barrel or endcap. Number of barrel channels: " << neb
<< " with maxNumberHitsEB=" << configParameters_.maxNumberHitsEB << ", number of endcap channels: " << nee
<< " with maxNumberHitsEE=" << configParameters_.maxNumberHitsEE;
}

// conditions
auto const& timeCalibConstantsData = setup.getData(timeCalibConstantsToken_);
auto const& sampleMaskData = setup.getData(sampleMaskToken_);
auto const& timeOffsetConstantData = setup.getData(timeOffsetConstantToken_);
auto const& multifitParametersData = setup.getData(multifitParametersToken_);

auto const& pedestals = setup.getData(pedestalsToken_).getProduct(ctx.stream());
auto const& gainRatios = setup.getData(gainRatiosToken_).getProduct(ctx.stream());
auto const& pulseShapes = setup.getData(pulseShapesToken_).getProduct(ctx.stream());
auto const& pulseCovariances = setup.getData(pulseCovariancesToken_).getProduct(ctx.stream());
auto const& samplesCorrelation = setup.getData(samplesCorrelationToken_).getProduct(ctx.stream());
auto const& timeBiasCorrections = setup.getData(timeBiasCorrectionsToken_).getProduct(ctx.stream());
auto const& timeCalibConstants = timeCalibConstantsData.getProduct(ctx.stream());
auto const& multifitParameters = multifitParametersData.getProduct(ctx.stream());

// assign ptrs/values: this is done not to change how things look downstream
configParameters_.amplitudeFitParametersEB = multifitParameters.amplitudeFitParametersEB.get();
configParameters_.amplitudeFitParametersEE = multifitParameters.amplitudeFitParametersEE.get();
configParameters_.timeFitParametersEB = multifitParameters.timeFitParametersEB.get();
configParameters_.timeFitParametersEE = multifitParameters.timeFitParametersEE.get();
configParameters_.timeFitParametersSizeEB = multifitParametersData.getValues()[2].get().size();
configParameters_.timeFitParametersSizeEE = multifitParametersData.getValues()[3].get().size();

// bundle up conditions
ecal::multifit::ConditionsProducts conditions{pedestals,
gainRatios,
pulseShapes,
pulseCovariances,
samplesCorrelation,
timeBiasCorrections,
timeCalibConstants,
sampleMaskData,
timeOffsetConstantData,
timeCalibConstantsData.getOffset(),
multifitParameters};

// dev mem
eventOutputDataGPU.allocate(configParameters_, ctx.stream());

// scratch mem
ecal::multifit::EventDataForScratchGPU eventDataForScratchGPU;
eventDataForScratchGPU.allocate(configParameters_, ctx.stream());

//
// schedule algorithms
//
ecal::multifit::entryPoint(
inputDataGPU, eventOutputDataGPU, eventDataForScratchGPU, conditions, configParameters_, ctx.stream());
}

// conditions
auto const& timeCalibConstantsData = setup.getData(timeCalibConstantsToken_);
auto const& sampleMaskData = setup.getData(sampleMaskToken_);
auto const& timeOffsetConstantData = setup.getData(timeOffsetConstantToken_);
auto const& multifitParametersData = setup.getData(multifitParametersToken_);

auto const& pedestals = setup.getData(pedestalsToken_).getProduct(ctx.stream());
auto const& gainRatios = setup.getData(gainRatiosToken_).getProduct(ctx.stream());
auto const& pulseShapes = setup.getData(pulseShapesToken_).getProduct(ctx.stream());
auto const& pulseCovariances = setup.getData(pulseCovariancesToken_).getProduct(ctx.stream());
auto const& samplesCorrelation = setup.getData(samplesCorrelationToken_).getProduct(ctx.stream());
auto const& timeBiasCorrections = setup.getData(timeBiasCorrectionsToken_).getProduct(ctx.stream());
auto const& timeCalibConstants = timeCalibConstantsData.getProduct(ctx.stream());
auto const& multifitParameters = multifitParametersData.getProduct(ctx.stream());

// assign ptrs/values: this is done not to change how things look downstream
configParameters_.amplitudeFitParametersEB = multifitParameters.amplitudeFitParametersEB.get();
configParameters_.amplitudeFitParametersEE = multifitParameters.amplitudeFitParametersEE.get();
configParameters_.timeFitParametersEB = multifitParameters.timeFitParametersEB.get();
configParameters_.timeFitParametersEE = multifitParameters.timeFitParametersEE.get();
configParameters_.timeFitParametersSizeEB = multifitParametersData.getValues()[2].get().size();
configParameters_.timeFitParametersSizeEE = multifitParametersData.getValues()[3].get().size();

// bundle up conditions
ecal::multifit::ConditionsProducts conditions{pedestals,
gainRatios,
pulseShapes,
pulseCovariances,
samplesCorrelation,
timeBiasCorrections,
timeCalibConstants,
sampleMaskData,
timeOffsetConstantData,
timeCalibConstantsData.getOffset(),
multifitParameters};

// dev mem
eventOutputDataGPU_.allocate(configParameters_, ctx.stream());

// scratch mem
ecal::multifit::EventDataForScratchGPU eventDataForScratchGPU;
eventDataForScratchGPU.allocate(configParameters_, ctx.stream());

//
// schedule algorithms
//
ecal::multifit::entryPoint(
inputDataGPU, eventOutputDataGPU_, eventDataForScratchGPU, conditions, configParameters_, ctx.stream());
}

void EcalUncalibRecHitProducerGPU::produce(edm::Event& event, edm::EventSetup const& setup) {
//DurationMeasurer<std::chrono::milliseconds> timer{std::string{"produce duration"}};
cms::cuda::ScopedContextProduce ctx{cudaState_};

// set the size of eb and ee
eventOutputDataGPU_.recHitsEB.size = neb_;
eventOutputDataGPU_.recHitsEE.size = nee_;
eventOutputDataGPU.recHitsEB.size = neb;
eventOutputDataGPU.recHitsEE.size = nee;

// put into the event
ctx.emplace(event, recHitsTokenEB_, std::move(eventOutputDataGPU_.recHitsEB));
ctx.emplace(event, recHitsTokenEE_, std::move(eventOutputDataGPU_.recHitsEE));
ctx.emplace(event, recHitsTokenEB_, std::move(eventOutputDataGPU.recHitsEB));
ctx.emplace(event, recHitsTokenEE_, std::move(eventOutputDataGPU.recHitsEE));
}

DEFINE_FWK_MODULE(EcalUncalibRecHitProducerGPU);

0 comments on commit f857a49

Please sign in to comment.