Skip to content
Open
Changes from all commits
Commits
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
68 changes: 37 additions & 31 deletions nntrainer/models/neuralnet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -737,21 +737,23 @@ void NeuralNetwork::load(const std::string &file_path,
NNTR_THROW_IF((model_file_fd == -1), std::invalid_argument)
<< "Cannot open file : " << f_path;
}
std::vector<std::future<void>> futures;
// std::vector<std::future<void>> futures;
std::vector<std::thread> threads;
threads.reserve(model_graph.size());
for (auto iter = model_graph.cbegin(); iter != model_graph.cend();
++iter) {
auto node = *iter;
auto exec_order = std::get<0>((*iter)->getExecutionOrder());

futures.emplace_back(std::async(std::launch::async, [&, node] {
threads.emplace_back([&, node]() {
if (!MMAP_READ) {
auto local_model_file = checkedOpenStream<std::ifstream>(
(v.size() == 2) ? v[1] : v[0], std::ios::in | std::ios::binary);
node->read(local_model_file, false, exec_mode, fsu_mode,
std::numeric_limits<size_t>::max(), true, model_file_fd);
} else {
#if defined(_WIN32)
// Map per-task, then unmap immediately after: enables early release
// Map per-ask, then unmap immediately after: enables early release
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe typo? 'per-ask' -> 'per-task'

// of pages
HANDLE hFile =
CreateFileA(f_path.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
Expand All @@ -777,39 +779,43 @@ void NeuralNetwork::load(const std::string &file_path,
CloseHandle(hMap);
CloseHandle(hFile);
#else
// POSIX: map per-task, advise kernel, drop pages, unmap
int fd = ::open(f_path.c_str(), O_RDONLY);
NNTR_THROW_IF((fd == -1), std::invalid_argument)
<< "Cannot open file : " << f_path;

struct stat st {};
NNTR_THROW_IF((::fstat(fd, &st) == -1), std::invalid_argument)
<< "Cannot get file info (fstat): " << f_path;

size_t f_size = static_cast<size_t>(st.st_size);
void *mmap_ptr = ::mmap(nullptr, f_size, PROT_READ, MAP_PRIVATE, fd, 0);
::close(fd); // fd not needed after mmap
NNTR_THROW_IF((mmap_ptr == MAP_FAILED), std::runtime_error)
<< "mmap failed";

// Hint: many model loads touch scattered regions -> RANDOM helps reduce readahead
(void)::posix_madvise(mmap_ptr, f_size, POSIX_MADV_RANDOM);

char *view = static_cast<char *>(mmap_ptr);
node->read(view, false, exec_mode, fsu_mode,
std::numeric_limits<size_t>::max(), true);
// POSIX: map per-task, advise kernel, drop pages, unmap
int fd = ::open(f_path.c_str(), O_RDONLY);
NNTR_THROW_IF((fd == -1), std::invalid_argument)
<< "Cannot open file : " << f_path;

struct stat st {};
NNTR_THROW_IF((::fstat(fd, &st) == -1), std::invalid_argument)
<< "Cannot get file info (fstat): " << f_path;

size_t f_size = static_cast<size_t>(st.st_size);
void *mmap_ptr =
::mmap(nullptr, f_size, PROT_READ, MAP_PRIVATE, fd, 0);
::close(fd); // fd not needed after mmap
NNTR_THROW_IF((mmap_ptr == MAP_FAILED), std::runtime_error)
<< "mmap failed";

// Hint: many model loads touch scattered regions -> RANDOM helps
// reduce readahead
(void)::posix_madvise(mmap_ptr, f_size, POSIX_MADV_RANDOM);

char *view = static_cast<char *>(mmap_ptr);
node->read(view, false, exec_mode, fsu_mode,
std::numeric_limits<size_t>::max(), true);

// Early drop: pages no longer needed; helps lower peak RSS during overlap
(void)::posix_madvise(mmap_ptr, f_size, POSIX_MADV_DONTNEED);
// Early drop: pages no longer needed; helps lower peak RSS during
// overlap
(void)::posix_madvise(mmap_ptr, f_size, POSIX_MADV_DONTNEED);

::munmap(mmap_ptr, f_size);
::munmap(mmap_ptr, f_size);
#endif
}
}));
});
}
for (auto &t : threads) {
if (t.joinable())
t.join();
}

for (auto &f : futures)
f.get();
} else {
for (auto iter = model_graph.cbegin(); iter != model_graph.cend();
++iter) {
Expand Down
Loading