The v2 top level had grown to ~27 dirs + 13 loose files — half of them
single-concept abstraction shells (memory/ 86 LOC, transport/ 222, parity/ 178,
extend/ 226) and half vendored fastvideo code sitting as peers to the actual v2
design. Regroup to mirror README section 3 "Planes & dependency order":
core/ enums+types, card, loop, program, parity, request, parallel
(the model-native contracts; no kernels)
runtime/ + folded-in substrate: cache, memory, transport, extend
(the import graph shows only runtime consumes them; compile/cudagraph
already lived here)
serving/ + deploy/ (products / fleet)
_vendor/ all copied fastvideo: models, layers, attention, configs, distributed,
platforms, api, hooks, logging_utils, third_party + fastvideo_args/
utils/logger/envs/forward_context — internal layout unchanged, still
mirrors upstream for diffing
28 dirs + 13 root files -> 8 dirs + 6 root files. Pure mechanical move: 947
absolute-import paths rewritten (v2.X -> v2.{core,runtime,serving,_vendor}.X),
boundary-anchored so platform/ (native dispatch) and platforms/ (vendored CUDA
detect) no longer collide and neither does hooks/ vs extend/. Deleted the empty
v2/loader/. README section 3 + 16 updated; stale test count corrected
(34 files/216 tests -> 22 files/143 tests).
Validated: `import v2` stays torch-free; `v2/run_tests.py` and `pytest v2/tests/`
-> 143 passed, 2 skipped on the numpy toy backend. (On a GPU box force the toy
backend with CUDA_VISIBLE_DEVICES="" or detect() picks cuda.) No external importer
changed — examples use the re-exported `from v2 import VideoGenerator`.
41 lines
1.1 KiB
Python
41 lines
1.1 KiB
Python
"""Structured cancellation.
|
|
|
|
Cancellation is a common-path action, not exceptional. Cancel takes effect at the
|
|
next loop step boundary: the driver checks the scope between steps, drops queued
|
|
work, releases LoopState + cache handles, and reports ``cancelled``.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass, field
|
|
from enum import Enum
|
|
|
|
|
|
class CancelKind(str, Enum):
|
|
REQUEST = "request"
|
|
LOOP = "loop"
|
|
STREAM = "stream"
|
|
SESSION = "session"
|
|
|
|
|
|
class Cancelled(Exception):
|
|
"""Raised at a step boundary when a CancelScope is tripped."""
|
|
|
|
|
|
@dataclass
|
|
class CancelScope:
|
|
kind: CancelKind = CancelKind.REQUEST
|
|
target_id: str = ""
|
|
_flag: list[bool] = field(default_factory=lambda: [False]) # shared mutable cell
|
|
|
|
def cancel(self) -> None:
|
|
self._flag[0] = True
|
|
|
|
@property
|
|
def cancelled(self) -> bool:
|
|
return self._flag[0]
|
|
|
|
def check(self) -> None:
|
|
"""Called by the driver at each step boundary."""
|
|
if self._flag[0]:
|
|
raise Cancelled(f"{self.kind.value}:{self.target_id}")
|