root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2024-12-26 11:24:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

llava: return false instead of exit (#10546)

Browse Source
This commit is contained in:
Ting Lou 2024-11-29 08:09:46 +08:00 committed by GitHub
parent dc22344088
commit 678d7994f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/llava/clip.cpp
View File

@ -40,10 +40,17 @@
#include <cinttypes> #include <cinttypes>
#include <limits> #include <limits>
#define LOG_INF(...) do { fprintf(stdout, __VA_ARGS__); } while (0) #if defined(LLAVA_LOG_OFF)
#define LOG_WRN(...) do { fprintf(stderr, __VA_ARGS__); } while (0) # define LOG_INF(...)
#define LOG_ERR(...) do { fprintf(stderr, __VA_ARGS__); } while (0) # define LOG_WRN(...)
#define LOG_DBG(...) do { fprintf(stderr, __VA_ARGS__); } while (0) # define LOG_ERR(...)
# define LOG_DBG(...)
#else // defined(LLAVA_LOG_OFF)
# define LOG_INF(...) do { fprintf(stdout, __VA_ARGS__); } while (0)
# define LOG_WRN(...) do { fprintf(stderr, __VA_ARGS__); } while (0)
# define LOG_ERR(...) do { fprintf(stderr, __VA_ARGS__); } while (0)
# define LOG_DBG(...) do { fprintf(stdout, __VA_ARGS__); } while (0)
#endif // defined(LLAVA_LOG_OFF)
//#define CLIP_DEBUG_FUNCTIONS //#define CLIP_DEBUG_FUNCTIONS

28
examples/llava/llava.cpp
View File

@ -11,13 +11,17 @@
#include <limits> #include <limits>
#include <vector> #include <vector>
#define die(msg) do { fputs("error: " msg "\n", stderr); exit(1); } while (0) #if defined(LLAVA_LOG_OFF)
#define die_fmt(fmt, ...) do { fprintf(stderr, "error: " fmt "\n", __VA_ARGS__); exit(1); } while (0) # define LOG_INF(...)
# define LOG_WRN(...)
#define LOG_INF(...) do { fprintf(stdout, __VA_ARGS__); } while (0) # define LOG_ERR(...)
#define LOG_WRN(...) do { fprintf(stderr, __VA_ARGS__); } while (0) # define LOG_DBG(...)
#define LOG_ERR(...) do { fprintf(stderr, __VA_ARGS__); } while (0) #else // defined(LLAVA_LOG_OFF)
#define LOG_DBG(...) do { fprintf(stdout, __VA_ARGS__); } while (0) # define LOG_INF(...) do { fprintf(stdout, __VA_ARGS__); } while (0)
# define LOG_WRN(...) do { fprintf(stderr, __VA_ARGS__); } while (0)
# define LOG_ERR(...) do { fprintf(stderr, __VA_ARGS__); } while (0)
# define LOG_DBG(...) do { fprintf(stdout, __VA_ARGS__); } while (0)
#endif // defined(LLAVA_LOG_OFF)
// RGB uint8 image // RGB uint8 image
struct clip_image_u8 { struct clip_image_u8 {
@ -498,10 +502,16 @@ static bool load_file_to_bytes(const char* path, unsigned char** bytesOut, long
errno = 0; errno = 0;
size_t ret = fread(buffer, 1, fileSize, file); // Read the file into the buffer size_t ret = fread(buffer, 1, fileSize, file); // Read the file into the buffer
if (ferror(file)) { if (ferror(file)) {
die_fmt("read error: %s", strerror(errno)); LOG_ERR("read error: %s", strerror(errno));
free(buffer);
fclose(file);
return false;
} }
if (ret != (size_t) fileSize) { if (ret != (size_t) fileSize) {
die("unexpectedly reached end of file"); LOG_ERR("unexpectedly reached end of file");
free(buffer);
fclose(file);
return false;
} }
fclose(file); // Close the file fclose(file); // Close the file