From: Hirochika Matsumoto Date: Sun, 2 Jul 2023 16:47:47 +0000 (+0900) Subject: examples : use GGML_FILE_MAGIC where possible (#323) X-Git-Tag: upstream/0.0.1642~1359 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=b22fb03254acbe7b490b21e0d50ae4d96da90e22;p=pkg%2Fggml%2Fsources%2Fggml examples : use GGML_FILE_MAGIC where possible (#323) --- diff --git a/examples/dolly-v2/main.cpp b/examples/dolly-v2/main.cpp index ce7d3d4f..0d511b4e 100644 --- a/examples/dolly-v2/main.cpp +++ b/examples/dolly-v2/main.cpp @@ -100,7 +100,7 @@ bool dollyv2_model_load(const std::string & fname, dollyv2_model & model, gpt_vo { uint32_t magic; fin.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname.c_str()); return false; } diff --git a/examples/dolly-v2/quantize.cpp b/examples/dolly-v2/quantize.cpp index 83f75727..0c0d24cc 100644 --- a/examples/dolly-v2/quantize.cpp +++ b/examples/dolly-v2/quantize.cpp @@ -47,7 +47,7 @@ bool dollyv2_model_quantize(const std::string & fname_inp, const std::string & f { uint32_t magic; finp.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname_inp.c_str()); return false; } diff --git a/examples/gpt-2/main.cpp b/examples/gpt-2/main.cpp index 103bd388..c6f2c7b1 100644 --- a/examples/gpt-2/main.cpp +++ b/examples/gpt-2/main.cpp @@ -85,7 +85,7 @@ bool gpt2_model_load(const std::string & fname, gpt2_model & model, gpt_vocab & { uint32_t magic; fin.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname.c_str()); return false; } diff --git a/examples/gpt-2/quantize.cpp b/examples/gpt-2/quantize.cpp index d8021895..9d8d53a6 100644 --- a/examples/gpt-2/quantize.cpp +++ b/examples/gpt-2/quantize.cpp @@ -45,7 +45,7 @@ bool gpt2_model_quantize(const std::string & fname_inp, const std::string & fnam { uint32_t magic; finp.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname_inp.c_str()); return false; } diff --git a/examples/gpt-j/main.cpp b/examples/gpt-j/main.cpp index 516e0998..ad99c80b 100644 --- a/examples/gpt-j/main.cpp +++ b/examples/gpt-j/main.cpp @@ -85,7 +85,7 @@ bool gptj_model_load(const std::string & fname, gptj_model & model, gpt_vocab & { uint32_t magic; fin.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname.c_str()); return false; } diff --git a/examples/gpt-j/quantize.cpp b/examples/gpt-j/quantize.cpp index 0c1f795f..437053b7 100644 --- a/examples/gpt-j/quantize.cpp +++ b/examples/gpt-j/quantize.cpp @@ -46,7 +46,7 @@ bool gptj_model_quantize(const std::string & fname_inp, const std::string & fnam { uint32_t magic; finp.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname_inp.c_str()); return false; } diff --git a/examples/gpt-neox/main.cpp b/examples/gpt-neox/main.cpp index 649b51c0..065af4da 100644 --- a/examples/gpt-neox/main.cpp +++ b/examples/gpt-neox/main.cpp @@ -90,7 +90,7 @@ bool gpt_neox_model_load(const std::string & fname, gpt_neox_model & model, gpt_ { uint32_t magic; fin.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname.c_str()); return false; } diff --git a/examples/gpt-neox/quantize.cpp b/examples/gpt-neox/quantize.cpp index ac7d681c..96208c1e 100644 --- a/examples/gpt-neox/quantize.cpp +++ b/examples/gpt-neox/quantize.cpp @@ -47,7 +47,7 @@ bool gpt_neox_model_quantize(const std::string & fname_inp, const std::string & { uint32_t magic; finp.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname_inp.c_str()); return false; } diff --git a/examples/mnist/main.cpp b/examples/mnist/main.cpp index 823616fc..fac641e0 100644 --- a/examples/mnist/main.cpp +++ b/examples/mnist/main.cpp @@ -48,7 +48,7 @@ bool mnist_model_load(const std::string & fname, mnist_model & model) { { uint32_t magic; fin.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname.c_str()); return false; } diff --git a/examples/mpt/main.cpp b/examples/mpt/main.cpp index e5903c3c..063d8566 100644 --- a/examples/mpt/main.cpp +++ b/examples/mpt/main.cpp @@ -188,7 +188,7 @@ bool mpt_model_load(const std::string & fname, mpt_model & model, gpt_vocab & vo { uint32_t magic; fin.read((char *)&magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname.c_str()); return false; } diff --git a/examples/mpt/quantize.cpp b/examples/mpt/quantize.cpp index 95b83c36..d0c9dda8 100644 --- a/examples/mpt/quantize.cpp +++ b/examples/mpt/quantize.cpp @@ -48,7 +48,7 @@ bool mpt_model_quantize(const std::string & fname_inp, { uint32_t magic; finp.read((char *)&magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname_inp.c_str()); return false; diff --git a/examples/replit/main.cpp b/examples/replit/main.cpp index 77a38be0..4b96ddfb 100644 --- a/examples/replit/main.cpp +++ b/examples/replit/main.cpp @@ -200,7 +200,7 @@ bool replit_model_load(const std::string & fname, replit_model & model, replit_t { uint32_t magic; fin.read((char *)&magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname.c_str()); return false; } diff --git a/examples/replit/quantize.cpp b/examples/replit/quantize.cpp index 9a4ec433..f274074b 100644 --- a/examples/replit/quantize.cpp +++ b/examples/replit/quantize.cpp @@ -46,7 +46,7 @@ bool mpt_model_quantize(const std::string & fname_inp, { uint32_t magic; finp.read((char *)&magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname_inp.c_str()); return false; diff --git a/examples/starcoder/main.cpp b/examples/starcoder/main.cpp index 5c606598..8a694aa8 100644 --- a/examples/starcoder/main.cpp +++ b/examples/starcoder/main.cpp @@ -86,7 +86,7 @@ bool starcoder_model_load(const std::string & fname, starcoder_model & model, gp { uint32_t magic; fin.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname.c_str()); return false; } diff --git a/examples/starcoder/quantize.cpp b/examples/starcoder/quantize.cpp index 101af509..d3aee3f2 100644 --- a/examples/starcoder/quantize.cpp +++ b/examples/starcoder/quantize.cpp @@ -45,7 +45,7 @@ bool starcoder_model_quantize(const std::string & fname_inp, const std::string & { uint32_t magic; finp.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname_inp.c_str()); return false; } diff --git a/examples/whisper/quantize.cpp b/examples/whisper/quantize.cpp index 3df7b1c7..64e8f35c 100644 --- a/examples/whisper/quantize.cpp +++ b/examples/whisper/quantize.cpp @@ -57,7 +57,7 @@ bool whisper_model_quantize(const std::string & fname_inp, const std::string & f { uint32_t magic; finp.read((char *) &magic, sizeof(magic)); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model file '%s' (bad magic)\n", __func__, fname_inp.c_str()); return false; } diff --git a/examples/whisper/whisper.cpp b/examples/whisper/whisper.cpp index 813a0272..610180ab 100644 --- a/examples/whisper/whisper.cpp +++ b/examples/whisper/whisper.cpp @@ -812,7 +812,7 @@ static bool whisper_model_load(struct whisper_model_loader * loader, whisper_con { uint32_t magic; read_safe(loader, magic); - if (magic != 0x67676d6c) { + if (magic != GGML_FILE_MAGIC) { fprintf(stderr, "%s: invalid model data (bad magic)\n", __func__); return false; }