flodl 0.7.0

floDl — a flow-graph deep learning framework built on libtorch
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
//! Prefetch pipeline internals for streaming mode.
//!
//! Not part of the public API. Used by [`DataLoader`](super::DataLoader)
//! when the dataset does not fit in VRAM.
//!
//! # Pipeline shape
//!
//! Single-stage (CPU targets, distributed `LoadBatch`): one worker
//! thread fetches from the dataset and forwards on the batch channel;
//! the channel itself is the read-ahead buffer.
//!
//! Two-stage (CUDA targets, `ring_slots > 0`): a reader thread fetches
//! batches from the dataset into a bounded pageable-RAM ring; the
//! worker thread drains the ring and runs the device transfer
//! (pin + async H2D + completion event). Storage-read latency then
//! overlaps the transfer stage's CPU work, raising the pipeline's
//! throughput ceiling from `1/(t_read + t_transfer)` to
//! `1/max(t_read, t_transfer)`, and the ring absorbs read jitter
//! (network storage). The ring bounds RAM in flight; the depth
//! governor independently bounds VRAM in flight.

use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use std::sync::mpsc;
use std::sync::Arc;
use std::thread::{self, JoinHandle};
use std::time::Duration;

use crate::tensor::{Device, Result, Tensor, TensorError};
use super::vram_pool::VramSamplePool;
use super::BatchDataSet;

// ---------------------------------------------------------------------------
// Depth governor
// ---------------------------------------------------------------------------

/// Shared depth-governor state for adaptive streaming prefetch.
///
/// Prefetch depth is a soft TARGET the worker respects (at most `target`
/// batches in flight, `sent - consumed`), not the channel capacity. That
/// makes depth adjustable at any moment, mid-epoch included: the sizing
/// policy (loader/consumer side) writes `target`, the worker reads it
/// before each fetch. The per-epoch channel keeps a generous fixed
/// capacity purely as a safety bound.
///
/// One instance lives on the `StreamingLoader` for the loader's lifetime,
/// shared with the worker thread and the live epoch iterator.
pub(crate) struct GovernorCtl {
    /// Soft cap on in-flight batches. Written by epoch sizing, the
    /// one-shot honest resize, `auto_resize`, and the worker's OOM
    /// halving. `0` is treated as `1` by the gate (a zero target would
    /// deadlock the pipeline).
    pub(crate) target: AtomicUsize,
    /// Batches pushed into the current epoch's channel (worker-side).
    pub(crate) sent: AtomicUsize,
    /// Batches drained from the current epoch's channel (consumer-side).
    pub(crate) consumed: AtomicUsize,
    /// Batches drained across the whole RUN. Drives the one-shot honest
    /// resize: once the consumer drains its second batch, the first
    /// batch's forward/backward/step have demonstrably executed, so a
    /// VRAM probe finally sees activations, gradients, and lazily
    /// created optimizer state.
    pub(crate) run_consumed: AtomicUsize,
    /// One-shot latch for the honest (post-first-step) resize.
    pub(crate) honest_resize_done: AtomicBool,
    /// Set by the epoch iterator's `Drop` when abandoned mid-epoch.
    /// Unblocks the worker's governor gate (consumed stops advancing on
    /// abandonment, so without this the gate could wait forever instead
    /// of reaching the failed `send` that ends the epoch).
    pub(crate) abandoned: AtomicBool,
}

impl GovernorCtl {
    pub(crate) fn new(initial_target: usize) -> Self {
        GovernorCtl {
            target: AtomicUsize::new(initial_target.max(1)),
            sent: AtomicUsize::new(0),
            consumed: AtomicUsize::new(0),
            run_consumed: AtomicUsize::new(0),
            honest_resize_done: AtomicBool::new(false),
            abandoned: AtomicBool::new(false),
        }
    }

    /// Consumer-side epoch arm: clear the abandon latch and install the
    /// epoch's initial target. The in-flight counters are NOT reset
    /// here — that happens worker-side in [`Self::reset_flight_counters`]
    /// when the `StartEpoch` command is processed. Splitting the reset
    /// this way closes a lost-batch race: the worker increments `sent`
    /// AFTER publishing a batch, so a consumer-side reset could land in
    /// that window and the straggling increment would count against the
    /// NEXT epoch (`sent=1, consumed=0` with nothing in flight — at
    /// `target=1`, the pre-honest-resize CPU depth, `governor_gate`
    /// then spins forever while the consumer blocks in `recv`; the
    /// full-suite `test_streaming_multiple_epochs` wedge).
    pub(crate) fn begin_epoch(&self, target: usize) {
        self.abandoned.store(false, Ordering::Relaxed);
        self.target.store(target.max(1), Ordering::Relaxed);
    }

    /// Worker-side per-epoch counter reset, called at `StartEpoch`
    /// receipt. Safe by construction: the worker's own `sent`
    /// increments are program-ordered before it, and every consumer
    /// increment for the prior epoch happens-before the consumer's
    /// `StartEpoch` send (whose receipt orders this reset after them) —
    /// no straggling increment can cross into the fresh epoch.
    /// Run-level state (`run_consumed`, `honest_resize_done`) persists.
    pub(crate) fn reset_flight_counters(&self) {
        self.sent.store(0, Ordering::Relaxed);
        self.consumed.store(0, Ordering::Relaxed);
    }
}

/// Worker-side gate: wait until in-flight batches drop below the target.
/// Returns `false` when the epoch was abandoned (stop fetching).
fn governor_gate(gov: &GovernorCtl) -> bool {
    loop {
        if gov.abandoned.load(Ordering::Relaxed) {
            return false;
        }
        let sent = gov.sent.load(Ordering::Relaxed);
        let consumed = gov.consumed.load(Ordering::Relaxed);
        let target = gov.target.load(Ordering::Relaxed).max(1);
        if sent.saturating_sub(consumed) < target {
            return true;
        }
        // Idle wait; granularity is irrelevant next to batch times and
        // the worker has nothing else to do while the pipeline is full.
        thread::sleep(Duration::from_millis(1));
    }
}

/// CUDA-OOM retry budget: total patience is ~1s of consumer drain time.
pub(crate) const OOM_RETRY_ATTEMPTS: usize = 10;
pub(crate) const OOM_RETRY_SLEEP: Duration = Duration::from_millis(100);

