Skip to content

Commit 00cd877

Browse files
thomreisthomreis
committed
Implement comments.
1 parent 897543e commit 00cd877

File tree

14 files changed

+385
-417
lines changed

14 files changed

+385
-417
lines changed

‎CondFormats/DataRecord/interface/EcalRecHitParametersRcd.h‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎CondFormats/DataRecord/src/EcalRecHitParametersRcd.cc‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎DataFormats/CaloRecHit/interface/CaloRecHit.h‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
#include "DataFormats/DetId/interface/DetId.h"
55
#include <ostream>
66

7-
#ifdef __CUDA_ARCH__
7+
#if defined(__CUDA_ARCH__) or defined(__HIP_DEVICE_COMPILE__)
88
__constant__
9-
#else
10-
constexpr
119
#endif
12-
uint32_t calo_rechit_masks[] = {0x00000000u, 0x00000001u, 0x00000003u, 0x00000007u, 0x0000000fu, 0x0000001fu,
13-
0x0000003fu, 0x0000007fu, 0x000000ffu, 0x000001ffu, 0x000003ffu, 0x000007ffu,
14-
0x00000fffu, 0x00001fffu, 0x00003fffu, 0x00007fffu, 0x0000ffffu, 0x0001ffffu,
15-
0x0003ffffu, 0x0007ffffu, 0x000fffffu, 0x001fffffu, 0x003fffffu, 0x007fffffu,
16-
0x00ffffffu, 0x01ffffffu, 0x03ffffffu, 0x07ffffffu, 0x0fffffffu, 0x1fffffffu,
17-
0x3fffffffu, 0x7fffffffu, 0xffffffffu};
10+
constexpr uint32_t calo_rechit_masks[] = {
11+
0x00000000u, 0x00000001u, 0x00000003u, 0x00000007u, 0x0000000fu, 0x0000001fu, 0x0000003fu,
12+
0x0000007fu, 0x000000ffu, 0x000001ffu, 0x000003ffu, 0x000007ffu, 0x00000fffu, 0x00001fffu,
13+
0x00003fffu, 0x00007fffu, 0x0000ffffu, 0x0001ffffu, 0x0003ffffu, 0x0007ffffu, 0x000fffffu,
14+
0x001fffffu, 0x003fffffu, 0x007fffffu, 0x00ffffffu, 0x01ffffffu, 0x03ffffffu, 0x07ffffffu,
15+
0x0fffffffu, 0x1fffffffu, 0x3fffffffu, 0x7fffffffu, 0xffffffffu};
1816

