Przemysław Pawełczyk commited on
Commit
4902c26
·
unverified ·
1 Parent(s): 6d037ea

ggml : posixify pagesize (#1251)

Browse files

* ggml : use sysconf(_SC_PAGESIZE) instead of getpagesize() derived from BSD

sed -i 's,getpagesize(),sysconf(_SC_PAGESIZE),g' ggml.c

* metal : use sysconf(_SC_PAGESIZE) instead of getpagesize() derived from BSD

sed -i 's,getpagesize(),sysconf(_SC_PAGESIZE),g' ggml-metal.m

Files changed (2) hide show
  1. ggml-metal.m +2 -2
  2. ggml.c +1 -1
ggml-metal.m CHANGED
@@ -327,7 +327,7 @@ void ggml_metal_free(struct ggml_metal_context * ctx) {
327
 
328
  void * ggml_metal_host_malloc(size_t n) {
329
  void * data = NULL;
330
- const int result = posix_memalign((void **) &data, getpagesize(), n);
331
  if (result != 0) {
332
  metal_printf("%s: error: posix_memalign failed\n", __func__);
333
  return NULL;
@@ -401,7 +401,7 @@ bool ggml_metal_add_buffer(
401
  }
402
  }
403
 
404
- const size_t size_page = getpagesize();
405
 
406
  size_t size_aligned = size;
407
  if ((size_aligned % size_page) != 0) {
 
327
 
328
  void * ggml_metal_host_malloc(size_t n) {
329
  void * data = NULL;
330
+ const int result = posix_memalign((void **) &data, sysconf(_SC_PAGESIZE), n);
331
  if (result != 0) {
332
  metal_printf("%s: error: posix_memalign failed\n", __func__);
333
  return NULL;
 
401
  }
402
  }
403
 
404
+ const size_t size_page = sysconf(_SC_PAGESIZE);
405
 
406
  size_t size_aligned = size;
407
  if ((size_aligned % size_page) != 0) {
ggml.c CHANGED
@@ -198,7 +198,7 @@ typedef void * thread_ret_t;
198
  inline static void * ggml_aligned_malloc(size_t size) {
199
  void * aligned_memory = NULL;
200
  #ifdef GGML_USE_METAL
201
- int result = posix_memalign(&aligned_memory, getpagesize(), size);
202
  #else
203
  int result = posix_memalign(&aligned_memory, GGML_MEM_ALIGN, size);
204
  #endif
 
198
  inline static void * ggml_aligned_malloc(size_t size) {
199
  void * aligned_memory = NULL;
200
  #ifdef GGML_USE_METAL
201
+ int result = posix_memalign(&aligned_memory, sysconf(_SC_PAGESIZE), size);
202
  #else
203
  int result = posix_memalign(&aligned_memory, GGML_MEM_ALIGN, size);
204
  #endif