/// Retry `attempt` while it fails with a CUDA-OOM error, calling
/// `on_oom` before each retry (empty-cache + target halving + slab
/// eviction at the call sites). Prefetch OOM is usually transient: the
/// consumer frees batch tensors continuously, so the same allocation
/// succeeds after a short drain. Non-OOM errors (real dataset
/// failures) return immediately; exhausted retries return the last
/// error. The sample pool threads through both closures explicitly
/// (`attempt` assembles through it, `on_oom` may evict from it —
/// closure captures cannot share the borrow); `on_oom` also receives
/// the retry ordinal so late attempts can escalate.
pub(crate) fn retry_on_oom<T>(
    pool: &mut VramSamplePool,
    mut attempt: impl FnMut(&mut VramSamplePool) -> Result<T>,
    mut on_oom: impl FnMut(&mut VramSamplePool, usize),
) -> Result<T> {
    let mut result = attempt(pool);
    for i in 0..OOM_RETRY_ATTEMPTS {
        match &result {
            Err(e) if e.is_cuda_oom() => {
                on_oom(pool, i);
                result = attempt(pool);
            }
            _ => break,
        }
    }
    result
}

// ---------------------------------------------------------------------------
// Types
// ---------------------------------------------------------------------------

/// A single prefetched batch, ready on the target device.
pub(crate) struct PrefetchedBatch {
    pub tensors: Vec<Tensor>,
    /// The batch's PICK stream (schedule-space): the consumer keys the
    /// delivery transform from these. The rows themselves were fetched
    /// and pooled by the decoded sample ids.
    pub picks: Vec<usize>,
    /// Event recorded after async H2D copy. Consumer waits on this.
    #[cfg(feature = "cuda")]
    pub ready_event: Option<crate::tensor::cuda_event::CudaEvent>,
}

/// Commands sent to the persistent worker thread.
pub(crate) enum WorkerCmd {
    /// Start a new epoch. Includes a fresh batch channel for this epoch.
    StartEpoch {
        indices: Vec<usize>,
        batch_size: usize,
        drop_last: bool,
        /// Per-epoch batch sender. Dropped when the epoch is done or cancelled.
        batch_tx: mpsc::SyncSender<Result<PrefetchedBatch>>,
        /// Depth governor shared with the loader and epoch iterator.
        governor: Arc<GovernorCtl>,
        /// Reader-ring capacity in batches. `0` = single-stage pipeline
        /// (fetch and transfer serialized on the worker thread); `> 0`
        /// spawns a reader thread that stages batches in pageable RAM.
        /// Sized by the loader from the host RAM budget.
        ring_slots: usize,
    },
    /// Open a distributed epoch: install the batch sender, then wait for
    /// `LoadBatch` commands. The channel stays open until the next
    /// `StartEpoch`/`StartDistributedEpoch`/`Stop`.
    ///
    /// `ring_slots > 0` enables the two-stage pipeline for the epoch's
    /// `LoadBatch` stream: a reader thread fetches ahead into a bounded
    /// pageable-RAM ring while this thread runs the device transfers —
    /// the same shape as the solo `StartEpoch` path, streamed instead
    /// of fixed at spawn. `0` keeps fetch + transfer on one thread.
    StartDistributedEpoch {
        batch_tx: mpsc::SyncSender<Result<PrefetchedBatch>>,
        ring_slots: usize,
    },
    /// Load a single batch (distributed mode). Worker sends the result on
    /// the channel from the preceding `StartDistributedEpoch`.
    LoadBatch {
        indices: Vec<usize>,
    },
    /// Install the device sample pool's budget (distributed mode, where
    /// no governor exists to gate the decision): the caller signals its
    /// post-first-step moment and passes the in-flight bytes to leave
    /// reserved. Idempotent after the first decision.
    InstallVramPool {
        reserve_bytes: u64,
    },
    /// Shut down the worker.
    Stop,
}

// ---------------------------------------------------------------------------
// PrefetchWorker (persistent, lives for DataLoader lifetime)
// ---------------------------------------------------------------------------

/// Persistent background worker for streaming prefetch.
///
/// Created once at `DataLoader::build()`, lives until the DataLoader is
/// dropped. Keeps its dedicated CUDA stream alive across epochs.
///
/// Each epoch gets a fresh batch channel (created in `start_epoch()`),
/// so dropping an epoch iterator mid-epoch naturally cancels outstanding
/// work: the worker detects the closed channel and moves on.
pub(crate) struct PrefetchWorker {
    cmd_tx: mpsc::Sender<WorkerCmd>,
    handle: Option<JoinHandle<()>>,
    prefetch_depth: usize,
    /// Teardown latch: lets `Drop` unwedge a worker blocked in a batch
    /// send to a consumer that stopped draining without dropping its
    /// receiver — without it that join hung forever (see
    /// [`send_or_stop`]).
    stop: Arc<AtomicBool>,
}

impl PrefetchWorker {
    /// Spawn the persistent worker thread.
    ///
    /// `vram_pool` enables the device-resident sample pool (see
    /// [`VramSamplePool`]); it activates only on CUDA targets and only
    /// once the governor's honest probe has fired.
    pub fn new(
        dataset: Arc<dyn BatchDataSet>,
        device: Device,
        prefetch_depth: usize,
        vram_pool: bool,
        augment: usize,
    ) -> Self {
        let (cmd_tx, cmd_rx) = mpsc::channel::<WorkerCmd>();
        let stop = Arc::new(AtomicBool::new(false));

        let worker_stop = stop.clone();
        let handle = thread::spawn(move || {
            worker_loop(dataset, device, cmd_rx, vram_pool, augment, &worker_stop);
        });

        PrefetchWorker {
            cmd_tx,
            handle: Some(handle),
            prefetch_depth,
            stop,
        }
    }

    /// Start a new epoch and return a receiver for the batches.
    ///
    /// `prefetch_depth` is the channel CAPACITY (safety ceiling for the
    /// epoch); the effective in-flight bound is the governor's target,
    /// adjustable mid-epoch. `ring_slots > 0` enables the two-stage
    /// pipeline (see module docs); `0` keeps fetch + transfer on one
    /// thread.
    pub fn start_epoch(
        &self,
        indices: Vec<usize>,
        batch_size: usize,
        drop_last: bool,
        governor: Arc<GovernorCtl>,
        ring_slots: usize,
    ) -> mpsc::Receiver<Result<PrefetchedBatch>> {
        let (batch_tx, batch_rx) =
            mpsc::sync_channel::<Result<PrefetchedBatch>>(self.prefetch_depth);

        let _ = self.cmd_tx.send(WorkerCmd::StartEpoch {
            indices,
            batch_size,
            drop_last,
            batch_tx,
            governor,
            ring_slots,
        });

        batch_rx
    }

