From 49535fdfedd675cf61517a00cd19b8ef6c0c3aa3 Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Mon, 20 Oct 2025 10:08:39 +0800 Subject: [PATCH] rename define --- otherarch/sdcpp/model.cpp | 10 +++++----- otherarch/sdcpp/sdtype_adapter.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/otherarch/sdcpp/model.cpp b/otherarch/sdcpp/model.cpp index 3d04cf7f1..530866522 100644 --- a/otherarch/sdcpp/model.cpp +++ b/otherarch/sdcpp/model.cpp @@ -17,7 +17,7 @@ #include "model.h" #include "stable-diffusion.h" #include "util.h" -#ifndef KCPP_BAKE_SD_VOCAB +#ifndef KCPP_NO_BAKE_SD_VOCAB #include "vocab.hpp" #include "vocab_qwen.hpp" #include "vocab_umt5.hpp" @@ -2056,7 +2056,7 @@ void ModelLoader::set_wtype_override(ggml_type wtype, std::string prefix) { } std::string ModelLoader::load_merges() { -#ifndef KCPP_BAKE_SD_VOCAB +#ifndef KCPP_NO_BAKE_SD_VOCAB std::string merges_utf8_str(reinterpret_cast(merges_utf8_c_str), sizeof(merges_utf8_c_str)); return merges_utf8_str; #else @@ -2065,7 +2065,7 @@ std::string ModelLoader::load_merges() { } std::string ModelLoader::load_qwen2_merges() { -#ifndef KCPP_BAKE_SD_VOCAB +#ifndef KCPP_NO_BAKE_SD_VOCAB std::string merges_utf8_str(reinterpret_cast(qwen2_merges_utf8_c_str), sizeof(qwen2_merges_utf8_c_str)); return merges_utf8_str; #else @@ -2074,7 +2074,7 @@ std::string ModelLoader::load_qwen2_merges() { } std::string ModelLoader::load_t5_tokenizer_json() { -#ifndef KCPP_BAKE_SD_VOCAB +#ifndef KCPP_NO_BAKE_SD_VOCAB std::string json_str(reinterpret_cast(t5_tokenizer_json_str), sizeof(t5_tokenizer_json_str)); return json_str; #else @@ -2083,7 +2083,7 @@ std::string ModelLoader::load_t5_tokenizer_json() { } std::string ModelLoader::load_umt5_tokenizer_json() { -#ifndef KCPP_BAKE_SD_VOCAB +#ifndef KCPP_NO_BAKE_SD_VOCAB std::string json_str(reinterpret_cast(umt5_tokenizer_json_str), sizeof(umt5_tokenizer_json_str)); return json_str; #else diff --git a/otherarch/sdcpp/sdtype_adapter.cpp b/otherarch/sdcpp/sdtype_adapter.cpp index a4a38b485..3327f2cc0 100644 --- a/otherarch/sdcpp/sdtype_adapter.cpp +++ b/otherarch/sdcpp/sdtype_adapter.cpp @@ -13,7 +13,7 @@ #include #include -#define KCPP_BAKE_SD_VOCAB +#define KCPP_NO_BAKE_SD_VOCAB #include "model_adapter.h"