Partial Loading PR1: Tidy ModelCache #7492
Merged
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.
Summary
This PR tidies up the model cache code in preparation for further refactoring to support partial loading of models onto the GPU. These code changes should not change the functional behavior in any way.
Changes:
ModelCacheBase
class.ModelCache
is the only implementation, so there is no benefit to the separate abstract class.CacheRecord
andCacheStats
out into their own files.ModelLocker
class. This extra layer of indirection was not providing any benefit. Locking is now done directly with theModelCache
.ModelCache
. TheModelCache
should not need to be aware of the model manager submodel system.ModelCache
(e.g..lazy_offloading
,.storage_device
, etc.)QA Instructions
I ran smoke tests with a variety of SD1, SDXL and FLUX models. No change to behavior is expected.
Merge Plan
Checklist
What's New
copy (if doing a release after this PR)