    /// Open a distributed epoch: create one channel that persists across
    /// all batches. Follow with [`Self::load_batch()`] calls per batch.
    ///
    /// `ring_slots > 0` puts a reader thread in front of the transfer
    /// stage for this epoch (two-stage pipeline, see the module docs);
    /// `0` keeps fetch + transfer serialized on the worker thread.
    pub fn start_distributed_epoch(
        &self,
        ring_slots: usize,
    ) -> mpsc::Receiver<Result<PrefetchedBatch>> {
        let (batch_tx, batch_rx) =
            mpsc::sync_channel::<Result<PrefetchedBatch>>(self.prefetch_depth);

        let _ = self
            .cmd_tx
            .send(WorkerCmd::StartDistributedEpoch { batch_tx, ring_slots });

        batch_rx
    }

    /// Send a single batch of indices for loading (distributed mode).
    /// The result arrives on the receiver from [`Self::start_distributed_epoch()`].
    pub fn load_batch(&self, indices: Vec<usize>) {
        let _ = self.cmd_tx.send(WorkerCmd::LoadBatch { indices });
    }

    /// Let the device sample pool take its one-shot budget decision
    /// (distributed mode). Call after the first training step, when the
    /// VRAM probe sees activations and optimizer state; `reserve_bytes`
    /// is the in-flight buffer to leave for the batch channel.
    pub fn install_vram_pool_budget(&self, reserve_bytes: u64) {
        let _ = self.cmd_tx.send(WorkerCmd::InstallVramPool { reserve_bytes });
    }

    /// Current prefetch depth (channel capacity for next epoch).
    pub fn prefetch_depth(&self) -> usize {
        self.prefetch_depth
    }

    /// Update prefetch depth. Takes effect on the next epoch (the channel
    /// is recreated with the new capacity in `start_epoch()`).
    pub fn set_prefetch_depth(&mut self, depth: usize) {
        self.prefetch_depth = depth;
    }
}

impl Drop for PrefetchWorker {
    fn drop(&mut self) {
        // Latch first: a worker blocked in a batch send abandons it and
        // gets back to the command channel, where Stop awaits.
        self.stop.store(true, Ordering::Relaxed);
        let _ = self.cmd_tx.send(WorkerCmd::Stop);
        if let Some(h) = self.handle.take() {
            let _ = h.join();
        }
    }
}

// ---------------------------------------------------------------------------
// Worker loop
// ---------------------------------------------------------------------------

