Repository navigation
llama: model_loader: add TENSOR_READ_LAZY #27794
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.
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
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1282,6 +1282,15 @@ struct ggml_tensor * llama_model_loader::create_tensor( | |
| return NULL; | ||
| } | ||
|
|
||
| if ((flags & TENSOR_READ_LAZY) && use_mmap && tensor_read_lazy != LLAMA_TENSOR_READ_LAZY_OFF) { | ||
| // in auto mode, small tensors are cheap enough to keep resident | ||
| constexpr size_t auto_lazy_min_size = 4ull * 1024 * 1024 * 1024; | ||
| if (tensor_read_lazy == LLAMA_TENSOR_READ_LAZY_ON || ggml_nbytes(cur) > auto_lazy_min_size) { | ||
| const auto & w = require_weight(tn.str().c_str()); | ||
| lazy_tensor_ranges[w.idx].emplace_back(w.offs, w.offs + ggml_nbytes(cur)); | ||
| } | ||
| } | ||
|
Comment on lines
+1285
to
+1295
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should add a log here to help debugging easier. |
||
|
|
||
| ggml_tensor t_meta = *cur; | ||
| if (flags & TENSOR_ALLOW_RESHAPE) { | ||
| for (size_t dim = 0; dim < GGML_MAX_DIMS; dim++) { | ||
|
|
@@ -1349,7 +1358,9 @@ void llama_model_loader::init_mappings(bool prefetch, llama_mlocks * mlock_mmaps | |
| if (use_mmap) { | ||
| mappings.reserve(files.size()); | ||
| mmaps_used.reserve(files.size()); | ||
| for (const auto & file : files) { | ||
| for (uint32_t idx = 0; idx < files.size(); idx++) { | ||
| const auto & file = files[idx]; | ||
|
|
||
| bool is_numa = false; | ||
|
|
||
| auto * dev = ggml_backend_dev_by_type(GGML_BACKEND_DEVICE_TYPE_CPU); | ||
|
|
@@ -1361,7 +1372,11 @@ void llama_model_loader::init_mappings(bool prefetch, llama_mlocks * mlock_mmaps | |
| } | ||
| } | ||
|
|
||
| std::unique_ptr<llama_mmap> mapping = std::make_unique<llama_mmap>(file.get(), prefetch ? -1 : 0, is_numa); | ||
| const auto it_lazy = lazy_tensor_ranges.find(idx); | ||
| static const std::vector<std::pair<size_t, size_t>> no_lazy_ranges; | ||
|
|
||
| std::unique_ptr<llama_mmap> mapping = std::make_unique<llama_mmap>(file.get(), prefetch ? -1 : 0, is_numa, | ||
| it_lazy != lazy_tensor_ranges.end() ? it_lazy->second : no_lazy_ranges); | ||
| mmaps_used.emplace_back(mapping->size(), 0); | ||
| if (mlock_mmaps) { | ||
| std::unique_ptr<llama_mlock> mlock_mmap(new llama_mlock()); | ||
|
|
||
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typedef this
std::vector<std::pair<>>into something likellama_mmap::ranges