vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

llama_model_loader: put mapping in a unique_ptr from the moment it is allocated

Browse source 
Co-authored-by: slaren <slarengh@gmail.com>
This commit is contained in:
Pierrick HYMBERT 2024-03-22 14:44:07 +01:00
parent f616b38b6b
commit 1f3875995f
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
llama.cpp
View file

@ -3190,14 +3190,14 @@ struct llama_model_loader {
mappings.reserve(files.size()); mappings.reserve(files.size());
mmaps_used.reserve(files.size()); mmaps_used.reserve(files.size());
for (const auto & file : files) { for (const auto & file : files) {
auto * mapping = new llama_mmap(file.get(), prefetch ? -1 : 0, ggml_is_numa()); std::unique_ptr<llama_mmap> mapping(new llama_mmap(file.get(), prefetch ? -1 : 0, ggml_is_numa()));
mmaps_used.emplace_back(std::make_pair(mapping->size, 0)); mmaps_used.emplace_back(std::make_pair(mapping->size, 0));
mappings.emplace_back(std::unique_ptr<llama_mmap>(mapping));
if (mlock_mmaps) { if (mlock_mmaps) {
auto * mlock_mmap = new llama_mlock(); std::unique_ptr<llama_mlock> mlock_mmap(new llama_mlock());
mlock_mmap->init(mapping->addr); mlock_mmap->init(mapping->addr);
mlock_mmaps->emplace_back(std::unique_ptr<llama_mlock>(mlock_mmap)); mlock_mmaps->emplace_back(std::move(mlock_mmap));
} }
mappings.emplace_back(std::move(mapping));
} }
} }