vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-10 17:14:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream' into concedo_experimental

Browse source 
# Conflicts:
#	Makefile
#	build.zig
#	common/CMakeLists.txt
#	common/common.cpp
#	tests/CMakeLists.txt
This commit is contained in:
Concedo 2024-04-16 17:10:10 +08:00
commit c80e24a96f
9 changed files with 115 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common/common.cpp
View file

@ -1,5 +1,7 @@
#include "common.h"
#include "build-info.h"
#include "json.hpp"
#include "json-schema-to-grammar.h"
#include "llama.h"
#include <algorithm>
@ -69,6 +71,8 @@
#define LLAMA_CURL_MAX_HEADER_LENGTH 256
#endif // LLAMA_USE_CURL
using json = nlohmann::ordered_json;
int32_t get_num_physical_cores() {
#ifdef __linux__
// enumerate the set of thread siblings, num entries is num cores
@ -1149,6 +1153,14 @@ bool gpt_params_find_arg(int argc, char ** argv, const std::string & arg, gpt_pa
);
return true;
}
// if (arg == "-j" || arg == "--json-schema") {
// if (++i >= argc) {
// invalid_param = true;
// return true;
// }
// sparams.grammar = json_schema_to_grammar(json::parse(argv[i]));
// return true;
// }
if (arg == "--override-kv") {
if (++i >= argc) {
invalid_param = true;
@ -1354,6 +1366,9 @@ void gpt_print_usage(int /*argc*/, char ** argv, const gpt_params & params) {
printf(" or `--logit-bias 15043-1` to decrease likelihood of token ' Hello'\n");
printf(" --grammar GRAMMAR BNF-like grammar to constrain generations (see samples in grammars/ dir)\n");
printf(" --grammar-file FNAME file to read grammar from\n");
printf(" -j SCHEMA, --json-schema SCHEMA\n");
printf(" JSON schema to constrain generations (https://json-schema.org/), e.g. `{}` for any JSON object.\n");
printf(" For schemas w/ external $refs, use --grammar + example/json_schema_to_grammar.py instead\n");
printf(" --cfg-negative-prompt PROMPT\n");
printf(" negative prompt to use for guidance. (default: empty)\n");
printf(" --cfg-negative-prompt-file FNAME\n");