Skip to content

fix(replay): report pending weight failures before returning success #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Afloat16 wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −3
Open

fix(replay): report pending weight failures before returning success #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions edge0-infer/src/app/generation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,9 +967,20 @@ Result<GenerationCheckResult> replay_check(const SessionReference& session, cons
}
struct FinishReplay {
SessionReference session;
bool success=false;
bool drained=false;
exec::Status drain(models::FinishReason reason) {
if (drained) return {};
drained=true;
const auto result=session->model->compute->finish_pending_weights(session->model->loaded,session->state->states(),reason);
if (!result) {
session->weights_failed=true;
session->state->invalidate();
return result.error();
}
return {};
}
~FinishReplay() {
session->model->compute->finish_pending_weights(session->model->loaded, session->state->states(), success?models::FinishReason::normal:models::FinishReason::failure);
drain(models::FinishReason::failure);
{
std::lock_guard<std::mutex> lock(session->model->registry->progress_mutex);
session->model->registry->progress = {};
Expand Down Expand Up @@ -1007,10 +1018,10 @@ Result<GenerationCheckResult> replay_check(const SessionReference& session, cons
output.result.generated.push_back(greedy.value().token);
output.result.computed_tokens += block.length;
}
if (auto error=finish.drain(models::FinishReason::normal)) return *error;
session->blocks = input.blocks; output.replay = input;
output.result.e = session->state->query().e; output.result.input_complete = true;
output.result.stop_reason = StopReason::length;
finish.success=true;
return output;
}
}
20 changes: 20 additions & 0 deletions edge0-infer/tests/unit/app/generation_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,26 @@ void thinking_tools_tests() {
}
}
int main() {
{
Fixture f;f.compute.tail_failure=true;
const ReplayInput input{{0},{{0,1,BlockPhase::prefill,true}}};
const auto result=replay_check(f.session,input);
CHECK(!result && result.error().message=="tail read failed");
CHECK(!f.compute.pending && f.compute.finishes.size()==1);
CHECK(f.compute.finishes.back()==models::FinishReason::normal);
CHECK(!take(query_session_check(f.session)).valid);
const auto again=generate_tokens_check(f.session,{0},f.config);
CHECK(!again && again.error().category==ErrorCategory::session_invalid);
}
{
Fixture f;f.compute.fail_at=0;f.compute.finish_failure=true;
const ReplayInput input{{0},{{0,1,BlockPhase::prefill,true}}};
const auto result=replay_check(f.session,input);
CHECK(!result && result.error().message=="before submit");
CHECK(f.compute.finishes.size()==1 && f.compute.finishes.back()==models::FinishReason::failure);
CHECK(!take(query_session_check(f.session)).valid);
f.compute.finish_failure=false;
}
CHECK(app::reuse_method(session::ReuseKind::first)==ReuseMethod::first);
CHECK(app::reuse_method(session::ReuseKind::keep)==ReuseMethod::keep);
CHECK(app::reuse_method(session::ReuseKind::truncate)==ReuseMethod::truncate);
Expand Down