Skip to content

Commit 03b0c9a

Browse files
author
Dmytro Parfeniuk
committed
WIP
1 parent 8c4ea83 commit 03b0c9a

File tree

3 files changed

+15
-19
lines changed

3 files changed

+15
-19
lines changed

src/domain/backend/base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ def submit(self, request: TextGenerationRequest) -> TextGenerationResult:
9393
result = TextGenerationResult(request=request)
9494
result.start(request.prompt)
9595

96-
breakpoint() # TODO: remove
9796
for response in self.make_request(request):
9897
if response.type_ == "token_iter" and response.add_token:
9998
result.output_token(response.add_token)

src/domain/core/result.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ def __init__(self, request: TextGenerationRequest):
4040
self._first_token_time: Optional[float] = None
4141
self._decode_times = Distribution()
4242

43-
breakpoint() # TODO: remove
4443
logger.debug(f"Initialized TextGenerationResult for request: {self._request}")
4544

4645
def __repr__(self) -> str:

src/domain/scheduler/scheduler.py

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,26 +72,17 @@ async def _run_async(self) -> TextGenerationBenchmark:
7272
)
7373
load_gen = LoadGenerator(self._load_gen_mode, self._load_gen_rate)
7474

75-
coroutines = []
75+
tasks = []
7676
start_time = time.time()
7777
counter = 0
78-
7978
try:
80-
for text_generation_request, task_start_time in zip(
81-
self._request_generator, load_gen.times()
82-
):
83-
coro = Task(
84-
func=self._backend.submit,
85-
params={"request": text_generation_request.prompt},
86-
err_container=TextGenerationError,
87-
)
88-
79+
for task, task_start_time in zip(self._task_iterator(), load_gen.times()):
8980
pending_time = task_start_time - time.time()
9081

9182
if pending_time > 0:
9283
await asyncio.sleep(pending_time)
9384

94-
coroutines.append(self._run_task_async(coro, result_set))
85+
tasks.append(self._run_task_async(task, result_set))
9586
counter += 1
9687

9788
if (
@@ -108,17 +99,24 @@ async def _run_async(self) -> TextGenerationBenchmark:
10899
await asyncio.sleep(pending_duration)
109100
raise asyncio.CancelledError()
110101

111-
await asyncio.gather(*coroutines)
112-
102+
await asyncio.gather(*tasks)
113103
except asyncio.CancelledError:
114104
# Cancel all pending tasks
115-
for coro in coroutines:
116-
if not coro.done():
117-
coro.cancel()
105+
for task in tasks:
106+
if not task.done():
107+
task.cancel()
118108

119109
return result_set
120110

121111
async def _run_task_async(self, task: Task, result_set: TextGenerationBenchmark):
122112
result_set.request_started()
123113
res = await task.run_async()
124114
result_set.request_completed(res)
115+
116+
def _task_iterator(self) -> Iterable[Task]:
117+
for request in self._request_generator:
118+
yield Task(
119+
func=self._backend.submit,
120+
params={"request": request},
121+
err_container=TextGenerationError,
122+
)

0 commit comments

Comments
 (0)