Skip to content

TPC: move nthreads to local option #15315

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

Open
matthias-kleiner wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

TPC: move nthreads to local option #15315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion Detectors/TPC/workflow/include/TPCWorkflow/TPCFourierTransformAggregatorSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ class TPCFourierTransformAggregatorSpec : public o2::framework::Task
mLengthIDCScalerSeconds = ic.options().get<float>("tpcScalerLengthS");
mDisableScaler = ic.options().get<bool>("disable-scaler");
mEnableFFTCCDB = ic.options().get<bool>("enable-fft-CCDB");
int nthreads = ic.options().get<int>("nthreads");
TPCFourierTransformAggregatorSpec::IDCFType::setNThreads(nthreads);
resizeBuffer(mInputLanes);
}

Expand Down Expand Up @@ -448,7 +450,8 @@ DataProcessorSpec getTPCFourierTransformAggregatorSpec(const unsigned int rangeI
{"dump-coefficients-agg", VariantType::Bool, false, {"Dump fourier coefficients to file"}},
{"tpcScalerLengthS", VariantType::Float, 300.f, {"Length of the TPC scalers in seconds"}},
{"disable-scaler", VariantType::Bool, false, {"Disable creation of IDC scaler"}},
{"enable-fft-CCDB", VariantType::Bool, false, {"Enable writing of FFT coefficients to CCDB"}}}};
{"enable-fft-CCDB", VariantType::Bool, false, {"Enable writing of FFT coefficients to CCDB"}},
{"nthreads", VariantType::Int, 1, {"Number of threads which will be used during the calculation of the fourier coefficients."}}}};
}

} // namespace o2::tpc
Expand Down
3 changes: 0 additions & 3 deletions Detectors/TPC/workflow/src/tpc-fouriertransform-aggregator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
std::vector<ConfigParamSpec> options{
{"rangeIDC", VariantType::Int, 200, {"Number of 1D-IDCs which will be used for the calculation of the fourier coefficients. TODO ALREADY SET IN ABERAGEGROUP"}},
{"nFourierCoeff", VariantType::Int, 60, {"Number of fourier coefficients (real+imag) which will be stored in the CCDB. The maximum can be 'rangeIDC + 2'."}},
{"nthreads", VariantType::Int, 1, {"Number of threads which will be used during the calculation of the fourier coefficients."}},
{"inputLanes", VariantType::Int, 2, {"Number of expected input lanes."}},
{"sendOutput", VariantType::Bool, false, {"send fourier coefficients"}},
{"use-naive-fft", VariantType::Bool, false, {"using naive fourier transform (true) or FFTW (false)"}},
Expand All @@ -51,8 +50,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const& config)
const bool processSACs = config.options().get<bool>("process-SACs");
const auto rangeIDC = static_cast<unsigned int>(config.options().get<int>("rangeIDC"));
const auto nFourierCoeff = std::clamp(static_cast<unsigned int>(config.options().get<int>("nFourierCoeff")), static_cast<unsigned int>(0), rangeIDC + 2);
const auto nthreadsFourier = static_cast<unsigned long>(config.options().get<int>("nthreads"));
TPCFourierTransformAggregatorSpec::IDCFType::setNThreads(nthreadsFourier);
TPCFourierTransformAggregatorSpec::IDCFType::setFFT(!fft);
const auto inputLanes = config.options().get<int>("inputLanes");
WorkflowSpec workflow{getTPCFourierTransformAggregatorSpec(rangeIDC, nFourierCoeff, sendOutput, processSACs, inputLanes)};
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Merger/GPUTPCGMMergerDump.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ inline void GPUTPCGMMerger::MergedTrackStreamerInternal(const GPUTPCGMBorderTrac
void GPUTPCGMMerger::MergedTrackStreamer(const GPUTPCGMBorderTrack& b1, const GPUTPCGMBorderTrack& b2, const char* name, int32_t sector1, int32_t sector2, uint8_t mergeMode, float weight, float frac) const
{
#ifdef DEBUG_STREAMER
if (!(mergeMode & mergeModes::mergeAcrossCE0)) {
if (!(mergeMode & mergeModes::mergeAcrossCE)) {
MergedTrackStreamerInternal<0>(b1, b2, name, sector1, sector2, mergeMode, weight, frac);
}
#endif
Expand Down
Loading