fn worker_loop(
    dataset: Arc<dyn BatchDataSet>,
    device: Device,
    cmd_rx: mpsc::Receiver<WorkerCmd>,
    vram_pool: bool,
    augment: usize,
    stop: &AtomicBool,
) {
    // Create a dedicated CUDA stream for H2D transfers (lives across epochs).
    #[cfg(feature = "cuda")]
    let copy_stream = if device.is_cuda() {
        crate::tensor::cuda_stream::CudaStream::new(device, false).ok()
    } else {
        None
    };

    // Device-resident sample pool: worker-thread-owned (no locks),
    // lives across epochs like the copy stream. Dormant until the
    // governor's honest probe fires inside an epoch.
    let mut pool = VramSamplePool::new(device, vram_pool);

    // Distributed epoch channel, kept alive across LoadBatch commands.
    let mut dist_tx: Option<mpsc::SyncSender<Result<PrefetchedBatch>>> = None;
    // Distributed two-stage state: the reader thread + pageable ring in
    // front of this thread's transfer stage. One per distributed epoch,
    // torn down (reader joined) at every epoch transition.
    let mut dist_ring: Option<DistRing> = None;

    // One purity probe per worker (debug builds): the retained tiers —
    // and this worker's VRAM sample pool in particular — serve rows by
    // index across epochs, so `get_batch` must be a pure function of
    // the indices. See `crate::data::assert_fetch_pure`. Inert under
    // `cfg(test)` so the suite's fetch-count assertions stay exact.
    #[cfg(all(debug_assertions, not(test)))]
    let mut purity_probed = false;
    #[cfg(all(debug_assertions, not(test)))]
    let probe_purity = |probe: &[usize]| {
        let samples = crate::data::picks_to_samples(probe, augment);
        if let (Ok(a), Ok(b)) = (dataset.get_batch(&samples), dataset.get_batch(&samples)) {
            crate::data::assert_fetch_pure("BatchDataSet::get_batch", &a, &b);
        }
    };

    // Commands normally arrive off `cmd_rx`; the LoadBatch pump below
    // may pull one it cannot handle mid-pipeline (an epoch transition,
    // Stop) and park it here for this loop to process next.
    let mut deferred: Option<WorkerCmd> = None;

    loop {
        let cmd = match deferred.take() {
            Some(c) => c,
            None => match cmd_rx.recv() {
                Ok(c) => c,
                Err(_) => break, // owner gone
            },
        };
        match cmd {
            WorkerCmd::StartEpoch {
                indices,
                batch_size,
                drop_last,
                batch_tx,
                governor,
                ring_slots,
            } => {
                dist_tx = None; // close any distributed channel
                if let Some(r) = dist_ring.take() {
                    r.teardown();
                }

                // Per-epoch counter reset lives HERE, not in the
                // consumer's `begin_epoch` — see
                // `GovernorCtl::reset_flight_counters` for the
                // straggling-`sent` race a consumer-side reset loses.
                governor.reset_flight_counters();

                #[cfg(all(debug_assertions, not(test)))]
                if !purity_probed && !indices.is_empty() {
                    purity_probed = true;
                    probe_purity(&indices[..batch_size.min(indices.len())]);
                }

                if ring_slots > 0 {
                    run_two_stage_epoch(
                        &dataset,
                        device,
                        indices,
                        batch_size,
                        drop_last,
                        &batch_tx,
                        &governor,
                        ring_slots,
                        &mut pool,
                        augment,
                        stop,
                        #[cfg(feature = "cuda")]
                        copy_stream.as_ref(),
                    );
                } else {
                    run_single_stage_epoch(
                        &dataset,
                        device,
                        &indices,
                        batch_size,
                        drop_last,
                        &batch_tx,
                        &governor,
                        &mut pool,
                        augment,
                        stop,
                        #[cfg(feature = "cuda")]
                        copy_stream.as_ref(),
                    );
                }
                pool.epoch_report();
                // batch_tx is dropped here, closing the epoch's channel.
            }
            WorkerCmd::StartDistributedEpoch { batch_tx, ring_slots } => {
                // Epoch boundary on the coordinator-paced path: report
                // the closing epoch's pool telemetry before the next
                // one starts. The previous epoch's reader (if any) is
                // joined before the new one exists — a stale reader
                // must not still hold the dataset when the next epoch's
                // fetches begin.
                pool.epoch_report();
                if let Some(r) = dist_ring.take() {
                    r.teardown();
                }
                dist_tx = Some(batch_tx);
                if ring_slots > 0 {
                    dist_ring = Some(DistRing::spawn(&dataset, ring_slots, augment));
                }
            }
            WorkerCmd::InstallVramPool { reserve_bytes } => {
                pool.install_with_reserve(reserve_bytes);
            }
            WorkerCmd::LoadBatch { indices } => {
                #[cfg(all(debug_assertions, not(test)))]
                if !purity_probed && !indices.is_empty() {
                    purity_probed = true;
                    probe_purity(&indices);
                }
                let Some(tx) = dist_tx.clone() else {
                    continue; // consumer gone; drop silently, as before
                };
                if let Some(mut ring) = dist_ring.take() {
                    // Two-stage pump. One command at a time gives NO
                    // overlap — the reader would always be exactly one
                    // fetch behind this thread — so the pump forwards
                    // every already-queued `LoadBatch` (the consumer
                    // submits the whole chunk in one burst) and then
                    // alternates: feed the reader, transfer one ready
                    // batch, until nothing is owed.
                    let mut consumer_gone = false;
                    ring.submit(indices);
                    'pump: while ring.pending > 0 {
                        loop {
                            match cmd_rx.try_recv() {
                                Ok(WorkerCmd::LoadBatch { indices }) => ring.submit(indices),
                                Ok(WorkerCmd::InstallVramPool { reserve_bytes }) => {
                                    pool.install_with_reserve(reserve_bytes);
                                }
                                // An epoch transition or Stop: the rest
                                // of this chunk is abandoned. Park the
                                // command for the outer loop, whose arm
                                // also tears the ring down.
                                Ok(other) => {
                                    deferred = Some(other);
                                    break 'pump;
                                }
                                // Empty: reader has all known work.
                                // Disconnected: the owner is gone, but
                                // Drop always sends Stop first, so just
                                // finish what is owed.
                                Err(mpsc::TryRecvError::Empty)
                                | Err(mpsc::TryRecvError::Disconnected) => break,
                            }
                        }
                        let cpu_batch = match ring.ring_rx.recv() {
                            Ok(b) => b,
                            Err(_) => {
                                // Reader died with work owed (a panic that
                                // escaped the fetch guard). The batches
                                // will never come — surface one loud error
                                // instead of leaving the consumer waiting.
                                let err: Result<PrefetchedBatch> = Err(TensorError::new(
                                    "prefetch reader thread died mid-epoch",
                                ));
                                let _ = send_or_stop(&tx, err, stop);
                                consumer_gone = true;
                                break 'pump;
                            }
                        };
                        ring.pending -= 1;
                        // Same transient-OOM patience as the single-stage
                        // arm below, but only the transfer half retries —
                        // the batch is already in RAM.
                        let result = match cpu_batch {
                            Ok((picks, tensors)) => {
                                let samples = crate::data::picks_to_samples(&picks, augment);
                                if device.is_cuda() {
                                    retry_on_oom(
                                        &mut pool,
                                        |pool| {
                                            transfer_batch(
                                                &picks,
                                                &samples,
                                                &tensors,
                                                device,
                                                pool,
                                                #[cfg(feature = "cuda")]
                                                copy_stream.as_ref(),
                                            )
                                        },
                                        dist_oom_relief,
                                    )
                                } else {
                                    transfer_batch(
                                        &picks,
                                        &samples,
                                        &tensors,
                                        device,
                                        &mut pool,
                                        #[cfg(feature = "cuda")]
                                        copy_stream.as_ref(),
                                    )
                                }
                            }
                            Err(e) => Err(e),
                        };
                        match send_or_stop(&tx, result, stop) {
                            SendOutcome::Sent => {}
                            SendOutcome::Disconnected => {
                                consumer_gone = true;
                                break 'pump;
                            }
                            SendOutcome::Stopping => {
                                ring.teardown();
                                return;
                            }
                        }
                    }
                    if consumer_gone {
                        dist_tx = None;
                        ring.teardown();
                    } else {
                        // Drained, or preempted by a deferred epoch
                        // transition — either way the ring goes back so
                        // the next arm (a later `LoadBatch` burst, or
                        // the transition's own teardown) finds it.
                        dist_ring = Some(ring);
                    }
                } else {
                    // Single-stage: fetch + transfer serialized on this
                    // thread, transient-OOM patience around both halves.
                    let result = if device.is_cuda() {
                        retry_on_oom(
                            &mut pool,
                            |pool| {
                                fetch_and_transfer(
                                    &*dataset,
                                    &indices,
                                    augment,
                                    device,
                                    pool,
                                    #[cfg(feature = "cuda")]
                                    copy_stream.as_ref(),
                                )
                            },
                            dist_oom_relief,
                        )
                    } else {
                        fetch_and_transfer(
                            &*dataset,
                            &indices,
                            augment,
                            device,
                            &mut pool,
                            #[cfg(feature = "cuda")]
                            copy_stream.as_ref(),
                        )
                    };
                    match send_or_stop(&tx, result, stop) {
                        SendOutcome::Sent => {}
                        SendOutcome::Disconnected => dist_tx = None, // consumer dropped
                        SendOutcome::Stopping => return,
                    }
                }
            }
            WorkerCmd::Stop => {
                // Flush the last epoch's pool telemetry (the per-epoch
                // report otherwise fires at the NEXT epoch start, which
                // never comes).
                pool.epoch_report();
                if let Some(r) = dist_ring.take() {
                    r.teardown();
                }
                break;
            }
        }
    }
}

