fixed glm4 sop, lower regex max stacks (+2 squashed commit)

Squashed commit:

[47e39ae5d] lower regex max stack again

[0a32ca232] lower regex max stack again
This commit is contained in:
Concedo 2025-08-06 14:14:40 +08:00
parent 34487d3c02
commit 61c19fea56
2 changed files with 2 additions and 2 deletions

View file

@ -61,7 +61,7 @@ add_compile_definitions(LOG_DISABLE_LOGS)
add_compile_definitions(GGML_USE_CPU) add_compile_definitions(GGML_USE_CPU)
add_compile_definitions(GGML_USE_CPU_REPACK) add_compile_definitions(GGML_USE_CPU_REPACK)
add_compile_definitions(NOMINMAX) add_compile_definitions(NOMINMAX)
add_compile_definitions(_REGEX_MAX_STACK_COUNT=32000) add_compile_definitions(_REGEX_MAX_STACK_COUNT=5000)
if (GGML_HIP_FORCE_ROCWMMA_FATTN_GFX12) if (GGML_HIP_FORCE_ROCWMMA_FATTN_GFX12)
add_compile_definitions(GGML_HIP_ROCWMMA_FATTN_GFX12) add_compile_definitions(GGML_HIP_ROCWMMA_FATTN_GFX12)

View file

@ -352,7 +352,7 @@ void print_tok_vec(std::vector<float> &embd)
{ {
fileformatmeta->model_architecture = GGUFArch::ARCH_RWKV; fileformatmeta->model_architecture = GGUFArch::ARCH_RWKV;
} }
else if(modelarch=="glm4") else if(modelarch=="glm4" || modelarch=="glm4moe")
{ {
fileformatmeta->model_architecture = GGUFArch::ARCH_GLM4; fileformatmeta->model_architecture = GGUFArch::ARCH_GLM4;
} }