Skip to content

Minor improvements #5276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 2 commits into from
Jan 25, 2021
Merged

Minor improvements #5276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cbce1f
Simplify code
davidrohr Jan 23, 2021
d70acd4
GPU: Correctly measure kernel time with nested OMP threads
davidrohr Jan 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions Detectors/TPC/workflow/src/CATrackerSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,17 +709,11 @@ DataProcessorSpec getCATrackerSpec(CompletionPolicyData* policyData, ca::Config
return inputs;
};

//o2::framework::InputSpec{"cluster", o2::framework::ConcreteDataTypeMatcher{"TPC", "CLUSTERNATIVE"}},
// o2::framework::InputSpec{"digits", o2::framework::ConcreteDataTypeMatcher{"TPC", "DIGITS"}})());

auto createOutputSpecs = [&specconfig, &tpcsectors, &processAttributes]() {
std::vector<OutputSpec> outputSpecs{
OutputSpec{gDataOriginTPC, "TRACKS", 0, Lifetime::Timeframe},
OutputSpec{gDataOriginTPC, "CLUSREFS", 0, Lifetime::Timeframe},
};
if (!specconfig.outputTracks) {
// this case is the less unlikely one, that's why the logic this way
outputSpecs.clear();
std::vector<OutputSpec> outputSpecs;
if (specconfig.outputTracks) {
outputSpecs.emplace_back(gDataOriginTPC, "TRACKS", 0, Lifetime::Timeframe);
outputSpecs.emplace_back(gDataOriginTPC, "CLUSREFS", 0, Lifetime::Timeframe);
}
if (specconfig.processMC && specconfig.outputTracks) {
outputSpecs.emplace_back(gDataOriginTPC, "TRACKSMCLBL", 0, Lifetime::Timeframe);
Expand Down
8 changes: 4 additions & 4 deletions GPU/GPUTracking/Base/GPUReconstructionCPU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ inline int GPUReconstructionCPU::runKernel(const krnlExec& x, const krnlRunRange
}
if (mProcessingSettings.debugLevel >= 1) {
t = &getKernelTimer<S, I, J>(myStep, !IsGPU() || cpuFallback ? getOMPThreadNum() : x.stream);
if (!mProcessingSettings.deviceTimers || !IsGPU() || cpuFallback) {
if ((!mProcessingSettings.deviceTimers || !IsGPU() || cpuFallback) && (mNestedLoopOmpFactor < 2 || getOMPThreadNum() == 0)) {
t->Start();
}
}
Expand All @@ -300,10 +300,10 @@ inline int GPUReconstructionCPU::runKernel(const krnlExec& x, const krnlRunRange
}
if (mProcessingSettings.debugLevel >= 1) {
if (t) {
if (!mProcessingSettings.deviceTimers || !IsGPU() || cpuFallback) {
t->Stop();
} else {
if (!(!mProcessingSettings.deviceTimers || !IsGPU() || cpuFallback)) {
t->AddTime(setup.t);
} else if (mNestedLoopOmpFactor < 2 || getOMPThreadNum() == 0) {
t->Stop();
}
}
if (CheckErrorCodes(cpuFallback)) {
Expand Down