/// Outcome of a stop-aware batch send.
enum SendOutcome {
    Sent,
    /// Receiver gone (consumer dropped) — end the epoch as before.
    Disconnected,
    /// Teardown latch fired while the channel was full: the consumer is
    /// alive but stopped draining, and `Drop` is waiting on the join. A
    /// plain blocking `send` here deadlocked the teardown forever.
    Stopping,
}

/// Send with teardown patience: block in bounded slices, re-checking the
/// worker stop latch between attempts, so `PrefetchWorker::drop` can
/// always reclaim a worker wedged against a non-draining consumer.
fn send_or_stop(
    tx: &mpsc::SyncSender<Result<PrefetchedBatch>>,
    result: Result<PrefetchedBatch>,
    stop: &AtomicBool,
) -> SendOutcome {
    let mut pending = result;
    loop {
        match tx.try_send(pending) {
            Ok(()) => return SendOutcome::Sent,
            Err(mpsc::TrySendError::Disconnected(_)) => return SendOutcome::Disconnected,
            Err(mpsc::TrySendError::Full(v)) => {
                if stop.load(Ordering::Relaxed) {
                    return SendOutcome::Stopping;
                }
                pending = v;
                thread::sleep(Duration::from_millis(1));
            }
        }
    }
}

/// Single-stage epoch: fetch and transfer serialized on the worker
/// thread. Used when `ring_slots == 0` (CPU targets, where the batch
/// channel itself is the read-ahead buffer and there is no transfer
/// stage to overlap; or a RAM budget too tight for a reader ring).
#[allow(clippy::too_many_arguments)]
fn run_single_stage_epoch(
    dataset: &Arc<dyn BatchDataSet>,
    device: Device,
    indices: &[usize],
    batch_size: usize,
    drop_last: bool,
    batch_tx: &mpsc::SyncSender<Result<PrefetchedBatch>>,
    governor: &GovernorCtl,
    pool: &mut VramSamplePool,
    augment: usize,
    stop: &AtomicBool,
    #[cfg(feature = "cuda")] copy_stream: Option<&crate::tensor::cuda_stream::CudaStream>,
) {
    let n = indices.len();
    let mut start = 0;

    while start < n {
        let end = (start + batch_size).min(n);
        if drop_last && (end - start) < batch_size {
            break;
        }

        // Governor gate: at most `target` batches in flight.
        if !governor_gate(governor) {
            break; // epoch abandoned
        }

        // The schedule is picks; fetching and pooling key by the
        // decoded sample ids.
        let batch_picks = &indices[start..end];
        let samples = crate::data::picks_to_samples(batch_picks, augment);
        start = end;

        // Fetch once (RAM-side, cannot OOM the device), then transfer
        // with the shared VRAM-pressure patience.
        let result = guarded_get_batch(dataset.as_ref(), &samples).and_then(|tensors| {
            pooled_transfer_with_retry(
                batch_picks,
                &samples,
                &tensors,
                device,
                governor,
                pool,
                #[cfg(feature = "cuda")]
                copy_stream,
            )
        });

        // Consumer dropped (send disconnected) ends the epoch; the
        // teardown latch (send_or_stop) unwedges a full channel whose
        // consumer stopped draining without dropping it.
        match send_or_stop(batch_tx, result, stop) {
            SendOutcome::Sent => {}
            SendOutcome::Disconnected | SendOutcome::Stopping => break,
        }
        governor.sent.fetch_add(1, Ordering::Relaxed);
    }
}

/// Two-stage epoch: a reader thread stages CPU-side batches in a
/// bounded pageable ring; this thread drains the ring and runs the
/// device transfer. See the module docs for the cost model.
#[allow(clippy::too_many_arguments)]
fn run_two_stage_epoch(
    dataset: &Arc<dyn BatchDataSet>,
    device: Device,
    indices: Vec<usize>,
    batch_size: usize,
    drop_last: bool,
    batch_tx: &mpsc::SyncSender<Result<PrefetchedBatch>>,
    governor: &GovernorCtl,
    ring_slots: usize,
    pool: &mut VramSamplePool,
    augment: usize,
    stop: &AtomicBool,
    #[cfg(feature = "cuda")] copy_stream: Option<&crate::tensor::cuda_stream::CudaStream>,
) {
    let (ring_tx, ring_rx) =
        mpsc::sync_channel::<Result<(Vec<usize>, Vec<Tensor>)>>(ring_slots);
    let reader_dataset = Arc::clone(dataset);
    let reader = thread::spawn(move || {
        reader_loop(reader_dataset, indices, batch_size, drop_last, ring_tx, augment);
    });

    loop {
        // Governor gate first: while the VRAM pipeline is full, ready
        // batches wait in the pageable ring, not on the device.
        if !governor_gate(governor) {
            break; // epoch abandoned
        }
        let cpu_batch = match ring_rx.recv() {
            Ok(b) => b,
            Err(_) => break, // reader done: epoch exhausted
        };

        // Same transient-OOM patience as the single-stage path; only
        // the transfer half retries (the batch is already in RAM).
        let result = match cpu_batch {
            Ok((batch_picks, tensors)) => {
                let samples = crate::data::picks_to_samples(&batch_picks, augment);
                pooled_transfer_with_retry(
                    &batch_picks,
                    &samples,
                    &tensors,
                    device,
                    governor,
                    pool,
                    #[cfg(feature = "cuda")]
                    copy_stream,
                )
            }
            Err(e) => Err(e),
        };

        // A break on either outcome unwinds through the ring teardown
        // below, so the reader is joined even on the stop-latch path.
        match send_or_stop(batch_tx, result, stop) {
            SendOutcome::Sent => {}
            SendOutcome::Disconnected | SendOutcome::Stopping => break,
        }
        governor.sent.fetch_add(1, Ordering::Relaxed);
    }

    // Dropping the ring receiver fails the reader's next send, so an
    // early break (abandoned epoch, consumer gone) unwinds the reader
    // too. Join before returning: the worker must not process the next
    // command while a stale reader still holds the dataset.
    drop(ring_rx);
    let _ = reader.join();
}

