Skip to content

Commit f602565

Browse files
authored
Kill the generate thread when getting a "None" new request (#218)
If we don't return immediately when getting a None, we may fail the assertion in line 970
1 parent 1d6b456 commit f602565

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

jetstream/core/orchestrator.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ def _insert_if_possible(
730730
try:
731731
new_request = my_generate_backlog.get(block=block, timeout=1.0)
732732
if new_request is None:
733-
break
733+
return None
734734
ThreadDebugLog(
735735
thread_name,
736736
f"Got a new ActiveRequest from generate backlog {idx}.",
@@ -828,7 +828,7 @@ def _bulk_insert_if_possible(
828828
break
829829

830830
if my_generate_backlog.queue[0] is None:
831-
break
831+
return None
832832

833833
expected_slots = my_generate_backlog.queue[0].num_samples
834834

@@ -857,7 +857,7 @@ def _bulk_insert_if_possible(
857857
try:
858858
new_request = my_generate_backlog.get(block=False)
859859
if new_request is None:
860-
break
860+
return None
861861
ThreadDebugLog(
862862
thread_name,
863863
f"Got a new ActiveRequest from generate backlog {idx}.",
@@ -965,6 +965,8 @@ def _generate_thread(self, idx: int):
965965
generate_engine,
966966
my_detokenize_backlog,
967967
)
968+
if decode_state is None:
969+
break
968970

969971
# At this point, we know that we have at least some slots filled.
970972
assert (

0 commit comments

Comments
 (0)