CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-10-29 08:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mmap : fix fileno macro clash (#11076)

Browse Source 
* mmap : fix fileno macro clash

ggml-ci

* cont

ggml-ci
This commit is contained in:
Georgi Gerganov
2025-01-06 10:52:38 +02:00
committed by GitHub
parent 727368c60f
commit ae2f606bb5
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/llama-mmap.cpp
View File

@@ -241,12 +241,16 @@ llama_file::~llama_file() = default;
size_t llama_file::tell() const { return pimpl->tell(); } size_t llama_file::tell() const { return pimpl->tell(); }
size_t llama_file::size() const { return pimpl->size; } size_t llama_file::size() const { return pimpl->size; }
int llama_file::fileno() const { int llama_file::file_id() const {
#ifdef _WIN32 #ifdef _WIN32
return _fileno(pimpl->fp); return _fileno(pimpl->fp);
#else
#if defined(fileno)
return fileno(pimpl->fp);
#else #else
return ::fileno(pimpl->fp); return ::fileno(pimpl->fp);
#endif #endif
#endif
} }
void llama_file::seek(size_t offset, int whence) const { pimpl->seek(offset, whence); } void llama_file::seek(size_t offset, int whence) const { pimpl->seek(offset, whence); }
@@ -265,7 +269,7 @@ struct llama_mmap::impl {
impl(struct llama_file * file, size_t prefetch, bool numa) { impl(struct llama_file * file, size_t prefetch, bool numa) {
size = file->size(); size = file->size();
int fd = file->fileno(); int fd = file->file_id();
int flags = MAP_SHARED; int flags = MAP_SHARED;
if (numa) { prefetch = 0; } if (numa) { prefetch = 0; }
#ifdef __linux__ #ifdef __linux__
@@ -357,7 +361,7 @@ struct llama_mmap::impl {
size = file->size(); size = file->size();
HANDLE hFile = (HANDLE) _get_osfhandle(file->fileno()); HANDLE hFile = (HANDLE) _get_osfhandle(file->file_id());
HANDLE hMapping = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); HANDLE hMapping = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL);

2
src/llama-mmap.h
View File

@@ -18,7 +18,7 @@ struct llama_file {
size_t tell() const; size_t tell() const;
size_t size() const; size_t size() const;
int fileno() const; int file_id() const; // fileno overload
void seek(size_t offset, int whence) const; void seek(size_t offset, int whence) const;