/// Reader stage: fetch batches from the dataset in index order and push
/// them into the ring. Pure dataset I/O — no pinning, no device work
/// (the transfer stage pins, so the ring holds pageable RAM and the
/// I/O wait here genuinely overlaps the transfer stage's CPU work).
fn reader_loop(
    dataset: Arc<dyn BatchDataSet>,
    indices: Vec<usize>,
    batch_size: usize,
    drop_last: bool,
    ring_tx: mpsc::SyncSender<Result<(Vec<usize>, Vec<Tensor>)>>,
    augment: usize,
) {
    let n = indices.len();
    let mut start = 0;

    while start < n {
        let end = (start + batch_size).min(n);
        if drop_last && (end - start) < batch_size {
            break;
        }

        // PICKS ride the ring with the rows (the transfer stage keys
        // the device sample pool by their decoded ids, the consumer
        // keys the transform by the picks); the fetch itself runs on
        // the decoded sample ids.
        let batch_picks = &indices[start..end];
        let samples = crate::data::picks_to_samples(batch_picks, augment);
        let result = guarded_get_batch(dataset.as_ref(), &samples)
            .map(|tensors| (batch_picks.to_vec(), tensors));
        start = end;

        // Errors travel the ring like batches (the consumer surfaces
        // them); a failed send means the transfer stage is gone.
        if ring_tx.send(result).is_err() {
            break;
        }
    }
}

/// The distributed path's two-stage pipeline state: a reader thread
/// fetching `LoadBatch` picks ahead of the transfer stage through a
/// bounded pageable-RAM ring — `run_two_stage_epoch`'s shape with the
/// index stream arriving over a channel instead of fixed at spawn (the
/// coordinator-paced path learns its batches as `LoadBatch` commands).
/// Owned by the worker loop, one per distributed epoch.
struct DistRing {
    /// Index feed to the reader. Unbounded on purpose: picks are a few
    /// hundred bytes each, and the RING is what bounds RAM in flight.
    idx_tx: mpsc::Sender<Vec<usize>>,
    /// Ready CPU batches, reader → transfer stage. Capacity `ring_slots`.
    ring_rx: mpsc::Receiver<Result<(Vec<usize>, Vec<Tensor>)>>,
    reader: JoinHandle<()>,
    /// Batches handed to the reader and not yet transferred — what the
    /// pump still owes the consumer.
    pending: usize,
}

impl DistRing {
    fn spawn(dataset: &Arc<dyn BatchDataSet>, ring_slots: usize, augment: usize) -> Self {
        let (idx_tx, idx_rx) = mpsc::channel::<Vec<usize>>();
        let (ring_tx, ring_rx) =
            mpsc::sync_channel::<Result<(Vec<usize>, Vec<Tensor>)>>(ring_slots);
        let reader_dataset = Arc::clone(dataset);
        let reader = thread::spawn(move || {
            // Same contract as `reader_loop`: pure dataset I/O — no
            // pinning, no device work — so the storage wait here
            // genuinely overlaps the transfer stage's CPU work. Errors
            // ride the ring like batches; a failed send means the
            // transfer stage is gone.
            for picks in idx_rx {
                let samples = crate::data::picks_to_samples(&picks, augment);
                let result = guarded_get_batch(reader_dataset.as_ref(), &samples)
                    .map(|tensors| (picks, tensors));
                if ring_tx.send(result).is_err() {
                    break;
                }
            }
        });
        DistRing { idx_tx, ring_rx, reader, pending: 0 }
    }

    /// Hand one batch's picks to the reader.
    fn submit(&mut self, picks: Vec<usize>) {
        if self.idx_tx.send(picks).is_ok() {
            self.pending += 1;
        }
    }

    /// Close the feed, unblock the reader, and join it. Anything still
    /// pending is dropped — every caller is an epoch transition or a
    /// teardown, where the consumer has already abandoned those batches.
    fn teardown(self) {
        drop(self.idx_tx);
        drop(self.ring_rx);
        let _ = self.reader.join();
    }
}

/// The distributed path's transient-OOM relief, shared by its
/// single-stage (refetch + retransfer) and two-stage (retransfer only)
/// arms. No governor target exists to shrink on this path — the
/// coordinator paces in-flight batches — so drain patience comes first,
/// and the pool's slab eviction is the only remaining relief valve
/// (last resort: only once half the retry budget is spent).
fn dist_oom_relief(pool: &mut VramSamplePool, attempt: usize) {
    crate::tensor::cuda_empty_cache();
    thread::sleep(OOM_RETRY_SLEEP);
    if attempt >= OOM_RETRY_ATTEMPTS / 2 {
        pool.evict_one_slab();
    }
}

/// Shared OOM back-off for both pipeline shapes: halve the in-flight
/// target so the overcommit self-heals instead of re-OOMing on every
/// batch, free the allocator cache, give the consumer time to drain.
fn oom_backoff(governor: &GovernorCtl) {
    let t = governor.target.load(Ordering::Relaxed);
    governor.target.store((t / 2).max(1), Ordering::Relaxed);
    crate::tensor::cuda_empty_cache();
    thread::sleep(OOM_RETRY_SLEEP);
}

/// Transfer with the shared VRAM-pressure patience: on transient OOM
/// the governor's target halving runs first; once the target is
/// already at its floor, the sample pool gives a slab back — the last
/// resort, so pool residency is never what keeps the pipeline OOMing.
fn pooled_transfer_with_retry(
    picks: &[usize],
    samples: &[usize],
    tensors: &[Tensor],
    device: Device,
    governor: &GovernorCtl,
    pool: &mut VramSamplePool,
    #[cfg(feature = "cuda")] copy_stream: Option<&crate::tensor::cuda_stream::CudaStream>,
) -> Result<PrefetchedBatch> {
    if !device.is_cuda() {
        return transfer_batch(
            picks,
            samples,
            tensors,
            device,
            pool,
            #[cfg(feature = "cuda")]
            copy_stream,
        );
    }
    pool.maybe_install(governor, tensors);

    retry_on_oom(
        pool,
        |pool| {
            transfer_batch(
                picks,
                samples,
                tensors,
                device,
                pool,
                #[cfg(feature = "cuda")]
                copy_stream,
            )
        },
        |pool, _attempt| {
            let at_floor = governor.target.load(Ordering::Relaxed) <= 1;
            oom_backoff(governor);
            if at_floor {
                pool.evict_one_slab();
            }
        },
    )
}

