mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-05-19 08:00:25 +00:00
fixed auto rope scaling (+1 squashed commits)
Squashed commits: [b1767874] wip
This commit is contained in:
parent
0bf75b05dc
commit
7fb809b94b
5 changed files with 42 additions and 28 deletions
33
expose.cpp
33
expose.cpp
|
|
@ -27,6 +27,7 @@ extern "C"
|
|||
|
||||
//return val: 0=fail, 1=(original ggml, alpaca), 2=(ggmf), 3=(ggjt)
|
||||
static FileFormat file_format = FileFormat::BADFORMAT;
|
||||
static FileFormatExtraMeta file_format_meta;
|
||||
|
||||
bool load_model(const load_model_inputs inputs)
|
||||
{
|
||||
|
|
@ -36,11 +37,9 @@ extern "C"
|
|||
|
||||
int forceversion = inputs.forceversion;
|
||||
|
||||
if(forceversion==0)
|
||||
{
|
||||
file_format = check_file_format(model.c_str());
|
||||
}
|
||||
else
|
||||
file_format = check_file_format(model.c_str(),&file_format_meta);
|
||||
|
||||
if(forceversion!=0)
|
||||
{
|
||||
printf("\nWARNING: FILE FORMAT FORCED TO VER %d\nIf incorrect, loading may fail or crash.\n",forceversion);
|
||||
file_format = (FileFormat)forceversion;
|
||||
|
|
@ -64,7 +63,7 @@ extern "C"
|
|||
if(file_format==FileFormat::GPTJ_1 || file_format==FileFormat::GPTJ_2 || file_format==FileFormat::GPTJ_3 || file_format==FileFormat::GPTJ_4 || file_format==FileFormat::GPTJ_5)
|
||||
{
|
||||
printf("\n---\nIdentified as GPT-J model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
ModelLoadResult lr = gpttype_load_model(inputs, file_format);
|
||||
ModelLoadResult lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
if (lr == ModelLoadResult::RETRY_LOAD)
|
||||
{
|
||||
if(file_format==FileFormat::GPTJ_1)
|
||||
|
|
@ -73,14 +72,14 @@ extern "C"
|
|||
//otherwise if we tried 3 first, then try 2
|
||||
file_format = FileFormat::GPTJ_4;
|
||||
printf("\n---\nRetrying as GPT-J model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
lr = gpttype_load_model(inputs, file_format);
|
||||
lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
}
|
||||
|
||||
if (lr == ModelLoadResult::RETRY_LOAD)
|
||||
{
|
||||
file_format = FileFormat::GPTJ_3;
|
||||
printf("\n---\nRetrying as GPT-J model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
lr = gpttype_load_model(inputs, file_format);
|
||||
lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
}
|
||||
|
||||
//lastly try format 2
|
||||
|
|
@ -88,7 +87,7 @@ extern "C"
|
|||
{
|
||||
file_format = FileFormat::GPTJ_2;
|
||||
printf("\n---\nRetrying as GPT-J model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
lr = gpttype_load_model(inputs, file_format);
|
||||
lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -104,18 +103,18 @@ extern "C"
|
|||
else if(file_format==FileFormat::GPT2_1||file_format==FileFormat::GPT2_2||file_format==FileFormat::GPT2_3||file_format==FileFormat::GPT2_4)
|
||||
{
|
||||
printf("\n---\nIdentified as GPT-2 model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
ModelLoadResult lr = gpttype_load_model(inputs, file_format);
|
||||
ModelLoadResult lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
if (lr == ModelLoadResult::RETRY_LOAD)
|
||||
{
|
||||
file_format = FileFormat::GPT2_3;
|
||||
printf("\n---\nRetrying as GPT-2 model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
lr = gpttype_load_model(inputs, file_format);
|
||||
lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
}
|
||||
if (lr == ModelLoadResult::RETRY_LOAD)
|
||||
{
|
||||
file_format = FileFormat::GPT2_2;
|
||||
printf("\n---\nRetrying as GPT-2 model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
lr = gpttype_load_model(inputs, file_format);
|
||||
lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
}
|
||||
if (lr == ModelLoadResult::FAIL || lr == ModelLoadResult::RETRY_LOAD)
|
||||
{
|
||||
|
|
@ -129,27 +128,27 @@ extern "C"
|
|||
else if(file_format==FileFormat::NEOX_1 || file_format==FileFormat::NEOX_2 || file_format==FileFormat::NEOX_3 || file_format==FileFormat::NEOX_4 || file_format==FileFormat::NEOX_5 || file_format==FileFormat::NEOX_6 || file_format==FileFormat::NEOX_7)
|
||||
{
|
||||
printf("\n---\nIdentified as GPT-NEO-X model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
ModelLoadResult lr = gpttype_load_model(inputs, file_format);
|
||||
ModelLoadResult lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
if (lr == ModelLoadResult::RETRY_LOAD)
|
||||
{
|
||||
if(file_format==FileFormat::NEOX_2)
|
||||
{
|
||||
file_format = FileFormat::NEOX_3;
|
||||
printf("\n---\nRetrying as GPT-NEO-X model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
lr = gpttype_load_model(inputs, file_format);
|
||||
lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
}
|
||||
else
|
||||
{
|
||||
file_format = FileFormat::NEOX_5;
|
||||
printf("\n---\nRetrying as GPT-NEO-X model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
lr = gpttype_load_model(inputs, file_format);
|
||||
lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
}
|
||||
}
|
||||
if (lr == ModelLoadResult::RETRY_LOAD)
|
||||
{
|
||||
file_format = FileFormat::NEOX_1;
|
||||
printf("\n---\nRetrying as GPT-NEO-X model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
lr = gpttype_load_model(inputs, file_format);
|
||||
lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
}
|
||||
if (lr == ModelLoadResult::FAIL || lr == ModelLoadResult::RETRY_LOAD)
|
||||
{
|
||||
|
|
@ -178,7 +177,7 @@ extern "C"
|
|||
{
|
||||
printf("\n---\nIdentified as LLAMA model: (ver %d)\nAttempting to Load...\n---\n", file_format);
|
||||
}
|
||||
ModelLoadResult lr = gpttype_load_model(inputs, file_format);
|
||||
ModelLoadResult lr = gpttype_load_model(inputs, file_format, file_format_meta);
|
||||
if (lr == ModelLoadResult::FAIL || lr == ModelLoadResult::RETRY_LOAD)
|
||||
{
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue