Skip to content

Commit 88ead7b

Browse files
committed
ITS: remove GPU params
Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>
1 parent 82d4f2d commit 88ead7b

5 files changed

Lines changed: 1 addition & 78 deletions

File tree

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackingConfigParam.h

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -105,42 +105,5 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
105105
O2ParamDef(TrackerParamConfig, "ITSCATrackerParam");
106106
};
107107

108-
struct ITSGpuTrackingParamConfig : public o2::conf::ConfigurableParamHelper<ITSGpuTrackingParamConfig> {
109-
static constexpr int MaxIter = TrackerParamConfig::MaxIter;
110-
111-
/// Set nBlocks/nThreads to summarily override all kernel launch parameters in each iteration.
112-
/// Parameters must start with nBlocks/nThreads.
113-
static constexpr int OverrideValue{-1};
114-
static constexpr char const* BlocksName = "nBlocks";
115-
static constexpr char const* ThreadsName = "nThreads";
116-
int nBlocks = OverrideValue;
117-
int nThreads = OverrideValue;
118-
void maybeOverride() const;
119-
120-
/// Individual kernel launch parameter for each iteration
121-
int nBlocksLayerTracklets[MaxIter] = {60, 60, 60, 60};
122-
int nThreadsLayerTracklets[MaxIter] = {256, 256, 256, 256};
123-
124-
int nBlocksLayerCells[MaxIter] = {60, 60, 60, 60};
125-
int nThreadsLayerCells[MaxIter] = {256, 256, 256, 256};
126-
127-
int nBlocksFindNeighbours[MaxIter] = {60, 60, 60, 60};
128-
int nThreadsFindNeighbours[MaxIter] = {256, 256, 256, 256};
129-
130-
int nBlocksProcessNeighbours[MaxIter] = {60, 60, 60, 60};
131-
int nThreadsProcessNeighbours[MaxIter] = {256, 256, 256, 256};
132-
133-
int nBlocksTracksSeeds[MaxIter] = {60, 60, 60, 60};
134-
int nThreadsTracksSeeds[MaxIter] = {256, 256, 256, 256};
135-
136-
int nBlocksVtxComputeTracklets[2] = {60, 60};
137-
int nThreadsVtxComputeTracklets[2] = {256, 256};
138-
139-
int nBlocksVtxComputeMatching[2] = {60, 60};
140-
int nThreadsVtxComputeMatching[2] = {256, 256};
141-
142-
O2ParamDef(ITSGpuTrackingParamConfig, "ITSGpuTrackingParam");
143-
};
144-
145108
} // namespace o2::its
146109
#endif

Detectors/ITSMFT/ITS/tracking/src/Tracker.cxx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ using o2::its::constants::GB;
3131
template <int NLayers>
3232
Tracker<NLayers>::Tracker(TrackerTraits<NLayers>* traits) : mTraits(traits)
3333
{
34-
/// Initialise standard configuration with 1 iteration
35-
mTrkParams.resize(1);
36-
if (traits->isGPU()) {
37-
ITSGpuTrackingParamConfig::Instance().maybeOverride();
38-
ITSGpuTrackingParamConfig::Instance().printKeyValues(true, true);
39-
}
4034
}
4135

4236
template <int NLayers>
Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
1+
// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
22
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
33
// All rights not expressly granted are reserved.
44
//
@@ -9,36 +9,6 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#include <boost/property_tree/ptree.hpp>
13-
14-
#include "Framework/Logger.h"
1512
#include "ITStracking/TrackingConfigParam.h"
16-
1713
O2ParamImpl(o2::its::VertexerParamConfig);
1814
O2ParamImpl(o2::its::TrackerParamConfig);
19-
O2ParamImpl(o2::its::ITSGpuTrackingParamConfig);
20-
21-
namespace o2::its
22-
{
23-
24-
void ITSGpuTrackingParamConfig::maybeOverride() const
25-
{
26-
if (nBlocks == OverrideValue && nThreads == OverrideValue) {
27-
return;
28-
}
29-
const auto name = getName();
30-
auto members = getDataMembers();
31-
for (auto member : *members) {
32-
if (!member.name.ends_with(BlocksName) && !member.name.ends_with(ThreadsName)) {
33-
if (nBlocks != OverrideValue && member.name.starts_with(BlocksName) && (member.value != nBlocks)) {
34-
o2::conf::ConfigurableParam::setValue<int>(name, member.name, nBlocks);
35-
}
36-
if (nThreads != OverrideValue && member.name.starts_with(ThreadsName) && (member.value != nThreads)) {
37-
o2::conf::ConfigurableParam::setValue<int>(name, member.name, nThreads);
38-
}
39-
}
40-
}
41-
LOGP(info, "Overwriting gpu threading parameters");
42-
} // namespace o2::its
43-
44-
} // namespace o2::its

Detectors/ITSMFT/ITS/tracking/src/TrackingLinkDef.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
#pragma link C++ class o2::its::TrackerParamConfig + ;
4040
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::its::TrackerParamConfig> + ;
4141

42-
#pragma link C++ class o2::its::ITSGpuTrackingParamConfig + ;
43-
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::its::ITSGpuTrackingParamConfig> + ;
44-
4542
#pragma link C++ class o2::its::FastMultEstConfig + ;
4643
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::its::FastMultEstConfig> + ;
4744

GPU/Workflow/src/GPUWorkflowITS.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ int32_t GPURecoWorkflowSpec::runITSTracking(o2::framework::ProcessingContext& pc
4040
if (mNTFs == 1 && pc.services().get<const o2::framework::DeviceSpec>().inputTimesliceId == 0) {
4141
o2::conf::ConfigurableParam::write(o2::base::NameConf::getConfigOutputFileName(pc.services().get<const o2::framework::DeviceSpec>().name, o2::its::VertexerParamConfig::Instance().getName()), o2::its::VertexerParamConfig::Instance().getName());
4242
o2::conf::ConfigurableParam::write(o2::base::NameConf::getConfigOutputFileName(pc.services().get<const o2::framework::DeviceSpec>().name, o2::its::TrackerParamConfig::Instance().getName()), o2::its::TrackerParamConfig::Instance().getName());
43-
o2::conf::ConfigurableParam::write(o2::base::NameConf::getConfigOutputFileName(pc.services().get<const o2::framework::DeviceSpec>().name, o2::its::ITSGpuTrackingParamConfig::Instance().getName()), o2::its::ITSGpuTrackingParamConfig::Instance().getName());
4443
}
4544
return 0;
4645
}

0 commit comments

Comments
 (0)