/// Fetch through the user's dataset with a panic firewall: a panic in
/// `get_batch` (a bug in user dataset code) becomes an `Err` batch
/// carrying the panic message, exactly like a dataset `Err` does — the
/// worker thread survives and later epochs keep working. Without this
/// the thread died with the payload discarded, and every subsequent
/// epoch failed with a generic "worker stopped" that pointed at flodl
/// instead of the dataset.
fn guarded_get_batch(dataset: &dyn BatchDataSet, samples: &[usize]) -> Result<Vec<Tensor>> {
    // AssertUnwindSafe: after a panic the dataset is only ever read
    // again, and the fetch-purity contract (`assert_fetch_pure`)
    // already requires reads to be index-pure.
    match std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| dataset.get_batch(samples))) {
        Ok(r) => r,
        Err(payload) => {
            let msg = payload
                .downcast_ref::<&str>()
                .map(|s| s.to_string())
                .or_else(|| payload.downcast_ref::<String>().cloned())
                .unwrap_or_else(|| "non-string panic payload".into());
            Err(TensorError::new(&format!(
                "dataset panicked in get_batch: {msg}"
            )))
        }
    }
}

/// Fetch a batch from the dataset and transfer to the target device.
/// Distributed `LoadBatch` path: both halves serialized on the calling
/// thread.
fn fetch_and_transfer(
    dataset: &dyn BatchDataSet,
    picks: &[usize],
    augment: usize,
    device: Device,
    pool: &mut VramSamplePool,
    #[cfg(feature = "cuda")] copy_stream: Option<&crate::tensor::cuda_stream::CudaStream>,
) -> Result<PrefetchedBatch> {
    let samples = crate::data::picks_to_samples(picks, augment);
    let tensors = guarded_get_batch(dataset, &samples)?;
    transfer_batch(
        picks,
        &samples,
        &tensors,
        device,
        pool,
        #[cfg(feature = "cuda")]
        copy_stream,
    )
}

/// Transfer stage: put the batch on the target device (pin + async H2D
/// on the copy stream, completion event recorded), assembling through
/// the device sample pool when it holds rows: pooled rows are gathered
/// on device instead of uploaded, only misses cross PCIe, and fresh
/// rows are captured into the pool on the way out (all on the copy
/// stream, so the delivery event covers gathers and captures too).
/// On a CPU target this is a pass-through (shallow clones: refcount
/// bumps on shared storage, no data copy).
fn transfer_batch(
    picks: &[usize],
    samples: &[usize],
    tensors: &[Tensor],
    device: Device,
    pool: &mut VramSamplePool,
    #[cfg(feature = "cuda")] copy_stream: Option<&crate::tensor::cuda_stream::CudaStream>,
) -> Result<PrefetchedBatch> {
    if !device.is_cuda() {
        return Ok(PrefetchedBatch {
            tensors: tensors.to_vec(),
            picks: picks.to_vec(),
            #[cfg(feature = "cuda")]
            ready_event: None,
        });
    }

    #[cfg(feature = "cuda")]
    {
        use crate::tensor::cuda_event::{CudaEvent, CudaEventFlags};
        use crate::tensor::cuda_stream::StreamGuard;

        if let Some(stream) = copy_stream {
            let _guard = StreamGuard::new(stream);
            let on_device =
                assemble_on_device(samples, tensors, device, pool, /* async_copy */ true)?;

            // Record completion event on the copy stream
            let event = CudaEvent::new(CudaEventFlags::DisableTiming)?;
            event.record_on(stream)?;

            return Ok(PrefetchedBatch {
                tensors: on_device,
                picks: picks.to_vec(),
                ready_event: Some(event),
            });
        }

        // Fallback: synchronous transfer (no stream available)
        let on_device =
            assemble_on_device(samples, tensors, device, pool, /* async_copy */ false)?;
        Ok(PrefetchedBatch {
            tensors: on_device,
            picks: picks.to_vec(),
            ready_event: None,
        })
    }

    #[cfg(not(feature = "cuda"))]
    {
        let _ = samples;
        let _ = pool;
        // Without CUDA feature, just return CPU tensors
        Ok(PrefetchedBatch {
            tensors: tensors.to_vec(),
            picks: picks.to_vec(),
        })
    }
}

/// Device-side batch assembly through the sample pool: gather pooled
/// rows, upload only the misses, stitch back to caller row order, and
/// capture the fresh rows. With the pool dormant this is exactly the
/// plain upload. Caller owns the stream context.
#[cfg(feature = "cuda")]
fn assemble_on_device(
    indices: &[usize],
    tensors: &[Tensor],
    device: Device,
    pool: &mut VramSamplePool,
    async_copy: bool,
) -> Result<Vec<Tensor>> {
    let upload = |t: &Tensor| -> Result<Tensor> {
        let pinned = t.pin_memory()?;
        if async_copy {
            pinned.to_device_async(device)
        } else {
            pinned.to_device(device)
        }
    };

    let (hits, misses) = pool.partition(indices);

    // Upload the missing rows (whole batch when nothing is pooled).
    let uploaded: Vec<Tensor> = if misses.len() == indices.len() {
        tensors.iter().map(&upload).collect::<Result<_>>()?
    } else if !misses.is_empty() {
        let rows: Vec<i64> = misses.iter().map(|&p| p as i64).collect();
        let rows_t = Tensor::from_i64(&rows, &[rows.len() as i64], Device::CPU)?;
        tensors
            .iter()
            .map(|t| upload(&t.index_select(0, &rows_t)?))
            .collect::<Result<_>>()?
    } else {
        Vec::new()
    };

    if hits.is_empty() {
        // Plain upload; admit what the pool has room for.
        pool.capture(indices, &uploaded)?;
        return Ok(uploaded);
    }

    let gathered = pool.gather(indices, &hits)?;
    if misses.is_empty() {
        // Zero H2D: `partition` returns hits in caller order.
        return Ok(gathered);
    }

    // Stitch [gathered rows..., uploaded rows...] back to caller order.
    let n = indices.len();
    let mut map = vec![0i64; n];
    for (k, &pos) in hits.iter().enumerate() {
        map[pos] = k as i64;
    }
    for (m, &pos) in misses.iter().enumerate() {
        map[pos] = (hits.len() + m) as i64;
    }
    let map_t = Tensor::from_i64(&map, &[n as i64], device)?;
    let mut out = Vec::with_capacity(tensors.len());
    for (g, u) in gathered.iter().zip(uploaded.iter()) {
        out.push(Tensor::cat_many(&[g, u], 0)?.index_select(0, &map_t)?);
    }

    let miss_samples: Vec<usize> = misses.iter().map(|&p| indices[p]).collect();
    pool.capture(&miss_samples, &uploaded)?;
    Ok(out)
}

