[CI/Build] Fix CPU groups in distributed VAE test mocks (#8591)
This commit is contained in:
1 parent
32ead8e5c8
commit
3345fb7498
2 files changed
+3
-2
No files matched your search
@@ -52,6 +52,7 @@ def _make_vae(vae_type=DistributedAutoencoderKLFlux2, dtype=torch.float32):
|
|||||||
@dataclass
|
@dataclass
|
||||||
class _WorldGroup:
|
class _WorldGroup:
|
||||||
device_group: dist.ProcessGroup
|
device_group: dist.ProcessGroup
|
||||||
|
cpu_group: dist.ProcessGroup
|
||||||
|
|
||||||
|
|
||||||
def _batch_worker(rank, rendezvous):
|
def _batch_worker(rank, rendezvous):
|
||||||
@@ -59,7 +60,7 @@ def _batch_worker(rank, rendezvous):
|
|||||||
dist.init_process_group("gloo", init_method=rendezvous, rank=rank, world_size=4, timeout=timedelta(seconds=60))
|
dist.init_process_group("gloo", init_method=rendezvous, rank=rank, world_size=4, timeout=timedelta(seconds=60))
|
||||||
try:
|
try:
|
||||||
with pytest.MonkeyPatch.context() as patch:
|
with pytest.MonkeyPatch.context() as patch:
|
||||||
patch.setattr(executor_module, "get_world_group", lambda: _WorldGroup(dist.group.WORLD))
|
patch.setattr(executor_module, "get_world_group", lambda: _WorldGroup(dist.group.WORLD, dist.group.WORLD))
|
||||||
for name in (
|
for name in (
|
||||||
"get_data_parallel_world_size",
|
"get_data_parallel_world_size",
|
||||||
"get_pipeline_parallel_world_size",
|
"get_pipeline_parallel_world_size",
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ def _patch_parallel_worker(rank: int, port: str, shapes: dict) -> None:
|
|||||||
try:
|
try:
|
||||||
import vllm_omni.diffusion.distributed.autoencoders.distributed_vae_executor as executor_mod
|
import vllm_omni.diffusion.distributed.autoencoders.distributed_vae_executor as executor_mod
|
||||||
|
|
||||||
world = SimpleNamespace(device_group=dist.group.WORLD)
|
world = SimpleNamespace(device_group=dist.group.WORLD, cpu_group=dist.group.WORLD)
|
||||||
executor_mod.get_world_group = lambda: world
|
executor_mod.get_world_group = lambda: world
|
||||||
|
|
||||||
vae = _stub_vae()
|
vae = _stub_vae()
|
||||||
|
|||||||
Reference in new issue
Block a user