Revert "ggml : do not use _GNU_SOURCE gratuitously (#1027)"

This reverts commit 3f7a03ebe3.
This commit is contained in:
Georgi Gerganov 2023-07-02 21:53:52 +03:00
parent d6509bf78d
commit 8ba42095c5
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
7 changed files with 18 additions and 10 deletions

View File

@ -36,12 +36,11 @@ CFLAGS = -I. -O3 -DNDEBUG -std=c11 -fPIC
CXXFLAGS = -I. -I./examples -O3 -DNDEBUG -std=c++11 -fPIC
LDFLAGS =
# clock_gettime came in POSIX.1b (1993)
# CLOCK_MONOTONIC came in POSIX.1-2001 / SUSv3 as optional
# posix_memalign came in POSIX.1-2001 / SUSv3
# M_PI is an XSI extension since POSIX.1-2001 / SUSv3, came in XPG1 (1985)
CFLAGS += -D_XOPEN_SOURCE=600
CXXFLAGS += -D_XOPEN_SOURCE=600
# ref: https://github.com/ggerganov/whisper.cpp/issues/37
ifneq ($(wildcard /usr/include/musl/*),)
CFLAGS += -D_POSIX_SOURCE -D_GNU_SOURCE
CXXFLAGS += -D_POSIX_SOURCE -D_GNU_SOURCE
endif
# RLIMIT_MEMLOCK came in BSD, is not specified in POSIX.1,
# and on macOS its availability depends on enabling Darwin extensions

View File

@ -6,8 +6,8 @@
// ref: https://github.com/ggerganov/whisper.cpp/issues/171
//
#include "common-sdl.h"
#include "common.h"
#include "common-sdl.h"
#include "whisper.h"
#include <sstream>

View File

@ -3,8 +3,8 @@
// A very quick-n-dirty implementation serving mainly as a proof of concept.
//
#include "common-sdl.h"
#include "common.h"
#include "common-sdl.h"
#include "whisper.h"
#include <cassert>

View File

@ -1,3 +1,11 @@
// Defines fileno on msys:
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#include <cstddef>
#include <cstdint>
#include <cstdio>
#endif
#include "llama-util.h"
#include "llama.h"

View File

@ -1,8 +1,8 @@
// Talk with AI
//
#include "common-sdl.h"
#include "common.h"
#include "common-sdl.h"
#include "whisper.h"
#include "llama.h"

View File

@ -1,8 +1,8 @@
// Talk with AI
//
#include "common-sdl.h"
#include "common.h"
#include "common-sdl.h"
#include "whisper.h"
#include "gpt-2.h"

1
ggml.c
View File

@ -1,3 +1,4 @@
#define _GNU_SOURCE // Defines CLOCK_MONOTONIC on Linux
#define _CRT_SECURE_NO_DEPRECATE // Disables ridiculous "unsafe" warnigns on Windows
#include "ggml.h"