#[cfg(test)]
mod tests {
    use super::*;

    struct TinyBatch;
    impl BatchDataSet for TinyBatch {
        fn len(&self) -> usize {
            64
        }
        fn get_batch(&self, indices: &[usize]) -> Result<Vec<Tensor>> {
            let vals: Vec<f32> = indices.iter().map(|&i| i as f32).collect();
            Ok(vec![Tensor::from_f32(
                &vals,
                &[vals.len() as i64],
                Device::CPU,
            )?])
        }
    }

    #[test]
    fn drop_unwedges_worker_blocked_on_full_channel() {
        // Consumer keeps the receiver alive but stops draining: once the
        // channel fills, the worker wedges in the batch send. Drop must
        // still complete via the teardown latch — a plain blocking send
        // made this join hang forever.
        let w = PrefetchWorker::new(Arc::new(TinyBatch), Device::CPU, 1, false, 1);
        let rx = w.start_distributed_epoch(0);
        w.load_batch(vec![0]); // fills the depth-1 channel
        w.load_batch(vec![1]); // worker wedges in this send
        w.load_batch(vec![2]);
        thread::sleep(Duration::from_millis(200));

        let (done_tx, done_rx) = mpsc::channel();
        thread::spawn(move || {
            drop(w);
            let _ = done_tx.send(());
        });
        done_rx
            .recv_timeout(Duration::from_secs(30))
            .expect("PrefetchWorker::drop hung — teardown latch failed");
        drop(rx);
    }

    #[test]
    fn drop_unwedges_ring_pump_blocked_on_full_channel() {
        // The two-stage twin of the test above: the pump is wedged in the
        // batch send with a live reader behind it. Drop must unwind BOTH
        // threads — the stop latch frees the pump, whose teardown drains
        // the ring so the reader's send fails instead of blocking forever.
        let w = PrefetchWorker::new(Arc::new(TinyBatch), Device::CPU, 1, false, 1);
        let rx = w.start_distributed_epoch(2);
        for i in 0..6 {
            w.load_batch(vec![i]);
        }
        thread::sleep(Duration::from_millis(200));

        let (done_tx, done_rx) = mpsc::channel();
        thread::spawn(move || {
            drop(w);
            let _ = done_tx.send(());
        });
        done_rx
            .recv_timeout(Duration::from_secs(30))
            .expect("PrefetchWorker::drop hung with a ring active");
        drop(rx);
    }

    #[test]
    fn distributed_ring_delivers_in_order_with_content() {
        // The pump reorders NOTHING: batches come back in submission
        // order carrying the rows their picks name, across enough
        // batches to cycle the ring several times.
        let w = PrefetchWorker::new(Arc::new(TinyBatch), Device::CPU, 4, false, 1);
        let rx = w.start_distributed_epoch(2);
        let batches: Vec<Vec<usize>> = (0..8).map(|i| vec![2 * i, 2 * i + 1]).collect();
        for b in &batches {
            w.load_batch(b.clone());
        }
        for expected in &batches {
            let got = rx
                .recv_timeout(Duration::from_secs(10))
                .expect("batch never arrived")
                .expect("batch errored");
            assert_eq!(&got.picks, expected);
            let vals = got.tensors[0].to_f32_vec().unwrap();
            let want: Vec<f32> = expected.iter().map(|&i| i as f32).collect();
            assert_eq!(vals, want);
        }
    }

    /// Counts `get_batch` calls and makes each one slow — the test twin
    /// of remote storage, so a test can observe how far ahead of
    /// consumption each pipeline shape actually reads.
    struct SlowCountingBatch {
        fetched: Arc<AtomicUsize>,
        delay: Duration,
    }
    impl BatchDataSet for SlowCountingBatch {
        fn len(&self) -> usize {
            64
        }
        fn get_batch(&self, indices: &[usize]) -> Result<Vec<Tensor>> {
            thread::sleep(self.delay);
            self.fetched.fetch_add(1, Ordering::SeqCst);
            let vals: Vec<f32> = indices.iter().map(|&i| i as f32).collect();
            Ok(vec![Tensor::from_f32(
                &vals,
                &[vals.len() as i64],
                Device::CPU,
            )?])
        }
    }

    #[test]
    fn distributed_ring_reader_fetches_ahead_of_a_stalled_consumer() {
        // The point of the ring: with the batch channel full (depth 1,
        // nothing consumed), a single-stage worker holds at most 2 fetched
        // batches — one in the channel, one wedged in the send — while the
        // two-stage reader keeps reading and parks ready batches in the
        // ring. The bounds are structural; the fetch delay only pins the
        // interleaving (all 6 submissions land, microseconds, before the
        // reader clears its first 50ms fetch).
        let fetched = Arc::new(AtomicUsize::new(0));
        let delay = Duration::from_millis(50);

        // Single-stage baseline: the fetch count is pinned at 2.
        let w = PrefetchWorker::new(
            Arc::new(SlowCountingBatch { fetched: Arc::clone(&fetched), delay }),
            Device::CPU,
            1,
            false,
            1,
        );
        let rx = w.start_distributed_epoch(0);
        for i in 0..6 {
            w.load_batch(vec![i]);
        }
        thread::sleep(Duration::from_millis(500));
        assert!(
            fetched.load(Ordering::SeqCst) <= 2,
            "single-stage read past its structural bound: {}",
            fetched.load(Ordering::SeqCst),
        );
        drop(rx);
        drop(w);

        // Two-stage, same stall: ring 3 + the reader's hands + the wedged
        // send + the channel slot — at least 5 reads with zero consumption.
        fetched.store(0, Ordering::SeqCst);
        let w = PrefetchWorker::new(
            Arc::new(SlowCountingBatch { fetched: Arc::clone(&fetched), delay }),
            Device::CPU,
            1,
            false,
            1,
        );
        let rx = w.start_distributed_epoch(3);
        for i in 0..6 {
            w.load_batch(vec![i]);
        }
        let deadline = std::time::Instant::now() + Duration::from_secs(10);
        while fetched.load(Ordering::SeqCst) < 5 {
            assert!(
                std::time::Instant::now() < deadline,
                "reader never ran ahead: {} fetched",
                fetched.load(Ordering::SeqCst),
            );
            thread::sleep(Duration::from_millis(10));
        }
        drop(rx);
        drop(w);
    }
}