Skip to content

[df] Enable IMT with GlobalEntryRanges for a single file #22093

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
GeorgiLH wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −3
Open

[df] Enable IMT with GlobalEntryRanges for a single file #22093

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
19 changes: 16 additions & 3 deletions tree/dataframe/src/RNTupleDS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ void ROOT::RDF::RNTupleDS::PrepareNextRanges()

// Easy work scheduling: one file per slot. We skip empty files (files without entries).

if ((nRemainingFiles >= fNSlots) || (fGlobalEntryRange.has_value())) {
if ((nRemainingFiles >= fNSlots) || (fGlobalEntryRange.has_value() && nRemainingFiles != 1)) {
while ((fNextRanges.size() < fNSlots) && (fNextFileIndex < nFiles)) {
REntryRangeDS range;

Expand Down Expand Up @@ -708,13 +708,26 @@ void ROOT::RDF::RNTupleDS::PrepareNextRanges()
const auto descGuard = source->GetSharedDescriptorGuard();
return ROOT::Internal::GetClusterBoundaries(descGuard.GetRef());
}();
unsigned int iFirstRange = 0;
unsigned int iLastRange = rangesByCluster.size() - 1;
if (fGlobalEntryRange.has_value() && fGlobalEntryRange->first != fGlobalEntryRange->second) {
for (size_t j = 0; j < rangesByCluster.size(); j++) {
if (rangesByCluster[j].fFirstEntry + fSeenEntriesNoGlobalRange <= fGlobalEntryRange->first) {
iFirstRange = j;
}
if (rangesByCluster[j].fLastEntryPlusOne + fSeenEntriesNoGlobalRange >= fGlobalEntryRange->second) {
iLastRange = j;
break;
}
}
}

const unsigned int nRangesByCluster = rangesByCluster.size();
const unsigned int nRangesByCluster = iLastRange - iFirstRange + 1;

// Distribute slots equidistantly over the entry range, aligned on cluster boundaries
const auto nClustersPerSlot = nRangesByCluster / nSlotsPerFile;
const auto remainder = nRangesByCluster % nSlotsPerFile;
std::size_t iRange = 0;
std::size_t iRange = iFirstRange;
unsigned int iSlot = 0;
const unsigned int N = std::min(nSlotsPerFile, nRangesByCluster);
for (; iSlot < N; ++iSlot) {
Expand Down