From 94c5652fc0f4d04ac54412c4d81e2ebcdafb6ede Mon Sep 17 00:00:00 2001 From: slaren Date: Fri, 5 May 2023 00:58:56 +0200 Subject: [PATCH] quantize: make output filename optional, default to ggml-model-.bin (#1301) --- examples/quantize/quantize.cpp | 100 ++++++++++++++++++++++++++------- 1 file changed, 81 insertions(+), 19 deletions(-) diff --git a/examples/quantize/quantize.cpp b/examples/quantize/quantize.cpp index 198bd5f..7c77018 100644 --- a/examples/quantize/quantize.cpp +++ b/examples/quantize/quantize.cpp @@ -6,23 +6,47 @@ #include #include -static const std::map LLAMA_FTYPE_MAP = { - {"q4_0", LLAMA_FTYPE_MOSTLY_Q4_0}, - {"q4_1", LLAMA_FTYPE_MOSTLY_Q4_1}, - {"q4_2", LLAMA_FTYPE_MOSTLY_Q4_2}, - {"q5_0", LLAMA_FTYPE_MOSTLY_Q5_0}, - {"q5_1", LLAMA_FTYPE_MOSTLY_Q5_1}, - {"q8_0", LLAMA_FTYPE_MOSTLY_Q8_0}, +static const std::map LLAMA_FTYPE_MAP = { + {"q4_0", LLAMA_FTYPE_MOSTLY_Q4_0}, + {"q4_1", LLAMA_FTYPE_MOSTLY_Q4_1}, + {"q4_2", LLAMA_FTYPE_MOSTLY_Q4_2}, + {"q5_0", LLAMA_FTYPE_MOSTLY_Q5_0}, + {"q5_1", LLAMA_FTYPE_MOSTLY_Q5_1}, + {"q8_0", LLAMA_FTYPE_MOSTLY_Q8_0}, }; +bool try_parse_ftype(const std::string & ftype_str, llama_ftype & ftype, std::string & ftype_str_out) { + auto it = LLAMA_FTYPE_MAP.find(ftype_str); + if (it != LLAMA_FTYPE_MAP.end()) { + ftype = it->second; + ftype_str_out = it->first; + return true; + } + // try to parse as an integer + try { + int ftype_int = std::stoi(ftype_str); + for (auto it = LLAMA_FTYPE_MAP.begin(); it != LLAMA_FTYPE_MAP.end(); it++) { + if (it->second == ftype_int) { + ftype = it->second; + ftype_str_out = it->first; + return true; + } + } + } + catch (...) { + // stoi failed + } + return false; +} + // usage: -// ./quantize models/llama/ggml-model.bin models/llama/ggml-model-quant.bin type +// ./quantize models/llama/ggml-model.bin [models/llama/ggml-model-quant.bin] type [nthreads] // int main(int argc, char ** argv) { ggml_time_init(); - if (argc < 4) { - fprintf(stderr, "usage: %s model-f32.bin model-quant.bin type [nthread]\n", argv[0]); + if (argc < 3) { + fprintf(stderr, "usage: %s model-f32.bin [model-quant.bin] type [nthreads]\n", argv[0]); for (auto it = LLAMA_FTYPE_MAP.begin(); it != LLAMA_FTYPE_MAP.end(); it++) { fprintf(stderr, " type = \"%s\" or %d\n", it->first.c_str(), it->second); } @@ -36,24 +60,62 @@ int main(int argc, char ** argv) { ggml_free(ctx); } + // parse command line arguments const std::string fname_inp = argv[1]; - const std::string fname_out = argv[2]; + std::string fname_out; + int nthread; + llama_ftype ftype; + + int arg_idx = 2; + std::string ftype_str; + if (try_parse_ftype(argv[arg_idx], ftype, ftype_str)) { + // argv[2] is the ftype + std::string fpath; + const size_t pos = fname_inp.find_last_of('/'); + if (pos != std::string::npos) { + fpath = fname_inp.substr(0, pos + 1); + } + // export as [inp path]/ggml-model-[ftype].bin + fname_out = fpath + "ggml-model-" + ftype_str + ".bin"; + arg_idx++; + } + else { + // argv[2] is the output path + fname_out = argv[arg_idx]; + arg_idx++; - enum llama_ftype ftype; - if (argv[3][0] == 'q') { - auto it = LLAMA_FTYPE_MAP.find(argv[3]); - if (it == LLAMA_FTYPE_MAP.end()) { - fprintf(stderr, "%s: unknown ftype '%s'\n", __func__, argv[3]); + if (argc <= arg_idx) { + fprintf(stderr, "%s: missing ftype\n", __func__); + return 1; + } + // argv[3] is the ftype + if (!try_parse_ftype(argv[arg_idx], ftype, ftype_str)) { + fprintf(stderr, "%s: invalid ftype '%s'\n", __func__, argv[3]); + return 1; + } + arg_idx++; + } + + // parse nthreads + if (argc > arg_idx) { + try { + nthread = std::stoi(argv[arg_idx]); + } + catch (const std::exception & e) { + fprintf(stderr, "%s: invalid nthread '%s' (%s)\n", __func__, argv[arg_idx], e.what()); return 1; } - ftype = it->second; } else { - ftype = (enum llama_ftype)atoi(argv[3]); + nthread = 0; } fprintf(stderr, "%s: build = %d (%s)\n", __func__, BUILD_NUMBER, BUILD_COMMIT); - int nthread = argc > 4 ? atoi(argv[4]) : 0; + fprintf(stderr, "%s: quantizing '%s' to '%s' as %s", __func__, fname_inp.c_str(), fname_out.c_str(), ftype_str.c_str()); + if (nthread > 0) { + fprintf(stderr, " using %d threads", nthread); + } + fprintf(stderr, "\n"); const int64_t t_main_start_us = ggml_time_us();