Skip to content

Commit

Permalink
First batch of fixing function arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
@VourMa
VourMa committed Jul 29, 2024
1 parent 96aa7c0 commit ce79bc1
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 66 deletions.
8 changes: 4 additions & 4 deletions RecoTracker/LST/plugins/LSTOutputConverter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ void LSTOutputConverter::produce(edm::StreamID, edm::Event& iEvent, const edm::E
auto const& lstOutput = iEvent.get(lstOutputToken_);
auto const& phase2OTRecHits = iEvent.get(lstPhase2OTHitsInputToken_);
auto const& pixelSeeds = iEvent.get(lstPixelSeedToken_);
const auto& mf = iSetup.getData(mfToken_);
const auto& propAlo = iSetup.getData(propagatorAlongToken_);
const auto& propOppo = iSetup.getData(propagatorOppositeToken_);
const auto& tracker = iSetup.getData(tGeomToken_);
auto const& mf = iSetup.getData(mfToken_);
auto const& propAlo = iSetup.getData(propagatorAlongToken_);
auto const& propOppo = iSetup.getData(propagatorOppositeToken_);
auto const& tracker = iSetup.getData(tGeomToken_);

// Vector definitions
std::vector<std::vector<unsigned int>> const& lstTC_hitIdx = lstOutput.hitIdx();
Expand Down
12 changes: 6 additions & 6 deletions RecoTracker/LST/plugins/LSTPixelSeedInputProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void LSTPixelSeedInputProducer::fillDescriptions(edm::ConfigurationDescriptions&

void LSTPixelSeedInputProducer::produce(edm::StreamID iID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
// Setup
const auto& mf = iSetup.getData(mfToken_);
auto const& mf = iSetup.getData(mfToken_);
auto const& bs = iEvent.get(beamSpotToken_);

// Vector definitions
Expand All @@ -83,7 +83,7 @@ void LSTPixelSeedInputProducer::produce(edm::StreamID iID, edm::Event& iEvent, c

for (size_t iColl = 0; iColl < seedTokens_.size(); ++iColl) {
// Get seed tokens
const auto& seedToken = seedTokens_[iColl];
auto const& seedToken = seedTokens_[iColl];
auto const& seedTracks = iEvent.get(seedToken);

if (seedTracks.empty())
Expand All @@ -98,10 +98,10 @@ void LSTPixelSeedInputProducer::produce(edm::StreamID iID, edm::Event& iEvent, c
edm::ProductID id = seedTracks[0].seedRef().id();

for (size_t iSeed = 0; iSeed < seedTrackRefs.size(); ++iSeed) {
const auto& seedTrackRef = seedTrackRefs[iSeed];
const auto& seedTrack = *seedTrackRef;
const auto& seedRef = seedTrack.seedRef();
const auto& seed = *seedRef;
auto const& seedTrackRef = seedTrackRefs[iSeed];
auto const& seedTrack = *seedTrackRef;
auto const& seedRef = seedTrack.seedRef();
auto const& seed = *seedRef;

if (seedRef.id() != id)
throw cms::Exception("LogicError")
Expand Down
10 changes: 5 additions & 5 deletions RecoTracker/LSTCore/src/ModuleMethods.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace lst {
PixelMap& pixelMapping,
TQueue queue,
const MapPLStoLayer& pLStoLayer,
struct ModuleMetaData& mmd) {
ModuleMetaData& mmd) {
pixelMapping.pixelModuleIndex = mmd.detIdToIndex[1];

std::vector<unsigned int> connectedModuleDetIds;
Expand Down Expand Up @@ -105,10 +105,10 @@ namespace lst {
};

template <typename TQueue, typename TDev>
inline void fillConnectedModuleArrayExplicit(struct ModulesBuffer<TDev>* modulesBuf,
inline void fillConnectedModuleArrayExplicit(ModulesBuffer<TDev>* modulesBuf,
unsigned int nMod,
TQueue queue,
struct ModuleMetaData& mmd,
ModuleMetaData& mmd,
const ModuleConnectionMap* moduleConnectionMap) {
alpaka_common::DevHost const& devHost = cms::alpakatools::host();
auto moduleMap_buf = allocBufWrapper<uint16_t>(devHost, nMod * max_connected_modules);
Expand All @@ -133,10 +133,10 @@ namespace lst {
};

template <typename TQueue, typename TDev>
inline void fillMapArraysExplicit(struct ModulesBuffer<TDev>* modulesBuf,
inline void fillMapArraysExplicit(ModulesBuffer<TDev>* modulesBuf,
unsigned int nMod,
TQueue queue,
struct ModuleMetaData& mmd) {
ModuleMetaData& mmd) {
alpaka_common::DevHost const& devHost = cms::alpakatools::host();
auto mapIdx_buf = allocBufWrapper<uint16_t>(devHost, nMod);
uint16_t* mapIdx = alpaka::getPtrNative(mapIdx_buf);
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/LSTCore/src/alpaka/Event.dev.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ void lst::Event<Acc3D>::createQuintuplets() {
}
}

void lst::Event<Acc3D>::pixelLineSegmentCleaning(const bool no_pls_dupclean) {
void lst::Event<Acc3D>::pixelLineSegmentCleaning(bool no_pls_dupclean) {
if (!no_pls_dupclean) {
Vec3D const threadsPerBlockCheckHitspLS = createVec(1, 16, 16);
Vec3D const blocksPerGridCheckHitspLS = createVec(1, max_blocks * 4, max_blocks / 4);
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/LSTCore/src/alpaka/Event.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ namespace lst {
public:
// Constructor used for CMSSW integration. Uses an external queue.
template <typename TQueue>
Event(const bool verbose, TQueue const& q, const LSTESData<Device>* deviceESData)
Event(bool verbose, TQueue const& q, const LSTESData<Device>* deviceESData)
: queue(q),
devAcc(alpaka::getDev(q)),
devHost(cms::alpakatools::host()),
Expand Down
16 changes: 8 additions & 8 deletions RecoTracker/LSTCore/src/alpaka/Hit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ namespace lst {
struct moduleRangesKernel {
template <typename TAcc>
ALPAKA_FN_ACC void operator()(TAcc const& acc,
struct lst::Modules modulesInGPU,
struct lst::Hits hitsInGPU,
lst::Modules modulesInGPU,
lst::Hits hitsInGPU,
int nLowerModules) const {
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
Expand All @@ -203,14 +203,14 @@ namespace lst {
struct hitLoopKernel {
template <typename TAcc>
ALPAKA_FN_ACC void operator()(TAcc const& acc,
uint16_t Endcap, // Integer corresponding to endcap in module subdets
uint16_t TwoS, // Integer corresponding to TwoS in moduleType
unsigned int nModules, // Number of modules
unsigned int nEndCapMap, // Number of elements in endcap map
uint16_t Endcap, // Integer corresponding to endcap in module subdets
uint16_t TwoS, // Integer corresponding to TwoS in moduleType
unsigned int nModules, // Number of modules
unsigned int nEndCapMap, // Number of elements in endcap map
const unsigned int* geoMapDetId, // DetId's from endcap map
const float* geoMapPhi, // Phi values from endcap map
struct lst::Modules modulesInGPU,
struct lst::Hits hitsInGPU,
lst::Modules modulesInGPU,
lst::Hits hitsInGPU,
unsigned int nHits) const // Total number of hits in event
{
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Expand Down
32 changes: 16 additions & 16 deletions RecoTracker/LSTCore/src/alpaka/Kernels.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,31 @@
#include "PixelTriplet.h"

namespace lst {
ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmQuintupletFromMemory(struct lst::Quintuplets& quintupletsInGPU,
ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmQuintupletFromMemory(lst::Quintuplets& quintupletsInGPU,
unsigned int quintupletIndex,
bool secondpass = false) {
quintupletsInGPU.isDup[quintupletIndex] |= 1 + secondpass;
};

ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmPixelTripletFromMemory(struct lst::PixelTriplets& pixelTripletsInGPU,
ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmPixelTripletFromMemory(lst::PixelTriplets& pixelTripletsInGPU,
unsigned int pixelTripletIndex) {
pixelTripletsInGPU.isDup[pixelTripletIndex] = true;
};

ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmPixelQuintupletFromMemory(struct lst::PixelQuintuplets& pixelQuintupletsInGPU,
ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmPixelQuintupletFromMemory(lst::PixelQuintuplets& pixelQuintupletsInGPU,
unsigned int pixelQuintupletIndex) {
pixelQuintupletsInGPU.isDup[pixelQuintupletIndex] = true;
};

ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmPixelSegmentFromMemory(struct lst::Segments& segmentsInGPU,
ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmPixelSegmentFromMemory(lst::Segments& segmentsInGPU,
unsigned int pixelSegmentArrayIndex,
bool secondpass = false) {
segmentsInGPU.isDup[pixelSegmentArrayIndex] |= 1 + secondpass;
};

ALPAKA_FN_ACC ALPAKA_FN_INLINE int checkHitsT5(unsigned int ix,
unsigned int jx,
struct lst::Quintuplets& quintupletsInGPU) {
lst::Quintuplets const& quintupletsInGPU) {
unsigned int hits1[Params_T5::kHits];
unsigned int hits2[Params_T5::kHits];

Expand All @@ -64,7 +64,7 @@ namespace lst {

ALPAKA_FN_ACC ALPAKA_FN_INLINE int checkHitspT5(unsigned int ix,
unsigned int jx,
struct lst::PixelQuintuplets& pixelQuintupletsInGPU) {
lst::PixelQuintuplets const& pixelQuintupletsInGPU) {
unsigned int hits1[Params_pT5::kHits];
unsigned int hits2[Params_pT5::kHits];

Expand All @@ -91,7 +91,7 @@ namespace lst {

ALPAKA_FN_ACC ALPAKA_FN_INLINE void checkHitspT3(unsigned int ix,
unsigned int jx,
struct lst::PixelTriplets& pixelTripletsInGPU,
lst::PixelTriplets const& pixelTripletsInGPU,
int* matched) {
int phits1[Params_pLS::kHits];
int phits2[Params_pLS::kHits];
Expand Down Expand Up @@ -144,9 +144,9 @@ namespace lst {
struct removeDupQuintupletsInGPUAfterBuild {
template <typename TAcc>
ALPAKA_FN_ACC void operator()(TAcc const& acc,
struct lst::Modules modulesInGPU,
struct lst::Quintuplets quintupletsInGPU,
struct lst::ObjectRanges rangesInGPU) const {
lst::Modules modulesInGPU,
lst::Quintuplets quintupletsInGPU,
lst::ObjectRanges rangesInGPU) const {
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

Expand Down Expand Up @@ -194,8 +194,8 @@ namespace lst {
struct removeDupQuintupletsInGPUBeforeTC {
template <typename TAcc>
ALPAKA_FN_ACC void operator()(TAcc const& acc,
struct lst::Quintuplets quintupletsInGPU,
struct lst::ObjectRanges rangesInGPU) const {
lst::Quintuplets quintupletsInGPU,
lst::ObjectRanges rangesInGPU) const {
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

Expand Down Expand Up @@ -268,7 +268,7 @@ namespace lst {

struct removeDupPixelTripletsInGPUFromMap {
template <typename TAcc>
ALPAKA_FN_ACC void operator()(TAcc const& acc, struct lst::PixelTriplets pixelTripletsInGPU) const {
ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::PixelTriplets pixelTripletsInGPU) const {
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

Expand Down Expand Up @@ -305,7 +305,7 @@ namespace lst {

struct removeDupPixelQuintupletsInGPUFromMap {
template <typename TAcc>
ALPAKA_FN_ACC void operator()(TAcc const& acc, struct lst::PixelQuintuplets pixelQuintupletsInGPU) const {
ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::PixelQuintuplets pixelQuintupletsInGPU) const {
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

Expand Down Expand Up @@ -333,8 +333,8 @@ namespace lst {
struct checkHitspLS {
template <typename TAcc>
ALPAKA_FN_ACC void operator()(TAcc const& acc,
struct lst::Modules modulesInGPU,
struct lst::Segments segmentsInGPU,
lst::Modules modulesInGPU,
lst::Segments segmentsInGPU,
bool secondpass) const {
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
Expand Down
34 changes: 13 additions & 21 deletions RecoTracker/LSTCore/src/alpaka/MiniDoublet.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,7 @@ namespace lst {
MiniDoublets data_;

template <typename TQueue, typename TDevAcc>
MiniDoubletsBuffer(unsigned int nMemoryLoc,
uint16_t nLowerModules,
TDevAcc const& devAccIn,
TQueue& queue)
MiniDoubletsBuffer(unsigned int nMemoryLoc, uint16_t nLowerModules, TDevAcc const& devAccIn, TQueue& queue)
: nMemoryLocations_buf(allocBufWrapper<unsigned int>(devAccIn, 1, queue)),
anchorHitIndices_buf(allocBufWrapper<unsigned int>(devAccIn, nMemoryLoc, queue)),
outerHitIndices_buf(allocBufWrapper<unsigned int>(devAccIn, nMemoryLoc, queue)),
Expand Down Expand Up @@ -191,12 +188,12 @@ namespace lst {

template <typename TAcc>
ALPAKA_FN_ACC ALPAKA_FN_INLINE void addMDToMemory(TAcc const& acc,
struct lst::MiniDoublets& mdsInGPU,
struct lst::Hits& hitsInGPU,
struct lst::Modules& modulesInGPU,
lst::MiniDoublets& mdsInGPU,
lst::Hits const& hitsInGPU,
lst::Modules const& modulesInGPU,
unsigned int lowerHitIdx,
unsigned int upperHitIdx,
uint16_t& lowerModuleIdx,
uint16_t lowerModuleIdx,
float dz,
float dPhi,
float dPhiChange,
Expand Down Expand Up @@ -263,8 +260,7 @@ namespace lst {
mdsInGPU.outerLowEdgeY[idx] = hitsInGPU.lowEdgeYs[outerHitIndex];
};

ALPAKA_FN_ACC ALPAKA_FN_INLINE float isTighterTiltedModules(struct lst::Modules& modulesInGPU,
uint16_t moduleIndex) {
ALPAKA_FN_ACC ALPAKA_FN_INLINE float isTighterTiltedModules(lst::Modules const& modulesInGPU, uint16_t moduleIndex) {
// The "tighter" tilted modules are the subset of tilted modules that have smaller spacing
// This is the same as what was previously considered as"isNormalTiltedModules"
// See Figure 9.1 of https://cds.cern.ch/record/2272264/files/CMS-TDR-014.pdf
Expand All @@ -284,7 +280,7 @@ namespace lst {
return false;
};

ALPAKA_FN_ACC ALPAKA_FN_INLINE float moduleGapSize(struct lst::Modules& modulesInGPU, uint16_t moduleIndex) {
ALPAKA_FN_ACC ALPAKA_FN_INLINE float moduleGapSize(struct lst::Modules const& modulesInGPU, uint16_t moduleIndex) {
float miniDeltaTilted[3] = {0.26f, 0.26f, 0.26f};
float miniDeltaFlat[6] = {0.26f, 0.16f, 0.16f, 0.18f, 0.18f, 0.18f};
float miniDeltaLooseTilted[3] = {0.4f, 0.4f, 0.4f};
Expand Down Expand Up @@ -336,12 +332,8 @@ namespace lst {
};

template <typename TAcc>
ALPAKA_FN_ACC ALPAKA_FN_INLINE float dPhiThreshold(TAcc const& acc,
float rt,
struct lst::Modules& modulesInGPU,
uint16_t moduleIndex,
float dPhi = 0,
float dz = 0) {
ALPAKA_FN_ACC ALPAKA_FN_INLINE float dPhiThreshold(
TAcc const& acc, float rt, lst::Modules const& modulesInGPU, uint16_t moduleIndex, float dPhi = 0, float dz = 0) {
// =================================================================
// Various constants
// =================================================================
Expand Down Expand Up @@ -400,7 +392,7 @@ namespace lst {

template <typename TAcc>
ALPAKA_FN_INLINE ALPAKA_FN_ACC void shiftStripHits(TAcc const& acc,
struct lst::Modules& modulesInGPU,
lst::Modules const& modulesInGPU,
uint16_t lowerModuleIndex,
uint16_t upperModuleIndex,
unsigned int lowerHitIndex,
Expand Down Expand Up @@ -566,7 +558,7 @@ namespace lst {

template <typename TAcc>
ALPAKA_FN_ACC bool runMiniDoubletDefaultAlgo(TAcc const& acc,
struct lst::Modules& modulesInGPU,
lst::Modules const& modulesInGPU,
uint16_t lowerModuleIndex,
uint16_t upperModuleIndex,
unsigned int lowerHitIndex,
Expand Down Expand Up @@ -638,7 +630,7 @@ namespace lst {

template <typename TAcc>
ALPAKA_FN_ACC bool runMiniDoubletDefaultAlgoBarrel(TAcc const& acc,
struct lst::Modules& modulesInGPU,
lst::Modules const& modulesInGPU,
uint16_t lowerModuleIndex,
uint16_t upperModuleIndex,
unsigned int lowerHitIndex,
Expand Down Expand Up @@ -765,7 +757,7 @@ namespace lst {

template <typename TAcc>
ALPAKA_FN_ACC bool runMiniDoubletDefaultAlgoEndcap(TAcc const& acc,
struct lst::Modules& modulesInGPU,
lst::Modules const& modulesInGPU,
uint16_t lowerModuleIndex,
uint16_t upperModuleIndex,
unsigned int lowerHitIndex,
Expand Down
Loading

0 comments on commit ce79bc1

Please sign in to comment.