From 439240f28470f292969bca27102a5f7df2a33578 Mon Sep 17 00:00:00 2001 From: Kamil Date: Wed, 11 Nov 2026 19:33:33 +0800 Subject: [PATCH] Fix BUILD_GEMMA_DLL CMake build, install paths, and C/C# bindings - Link nlohmann_json::nlohmann_json into gemma_shared in CMakeLists.txt to match libgemma (required by deepseek/dsv4_tokenizer.cc in SOURCES). - Fix BUILD_GEMMA_DLL install paths to point to gemma/bindings/c_api.h, gemma/bindings/context.h, and gemma/bindings/GemmaInterop.cs. - Add CMAKE_POLICY_VERSION_MINIMUM='3.5' to the windows-dll CMake preset to match the windows preset for sentencepiece compatibility. - Declare GemmaSetMaxGeneratedTokens and GemmaSetPrefillTbatchSize in gemma/bindings/c_api.h to match c_api.cc and GemmaInterop.cs. - Guard against null tokenizer_path/weights_path in GemmaContext::Create and remove duplicate threading_args.spin assignment. - Update the GemmaCreate DllImport signature in GemmaInterop.cs to match the 3-parameter C API and constructor call site. --- CMakeLists.txt | 5 +++-- CMakePresets.json | 3 ++- gemma/bindings/GemmaInterop.cs | 2 -- gemma/bindings/c_api.h | 2 ++ gemma/bindings/context.cc | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3d2287c..08210dc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,6 +307,7 @@ target_link_libraries(gemma_shared PRIVATE $ $ $ + nlohmann_json::nlohmann_json ) target_include_directories(gemma_shared PUBLIC ${sentencepiece_SOURCE_DIR}) target_compile_definitions(gemma_shared @@ -324,8 +325,8 @@ if(GEMMA_ONEDNN_MATMUL) target_link_libraries(gemma_shared PRIVATE dnnl) endif() install(TARGETS gemma_shared DESTINATION lib) -install(FILES gemma/c_api.h DESTINATION include/gemma) -install(FILES gemma/GemmaInterop.cs DESTINATION include/gemma) +install(FILES gemma/bindings/c_api.h gemma/bindings/context.h DESTINATION include/gemma/bindings) +install(FILES gemma/bindings/GemmaInterop.cs DESTINATION include/gemma/bindings) endif() # Executable Target diff --git a/CMakePresets.json b/CMakePresets.json index 38d2141c..f837f8c2 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -50,7 +50,8 @@ "cacheVariables": { "BUILD_SHARED_LIBS": "OFF", "CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS": "ON", - "BUILD_GEMMA_DLL": "ON" + "BUILD_GEMMA_DLL": "ON", + "CMAKE_POLICY_VERSION_MINIMUM": "3.5" } } ], diff --git a/gemma/bindings/GemmaInterop.cs b/gemma/bindings/GemmaInterop.cs index 0fb3ee82..030fc5e9 100644 --- a/gemma/bindings/GemmaInterop.cs +++ b/gemma/bindings/GemmaInterop.cs @@ -47,9 +47,7 @@ static Gemma() [DllImport("gemma", CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr GemmaCreate( [MarshalAs(UnmanagedType.LPUTF8Str)] string tokenizerPath, - [MarshalAs(UnmanagedType.LPUTF8Str)] string modelType, [MarshalAs(UnmanagedType.LPUTF8Str)] string weightsPath, - [MarshalAs(UnmanagedType.LPUTF8Str)] string weightType, int maxGeneratedTokens); [DllImport("gemma", CallingConvention = CallingConvention.Cdecl)] diff --git a/gemma/bindings/c_api.h b/gemma/bindings/c_api.h index 6d369b83..2990bcb9 100644 --- a/gemma/bindings/c_api.h +++ b/gemma/bindings/c_api.h @@ -61,10 +61,12 @@ GEMMA_API void GemmaSetLogCallback(GemmaContext* ctx, GemmaLogCallback callback, void* user_data); // Configuration functions +GEMMA_API void GemmaSetMaxGeneratedTokens(GemmaContext* ctx, int value); GEMMA_API void GemmaSetMultiturn(GemmaContext* ctx, int value); GEMMA_API void GemmaSetTemperature(GemmaContext* ctx, float value); GEMMA_API void GemmaSetTopK(GemmaContext* ctx, int value); GEMMA_API void GemmaSetDeterministic(GemmaContext* ctx, int value); +GEMMA_API void GemmaSetPrefillTbatchSize(GemmaContext* ctx, int value); GEMMA_API void GemmaResetConversation(GemmaContext* ctx); // Conversation management functions (renamed) diff --git a/gemma/bindings/context.cc b/gemma/bindings/context.cc index e8085e7d..55d415ac 100644 --- a/gemma/bindings/context.cc +++ b/gemma/bindings/context.cc @@ -71,9 +71,9 @@ GemmaContext* GemmaContext::Create(const char* tokenizer_path, ThreadingArgs threading_args; threading_args.spin = gcpp::Tristate::kFalse; - - threading_args.spin = gcpp::Tristate::kFalse; - GemmaArgs args(LoaderArgs(tokenizer_path, weights_path), threading_args); + GemmaArgs args(LoaderArgs(tokenizer_path ? tokenizer_path : "", + weights_path ? weights_path : ""), + threading_args); // Initialize cached args LogDebug("Initializing inference args");