Skip to content

Commit dbbf143

Browse files
committed
LLM: simplify condition
1 parent ca6f5cb commit dbbf143

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

src/cpp/src/continuous_batching_impl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ void ContinuousBatchingPipeline::ContinuousBatchingImpl::_free_non_running_reque
385385
std::vector<SequenceGroup::Ptr>::iterator requests_iterator = m_requests.begin();
386386
while (requests_iterator != m_requests.end()) {
387387
const auto& request = *requests_iterator;
388-
if(request->has_finished() || request->out_of_memory() || request->handle_dropped()) {
388+
if(request->has_finished()) {
389389
for (const auto& sequence: request->get_sequences()) {
390390
if (m_scheduler->has_block_table(sequence->get_id())) {
391391
m_scheduler->free_sequence(sequence->get_id());

src/cpp/src/lm_encoding.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ std::pair<EncodedResults, std::optional<int64_t>> get_lm_encoded_results(
101101
auto free_non_running_requests = [&streamer_ptr, &generations, &active_sequence_groups]() {
102102
auto removed_it = std::remove_if(active_sequence_groups.begin(), active_sequence_groups.end(),
103103
[](SequenceGroup::Ptr sg) -> bool {
104-
return sg->has_finished() || sg->out_of_memory() || sg->handle_dropped();
104+
return sg->has_finished();
105105
});
106106
active_sequence_groups.erase(removed_it, active_sequence_groups.end());
107107
};

src/cpp/src/sequence_group.hpp

+9-6
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,9 @@ class SequenceGroup : public std::enable_shared_from_this<SequenceGroup> {
356356

357357
std::vector<Sequence::Ptr> get_running_sequences() {
358358
std::vector<Sequence::Ptr> running_seqs;
359+
359360
for (size_t seq_id = 0; seq_id < m_sequences.size(); ++seq_id) {
360-
if (m_sequences[seq_id]->is_running()) {
361+
if (m_sequences[seq_id]->is_running() && !handle_dropped()) {
361362
running_seqs.emplace_back(m_sequences[seq_id]);
362363
}
363364
}
@@ -366,20 +367,22 @@ class SequenceGroup : public std::enable_shared_from_this<SequenceGroup> {
366367
}
367368

368369
std::vector<Sequence::Ptr> get_not_finished_sequences() {
369-
std::vector<Sequence::Ptr> running_seqs;
370+
std::vector<Sequence::Ptr> not_finished_sequences;
371+
370372
for (size_t seq_id = 0; seq_id < m_sequences.size(); ++seq_id) {
371-
if (!m_sequences[seq_id]->has_finished()) {
372-
running_seqs.emplace_back(m_sequences[seq_id]);
373+
if (!m_sequences[seq_id]->has_finished() && !handle_dropped()) {
374+
not_finished_sequences.emplace_back(m_sequences[seq_id]);
373375
}
374376
}
375377

376-
return running_seqs;
378+
return not_finished_sequences;
377379
}
378380

379381
std::vector<Sequence::CPtr> get_running_sequences() const {
380382
std::vector<Sequence::CPtr> running_seqs;
383+
381384
for (size_t seq_id = 0; seq_id < m_sequences.size(); ++seq_id) {
382-
if (m_sequences[seq_id]->is_running()) {
385+
if (m_sequences[seq_id]->is_running() && !handle_dropped()) {
383386
running_seqs.emplace_back(m_sequences[seq_id]);
384387
}
385388
}

0 commit comments

Comments
 (0)