From c94f7e98c10a45e76af20bea51b18c7a4b0e0ce8 Mon Sep 17 00:00:00 2001 From: anzz1 Date: Sun, 2 Apr 2023 15:39:40 +0300 Subject: [PATCH] Revert "Initial windows support (untested)" This reverts commit a017390358cdb23fffb30988dc84bb190d0403ca. --- llama.cpp | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/llama.cpp b/llama.cpp index c4fb22313..4a1063831 100644 --- a/llama.cpp +++ b/llama.cpp @@ -12,15 +12,11 @@ #include #include -// mmap +// headers for POSIX mmap #if defined (__unix__) || defined (__APPLE__) # include # include # include -#elif defined(_WIN32) -# define WIN32_LEAN_AND_MEAN -# include -//#include #endif #define LLAMA_USE_SCRATCH @@ -316,31 +312,8 @@ static void mmap_file(const char* fname, void * &mm_addr, size_t &mm_length) { mm_addr = NULL; mm_length = 0; } -#elif defined(_WIN32) - mm_addr = NULL; - - HANDLE hFile = CreateFileA(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) { - return; - } - - // not really necessary - LARGE_INTEGER fileSize; - GetFileSizeEx(hFile, &fileSize); - mm_length = fileSize; - - HANDLE hMapping = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); - CloseHandle(hFile); - - if (hMapping == NULL) { - return; - } - - mm_addr = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0); - CloseHandle(hMapping); #else - mm_addr = NULL; - mm_length = 0; + // TODO: windows support (void)(fname); // suppress warnings #endif } @@ -349,9 +322,8 @@ static void munmap_file(void * addr, size_t length) { #if defined(MAP_FAILED) // POSIX munmap(addr, length); -#elif defined(_WIN32) - UnmapViewOfFile(addr); #else + // TODO: windows support (void)(addr); // suppress warnings (void)(length); #endif