Fix structure of EpLibraryPlugin::Load so that we call Unload on error. - #29634
Merged
Scott McKay (skottmckay) merged 7 commits intoJul 17, 2026
Merged
Conversation
Scott McKay (skottmckay)
requested review from
Copilot and
Edward Chen (edgchen1)
and removed request for
Edward Chen (edgchen1)
July 9, 2026 08:13
Contributor
There was a problem hiding this comment.
Pull request overview
This PR restructures EpLibraryPlugin::Load() to ensure that a partially loaded EP plugin library is cleaned up on any failure (returned error Status as well as exceptions), instead of only on exceptions.
Changes:
- Wraps the library load sequence in an inner lambda so
ORT_RETURN_IF_ERRORproduces an errorStatuswithout returning fromLoad(). - Adds a unified failure-path cleanup block intended to call
Unload()on any non-OKstatus.
Scott McKay (skottmckay)
requested review from
Copilot and
Edward Chen (edgchen1)
July 9, 2026 08:58
Edward Chen (edgchen1)
approved these changes
Jul 9, 2026
Scott McKay (skottmckay)
enabled auto-merge (squash)
July 9, 2026 22:00
…OnPluginEpLibraryLoadFailure
…OnPluginEpLibraryLoadFailure
…OnPluginEpLibraryLoadFailure
Scott McKay (skottmckay)
deleted the
skottmckay/FixCleanupOnPluginEpLibraryLoadFailure
branch
July 17, 2026 10:23
This was referenced Aug 12, 2026
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fix structure of EpLibraryPlugin::Load so that we call Unload on any error and not just an exception.
Currently we directly return on error so the Unload is never hit.
Motivation and Context
Cleanup failed load fully.