[sync] resolve conflicts of merging main

This commit is contained in:
Yuanheng Zhao
2024-05-05 05:14:00 +00:00
348 changed files with 4639 additions and 2395 deletions

View File

@@ -231,7 +231,7 @@ def benchmark_inference(args):
def hybrid_inference(rank, world_size, port, args):
colossalai.launch(config={}, rank=rank, world_size=world_size, host="localhost", port=port, backend="nccl")
colossalai.launch(rank=rank, world_size=world_size, host="localhost", port=port, backend="nccl")
benchmark_inference(args)