schihei/llama2.c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #179 from richinseattle/windows-ftell64-fix

Browse Source 
use ssize_t/int64 and 64bit version of ftell on windows
This commit is contained in:
Andrej
2023-08-01 09:01:50 -07:00
committed by GitHub
parent e2d4a386c7 b63dfd596f
commit b7f026ffc8
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
run.c
+1 -1
View File
@@ -483,7 +483,7 @@ int main(int argc, char *argv[]) {
TransformerWeights weights; TransformerWeights weights;
int fd = 0; // file descriptor for memory mapping int fd = 0; // file descriptor for memory mapping
float* data = NULL; // memory mapped data pointer float* data = NULL; // memory mapped data pointer
long file_size; // size of the checkpoint file in bytes ssize_t file_size; // size of the checkpoint file in bytes
{ {
FILE *file = fopen(checkpoint, "rb"); FILE *file = fopen(checkpoint, "rb");
if (!file) { printf("Couldn't open file %s\n", checkpoint); return 1; } if (!file) { printf("Couldn't open file %s\n", checkpoint); return 1; }
win.c
+8 -14
View File
@@ -2,7 +2,6 @@
#include <errno.h> #include <errno.h>
#include <io.h> #include <io.h>
#ifndef FILE_MAP_EXECUTE #ifndef FILE_MAP_EXECUTE
#define FILE_MAP_EXECUTE 0x0020 #define FILE_MAP_EXECUTE 0x0020
#endif /* FILE_MAP_EXECUTE */ #endif /* FILE_MAP_EXECUTE */
@@ -53,10 +52,9 @@ static DWORD __map_mmap_prot_file(const int prot)
return desiredAccess; return desiredAccess;
} }
void* mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off) void* mmap(void *addr, size_t len, int prot, int flags, int fildes, ssize_t off)
{ {
HANDLE fm, h; HANDLE fm, h;
void * map = MAP_FAILED; void * map = MAP_FAILED;
#ifdef _MSC_VER #ifdef _MSC_VER
@@ -64,19 +62,15 @@ void* mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
#pragma warning(disable: 4293) #pragma warning(disable: 4293)
#endif #endif
const DWORD dwFileOffsetLow = (sizeof(off_t) <= sizeof(DWORD)) ? const DWORD dwFileOffsetLow = (DWORD)(off & 0xFFFFFFFFL);
(DWORD)off : (DWORD)(off & 0xFFFFFFFFL); const DWORD dwFileOffsetHigh = (DWORD)((off >> 32) & 0xFFFFFFFFL);
const DWORD dwFileOffsetHigh = (sizeof(off_t) <= sizeof(DWORD)) ?
(DWORD)0 : (DWORD)((off >> 32) & 0xFFFFFFFFL);
const DWORD protect = __map_mmap_prot_page(prot); const DWORD protect = __map_mmap_prot_page(prot);
const DWORD desiredAccess = __map_mmap_prot_file(prot); const DWORD desiredAccess = __map_mmap_prot_file(prot);
const off_t maxSize = off + (off_t)len; const ssize_t maxSize = off + (ssize_t)len;
const DWORD dwMaxSizeLow = (sizeof(off_t) <= sizeof(DWORD)) ? const DWORD dwMaxSizeLow = (DWORD)(maxSize & 0xFFFFFFFFL);
(DWORD)maxSize : (DWORD)(maxSize & 0xFFFFFFFFL); const DWORD dwMaxSizeHigh = (DWORD)((maxSize >> 32) & 0xFFFFFFFFL);
const DWORD dwMaxSizeHigh = (sizeof(off_t) <= sizeof(DWORD)) ?
(DWORD)0 : (DWORD)((maxSize >> 32) & 0xFFFFFFFFL);
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
@@ -110,11 +104,11 @@ void* mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
errno = __map_mman_error(GetLastError(), EPERM); errno = __map_mman_error(GetLastError(), EPERM);
return MAP_FAILED; return MAP_FAILED;
} }
map = MapViewOfFile(fm, desiredAccess, dwFileOffsetHigh, dwFileOffsetLow, len); map = MapViewOfFile(fm, desiredAccess, dwFileOffsetHigh, dwFileOffsetLow, len);
CloseHandle(fm); CloseHandle(fm);
if (map == NULL) if (map == NULL)
{ {
errno = __map_mman_error(GetLastError(), EPERM); errno = __map_mman_error(GetLastError(), EPERM);
win.h
+3 -1
View File
@@ -5,6 +5,8 @@
#include <windows.h> #include <windows.h>
#include <time.h> #include <time.h>
#define ssize_t __int64
#define ftell _ftelli64
// Below code is originally from mman-win32 // Below code is originally from mman-win32
// //
@@ -51,7 +53,7 @@ extern "C" {
/* Flags for portable clock_gettime call. */ /* Flags for portable clock_gettime call. */
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
void* mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off); void* mmap(void *addr, size_t len, int prot, int flags, int fildes, ssize_t off);
int munmap(void *addr, size_t len); int munmap(void *addr, size_t len);
int mprotect(void *addr, size_t len, int prot); int mprotect(void *addr, size_t len, int prot);
int msync(void *addr, size_t len, int flags); int msync(void *addr, size_t len, int flags);