Skip to content

Fix pipelined engine reset(): cancel before drain #47

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

Merged
stikves merged 2 commits into from
Jun 15, 2026
+7 −2
Merged

Fix pipelined engine reset(): cancel before drain #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c482711
Fix pipelined engine reset(): cancel before drain
stikves Jun 15, 2026
d078427
Merge branch 'main' into sukru/fix-pipelined-drain-deadlock
stikves Jun 15, 2026
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
9 changes: 7 additions & 2 deletions swift/Sources/CoreAILanguageModels/InferenceEngines/CoreAIPipelinedEngine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,17 @@ final class CoreAIPipelinedEngine: InferenceEngine, Sendable {
}

func reset() {
drain()
// Cancel active generation BEFORE draining — otherwise drain() waits
// forever for a producer that will never release the engine.
_activeToken.withLock {
$0?.cancel()
$0 = nil
}
_generationTask.withLock { $0 = nil }
_generationTask.withLock {
$0?.cancel()
$0 = nil
}
drain()
guard tryAcquireEngine() else { return }
defer { releaseEngine() }
engine.reset()
Expand Down