Fixed-partition reductions: sums that do not depend on the thread count

ParallelChunks cuts a range into one chunk per worker, so a floating-point
sum folded per chunk and then added up rounds differently at another -N.
ParallelBlocks cuts it by n alone (n / min_per_block blocks, at most 256);
each block folds into its own slot and the slots are added in block order,
so the sum has the same bits at any thread count.

Converted:
- RotationScaleMerge::ApplyCellSurface: the per-cell cross/ref2 sums of the
  surface fit (modulation, absorption), previously per-thread partials cut by
  ThreadsForWork(idx_all) threads.
- PostRefine: the scale-scan cost grid (per-chunk slots cut by -N).
- PostRefine joint solve: Ceres at a fixed 16 threads (as the rotation
  indexer's chain) instead of -N. Ceres sums cost and gradient in
  4 * num_threads pieces, so the split no longer follows -N. The pieces are
  handed to its threads in scheduling order, which only one thread makes
  exact; one thread was measured at +1.0-1.4 s of post-refinement on myob and
  lyso (0.5 -> 1.9 s, 1.1 -> 2.1 s), so that channel is left.
- IndexAndRefine supercell probe: per-frame probes kept by image number and
  summed in frame order, instead of added under a mutex in completion order;
  the primitive is the highest probed frame's instead of the last finisher's.

Integer reductions and per-item passes are unchanged; the three ParallelSort
callers already break ties on the index.

Validation (myob, cytc, lyso, sparse; GPU and CPU builds; -N 8/16/32):
p.hkl, p.mtz, p_P1.mtz and p_unmerged.mtz are md5-identical across -N, and
identical to the base 351be7de0 at every -N. The base was already -N
invariant on these four sets (GPU -N 1..32, CPU lyso -N 2..32), so no output
moved: the converted sums differ from the old ones only in last bits that
never reached a written float.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01D1G8gJVAy6gp1K5Dz3NE5C
This commit is contained in:
2026-09-28 18:57:02 +02:00
co-authored by Claude Opus 5.5
parent 351be7de0f
commit c20cd016dc
6 changed files with 143 additions and 52 deletions
+61
View File
@@ -4,6 +4,7 @@
#include <catch2/catch_all.hpp>
#include <algorithm>
#include <cmath>
#include <mutex>
#include <numeric>
#include <stdexcept>
@@ -104,12 +105,72 @@ TEST_CASE("ParallelFor_SplitDoesNotChangeTheResult", "[ParallelFor]") {
}
}
// The blocks depend on n alone: the same tiling of [0, n), block b always the same range, whatever the
// thread count.
TEST_CASE("ParallelBlocks_PartitionIgnoresTheThreadCount", "[ParallelFor]") {
for (int n: {0, 1, 7, 4095, 4096, 100000, 5000000}) {
const int nb = ReductionBlocks(n);
CHECK(nb <= MAX_REDUCTION_BLOCKS);
std::vector<std::pair<int, int>> reference;
for (size_t nthreads: THREAD_COUNTS) {
CAPTURE(n, nthreads);
std::vector<std::pair<int, int>> range(static_cast<size_t>(nb), {-1, -1});
ParallelBlocks(n, nthreads, [&](int b, int lo, int hi) { range[static_cast<size_t>(b)] = {lo, hi}; });
int expected_lo = 0;
for (const auto &[lo, hi]: range) {
CHECK(lo == expected_lo);
CHECK(hi > lo);
expected_lo = hi;
}
CHECK(expected_lo == n);
if (reference.empty()) reference = range;
CHECK(range == reference);
}
}
}
// What the blocks are for: a floating-point sum folded per block and added up in block order has the
// same bits at any thread count. The terms span many decades, so any change of grouping would show.
TEST_CASE("ParallelBlocks_SumIsTheSameAtAnyThreadCount", "[ParallelFor]") {
constexpr int N = 1000003;
constexpr int NCELL = 37;
std::vector<double> term(N);
for (int i = 0; i < N; i++)
term[static_cast<size_t>(i)] = std::exp(std::sin(i * 0.37) * 20.0) * (i % 3 == 0 ? -1.0 : 1.0);
auto blocked_sums = [&](size_t nthreads) {
const int nb = ReductionBlocks(N);
std::vector<double> part(static_cast<size_t>(nb), 0.0);
std::vector<std::vector<double>> cell_part(static_cast<size_t>(nb), std::vector<double>(NCELL, 0.0));
ParallelBlocks(N, nthreads, [&](int b, int lo, int hi) {
for (int i = lo; i < hi; i++) {
part[static_cast<size_t>(b)] += term[static_cast<size_t>(i)];
cell_part[static_cast<size_t>(b)][static_cast<size_t>(i % NCELL)] += term[static_cast<size_t>(i)];
}
});
std::vector<double> out(NCELL + 1, 0.0);
for (int b = 0; b < nb; b++) {
out[NCELL] += part[static_cast<size_t>(b)];
for (int c = 0; c < NCELL; c++)
out[static_cast<size_t>(c)] += cell_part[static_cast<size_t>(b)][static_cast<size_t>(c)];
}
return out;
};
const std::vector<double> one = blocked_sums(1);
for (size_t nthreads: {size_t{3}, size_t{7}, size_t{32}}) {
CAPTURE(nthreads);
CHECK(blocked_sums(nthreads) == one); // bit for bit, not approximately
}
}
// A negative or zero count is a no-op rather than an error - callers pass a computed size.
TEST_CASE("ParallelFor_DoesNothingForAnEmptyRange", "[ParallelFor]") {
int calls = 0;
for (int n: {0, -1, -1000}) {
ParallelChunks(n, 8, [&](int, int) { calls++; });
ParallelFor(n, 8, [&](int) { calls++; });
ParallelBlocks(n, 8, [&](int, int, int) { calls++; });
}
CHECK(calls == 0);
}