1917
/** \class CaloRecHit
2018
*

‎DataFormats/EcalRecHit/src/classes_def.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,12 @@
4242
<class name="EcalOotAmpArray"/>
4343
<class name="EcalUncalibratedRecHitSoA"/>
4444
<class name="EcalUncalibratedRecHitSoA::View"/>
45-
<class name="EcalUncalibratedRecHitHostCollection" ClassVersion="3">
46-
<version ClassVersion="3" checksum="2717044868"/>
47-
</class>
45+
<class name="EcalUncalibratedRecHitHostCollection"/>
4846
<class name="edm::Wrapper<EcalUncalibratedRecHitHostCollection>" splitLevel="0"/>
4947

5048
<class name="EcalRecHitSoA"/>
5149
<class name="EcalRecHitSoA::View"/>
52-
<class name="EcalRecHitHostCollection" ClassVersion="3">
53-
<version ClassVersion="3" checksum="446484604"/>
54-
</class>
50+
<class name="EcalRecHitHostCollection"/>
5551
<class name="edm::Wrapper<EcalRecHitHostCollection>" splitLevel="0"/>
5652

5753
</lcgdict>

‎RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitSoAToLegacy.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
#include "FWCore/Framework/interface/Event.h"
66
#include "FWCore/Framework/interface/EventSetup.h"
77
#include "FWCore/Framework/interface/MakerMacros.h"
8-
#include "FWCore/Framework/interface/stream/EDProducer.h"
8+
#include "FWCore/Framework/interface/global/EDProducer.h"
99
#include "FWCore/ParameterSet/interface/ParameterSet.h"
1010
#include "FWCore/ParameterSet/interface/EmptyGroupDescription.h"
1111
#include "FWCore/Utilities/interface/EDGetToken.h"
1212
#include "FWCore/Utilities/interface/EDPutToken.h"
1313

14-
class EcalRecHitSoAToLegacy : public edm::stream::EDProducer<> {
14+
class EcalRecHitSoAToLegacy : public edm::global::EDProducer<> {
1515
public:
1616
explicit EcalRecHitSoAToLegacy(edm::ParameterSet const &ps);
1717
~EcalRecHitSoAToLegacy() override = default;
1818
static void fillDescriptions(edm::ConfigurationDescriptions &);
1919

2020
private:
2121
using InputProduct = EcalRecHitHostCollection;
22-
void produce(edm::Event &, edm::EventSetup const &) override;
22+
void produce(edm::StreamID, edm::Event &, edm::EventSetup const &) const override;
2323

2424
private:
2525
const bool isPhase2_;
@@ -51,7 +51,7 @@ EcalRecHitSoAToLegacy::EcalRecHitSoAToLegacy(edm::ParameterSet const &ps)
5151
recHitsCPUEEToken_{isPhase2_ ? edm::EDPutTokenT<EERecHitCollection>{}
5252
: produces<EERecHitCollection>(ps.getParameter<std::string>("recHitsLabelCPUEE"))} {}
5353

54-
void EcalRecHitSoAToLegacy::produce(edm::Event &event, edm::EventSetup const &setup) {
54+
void EcalRecHitSoAToLegacy::produce(edm::StreamID sid, edm::Event &event, edm::EventSetup const &setup) const {
5555
auto const &recHitsEBColl = event.get(recHitsPortableEB_);
5656
auto const &recHitsEBCollView = recHitsEBColl.const_view();
5757
auto recHitsCPUEB = std::make_unique<EBRecHitCollection>();

‎RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalRecHitBuilder.dev.cc‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::ecal::rechit {
2424
ConfigurationParameters const& configParams,
2525
bool const isPhase2) {
2626
auto nchannels = static_cast<uint32_t>(ebUncalibRecHits->const_view().metadata().size());
27-
if (!isPhase2 && eeUncalibRecHits != nullptr) {
27+
if (!isPhase2) {
2828
nchannels += static_cast<uint32_t>(eeUncalibRecHits->const_view().metadata().size());
2929
}
3030

@@ -35,7 +35,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::ecal::rechit {
3535
auto constexpr threads = nchannels_per_block;
3636
auto const blocks = cms::alpakatools::divide_up_by(nchannels, threads);
3737
auto workDiv = cms::alpakatools::make_workdiv<Acc1D>(blocks, threads);
38-
if (!isPhase2 && eeUncalibRecHits != nullptr) {
38+
if (!isPhase2) {
3939
alpaka::exec<Acc1D>(queue,
4040
workDiv,
4141
KernelCreateEcalRechit{},
@@ -46,19 +46,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::ecal::rechit {
4646
conditionsDev.const_view(),
4747
parametersDev.const_view(),
4848
eventTime,
49-
// configuration
50-
configParams.killDeadChannels,
51-
configParams.recoverEBIsolatedChannels,
52-
configParams.recoverEEIsolatedChannels,
53-
configParams.recoverEBVFE,
54-
configParams.recoverEEVFE,
55-
configParams.recoverEBFE,
56-
configParams.recoverEEFE,
57-
configParams.EBLaserMIN,
58-
configParams.EELaserMIN,
59-
configParams.EBLaserMAX,
60-
configParams.EELaserMAX,
61-
configParams.flagmask);
49+
configParams);
6250
} else {
6351
alpaka::exec<Acc1D>(queue,
6452
workDiv,
@@ -68,14 +56,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::ecal::rechit {
6856
conditionsDev.const_view(),
6957
parametersDev.const_view(),
7058
eventTime,
71-
// configuration
72-
configParams.killDeadChannels,
73-
configParams.recoverEBIsolatedChannels,
74-
configParams.recoverEBVFE,
75-
configParams.recoverEBFE,
76-
configParams.EBLaserMIN,
77-
configParams.EBLaserMAX,
78-
configParams.flagmask);
59+
configParams);
7960
}
8061
}
8162

RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalRecHitConditionsHostESProducer.cc renamed to RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalRecHitConditionsESProducer.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636

3737
namespace ALPAKA_ACCELERATOR_NAMESPACE {
3838

39-
class EcalRecHitConditionsHostESProducer : public ESProducer {
39+
class EcalRecHitConditionsESProducer : public ESProducer {
4040
public:
41-
EcalRecHitConditionsHostESProducer(edm::ParameterSet const& iConfig)
41+
EcalRecHitConditionsESProducer(edm::ParameterSet const& iConfig)
4242
: ESProducer(iConfig), isPhase2_{iConfig.getParameter<bool>("isPhase2")} {
4343
auto cc = setWhatProduced(this);
4444
adcToGeVConstantToken_ = cc.consumes();
@@ -195,4 +195,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
195195

196196
} // namespace ALPAKA_ACCELERATOR_NAMESPACE
197197

198-
DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE(EcalRecHitConditionsHostESProducer);
198+
DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE(EcalRecHitConditionsESProducer);

RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalRecHitParametersHostESProducer.cc renamed to RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalRecHitParametersESProducer.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "CommonTools/Utils/interface/StringToEnumValue.h"
22
#include "FWCore/ParameterSet/interface/ParameterSet.h"
33

4-
#include "CondFormats/DataRecord/interface/EcalRecHitParametersRcd.h"
54
#include "CondFormats/EcalObjects/interface/EcalChannelStatusCode.h"
65
#include "CondFormats/EcalObjects/interface/EcalRecHitParametersSoA.h"
76
#include "CondFormats/EcalObjects/interface/alpaka/EcalRecHitParametersDevice.h"
@@ -12,22 +11,23 @@
1211
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
1312
#include "HeterogeneousCore/AlpakaInterface/interface/host.h"
1413
#include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
14+
#include "HeterogeneousCore/CUDACore/interface/JobConfigurationGPURecord.h"
1515

1616
namespace ALPAKA_ACCELERATOR_NAMESPACE {
17-
class EcalRecHitParametersHostESProducer : public ESProducer {
17+
class EcalRecHitParametersESProducer : public ESProducer {
1818
public:
19-
EcalRecHitParametersHostESProducer(edm::ParameterSet const&);
20-
~EcalRecHitParametersHostESProducer() override = default;
19+
EcalRecHitParametersESProducer(edm::ParameterSet const&);
20+
~EcalRecHitParametersESProducer() override = default;
2121

2222
static void fillDescriptions(edm::ConfigurationDescriptions&);
23-
std::unique_ptr<EcalRecHitParametersHost> produce(EcalRecHitParametersRcd const&);
23+
std::unique_ptr<EcalRecHitParametersHost> produce(JobConfigurationGPURecord const&);
2424

2525
private:
2626
std::bitset<kNEcalChannelStatusCodes> channelStatusCodesToBeExcluded_;
2727
RecoFlagBitsArray recoFlagBitsArray_;
2828
};
2929

30-
EcalRecHitParametersHostESProducer::EcalRecHitParametersHostESProducer(edm::ParameterSet const& iConfig)
30+
EcalRecHitParametersESProducer::EcalRecHitParametersESProducer(edm::ParameterSet const& iConfig)
3131
: ESProducer(iConfig), recoFlagBitsArray_() {
3232
setWhatProduced(this);
3333

@@ -52,7 +52,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
5252
}
5353
}
5454

55-
void EcalRecHitParametersHostESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
55+
void EcalRecHitParametersESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
5656
edm::ParameterSetDescription desc;
5757
// channel statuses to be exluded from reconstruction
5858
desc.add<std::vector<std::string>>("ChannelStatusToBeExcluded",
@@ -79,8 +79,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
7979
descriptions.addWithDefaultLabel(desc);
8080
}
8181

82-
std::unique_ptr<EcalRecHitParametersHost> EcalRecHitParametersHostESProducer::produce(
83-
EcalRecHitParametersRcd const& iRecord) {
82+
std::unique_ptr<EcalRecHitParametersHost> EcalRecHitParametersESProducer::produce(
83+
JobConfigurationGPURecord const& iRecord) {
8484
size_t const sizeone = 1;
8585
auto product = std::make_unique<EcalRecHitParametersHost>(sizeone, cms::alpakatools::host());
8686
auto view = product->view();
@@ -94,4 +94,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
9494

9595
} // namespace ALPAKA_ACCELERATOR_NAMESPACE
9696

97-
DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE(EcalRecHitParametersHostESProducer);
97+
DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE(EcalRecHitParametersESProducer);

‎RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalRecHitProducerPortable.cc‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "CondFormats/DataRecord/interface/EcalRecHitConditionsRcd.h"
2-
#include "CondFormats/DataRecord/interface/EcalRecHitParametersRcd.h"
32
#include "CondFormats/EcalObjects/interface/alpaka/EcalRecHitConditionsDevice.h"
43
#include "CondFormats/EcalObjects/interface/alpaka/EcalRecHitParametersDevice.h"
54
#include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
@@ -15,6 +14,7 @@
1514
#include "HeterogeneousCore/AlpakaCore/interface/alpaka/Event.h"
1615
#include "HeterogeneousCore/AlpakaCore/interface/alpaka/EventSetup.h"
1716
#include "HeterogeneousCore/AlpakaCore/interface/alpaka/stream/EDProducer.h"
17+
#include "HeterogeneousCore/CUDACore/interface/JobConfigurationGPURecord.h"
1818

1919
#include "DeclsForKernels.h"
2020
#include "EcalRecHitBuilder.h"
@@ -45,7 +45,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
4545

4646
// conditions tokens
4747
const device::ESGetToken<EcalRecHitConditionsDevice, EcalRecHitConditionsRcd> recHitConditionsToken_;
48-
const device::ESGetToken<EcalRecHitParametersDevice, EcalRecHitParametersRcd> recHitParametersToken_;
48+
const device::ESGetToken<EcalRecHitParametersDevice, JobConfigurationGPURecord> recHitParametersToken_;
4949
};
5050

5151
void EcalRecHitProducerPortable::fillDescriptions(edm::ConfigurationDescriptions& confDesc) {
@@ -132,13 +132,11 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
132132
isPhase2_ ? std::unique_ptr<OutputProduct>() : std::make_unique<OutputProduct>(uncalibRecHitsSizeEE, queue);
133133
// reset the size scalar of the SoA
134134
// memset takes an alpaka view that is created from the scalar in a view to the portable device collection
135-
auto recHitSizeViewEB =
136-
cms::alpakatools::make_device_view<uint32_t>(alpaka::getDev(queue), recHitsDevEB->view().size());
135+
auto recHitSizeViewEB = cms::alpakatools::make_device_view<uint32_t>(queue, recHitsDevEB->view().size());
137136
alpaka::memset(queue, recHitSizeViewEB, 0);
138137

139138
if (!isPhase2_) {
140-
auto recHitSizeViewEE =
141-
cms::alpakatools::make_device_view<uint32_t>(alpaka::getDev(queue), recHitsDevEE->view().size());
139+
auto recHitSizeViewEE = cms::alpakatools::make_device_view<uint32_t>(queue, recHitsDevEE->view().size());
142140
alpaka::memset(queue, recHitSizeViewEE, 0);
143141
}
144142

0 commit comments

Comments
 (0)