Address bug in C API and C# API

CMakeLists.txt

@@ -5,12 +5,8 @@ cmake_minimum_required(VERSION 3.26)
 include(FetchContent)
 include(CMakeDependentOption)
 project(Generators LANGUAGES C CXX)
-option(USE_CUDA "Build with CUDA support" ON)
-option(USE_TOKENIZER "Build with Tokenizer support" ON)
-option(ENABLE_TESTS "Enable tests" ON)
-option(ENABLE_PYTHON "Enable the Python build" ON)
-cmake_dependent_option(BUILD_WHEEL "Build the python wheel" ON "ENABLE_PYTHON" OFF)
-
+# All Options should be defined in cmake/options.cmake
+include(cmake/options.cmake)
 include(cmake/external/onnxruntime_external_deps.cmake)
 # Checking if CUDA is supported
 include(CheckLanguage)
@@ -33,7 +29,6 @@ set(GENERATORS_ROOT ${PROJECT_SOURCE_DIR}/src)
 set(MODELS_ROOT ${PROJECT_SOURCE_DIR}/src/models)
 set(ORT_HEADER_DIR ${CMAKE_SOURCE_DIR}/ort/include)
 set(ORT_LIB_DIR ${CMAKE_SOURCE_DIR}/ort/lib)
-
 # CUDA Being enabled will make it not a debug build without this option, so all of the C++ headers will complain
 # about a mismatch with the actual debug headers and it'll fail to link. I don't know why this happens, or if this is the best fix.
 if(USE_CUDA AND CMAKE_CUDA_COMPILER AND CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -116,11 +111,23 @@ if(ENABLE_TESTS)
   message("------------------Enabling tests------------------")
 endif()
 
+set(WHEEL_FILES_DIR "${CMAKE_BINARY_DIR}/wheel")
+
 if(ENABLE_PYTHON)
   add_subdirectory("${CMAKE_SOURCE_DIR}/src/python")
   message("------------------Enabling Python Wheel------------------")
 endif()
 
+file(GLOB onnxruntime_libs "${ORT_LIB_DIR}/${ONNXRUNTIME_FILES}")
+add_custom_command(
+  TARGET onnxruntime-genai-static POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${onnxruntime_libs} ${WHEEL_FILES_DIR}/${TARGET_NAME}/
+)
+add_custom_command(
+  TARGET onnxruntime-genai-static POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${onnxruntime_libs} ${DLL_FILE} $<TARGET_FILE_DIR:onnxruntime-genai>
+)
+
 target_link_directories(onnxruntime-genai PRIVATE ${ORT_LIB_DIR})
 target_link_libraries(onnxruntime-genai PRIVATE ${ONNXRUNTIME_LIB})
 
@@ -155,13 +162,10 @@ endforeach()
 if(USE_TOKENIZER)
   add_compile_definitions(USE_TOKENIZER=1)
   target_include_directories(onnxruntime-genai PRIVATE ${TOKENIZER_ROOT})
-  target_include_directories(onnxruntime-genai-static PRIVATE ${TOKENIZER_ROOT})
+  target_include_directories(onnxruntime-genai-static PUBLIC ${TOKENIZER_ROOT})
   target_link_libraries(onnxruntime-genai PRIVATE tokenizer)
-  target_link_libraries(onnxruntime-genai-static PRIVATE tokenizer)
+  target_link_libraries(onnxruntime-genai-static PUBLIC tokenizer)
 endif()
 
 # Have visual studio put all files into one single folder vs the default split of header files into a separate folder
 source_group(TREE ${GENERATORS_ROOT} FILES ${generator_srcs})
-
-
-

build.py

@@ -159,6 +159,7 @@ def build(
         csharp_build_command = [dotnet, "build", ".", "-c", "Release"]
         run_subprocess(csharp_build_command, cwd=os.path.join("src", "csharp")).check_returncode()
         run_subprocess(csharp_build_command, cwd=os.path.join("test", "csharp")).check_returncode()
+        run_subprocess([dotnet, "test", "-c", "Release"], cwd=os.path.join("test", "csharp")).check_returncode()
 
 
 if __name__ == "__main__":

cmake/options.cmake

@@ -2,7 +2,7 @@ include(CMakeDependentOption)
 
 option(USE_CUDA "Build with CUDA support" ON)
 option(USE_TOKENIZER "Build with Tokenizer support" ON)
-option(ENABLE_PYTHON "Enable python buildings" ON)
+option(ENABLE_PYTHON "Build the Python API." ON)
 option(ENABLE_TESTS "Enable tests" ON)
 
 cmake_dependent_option(BUILD_WHEEL "Build the python wheel" ON "ENABLE_PYTHON" OFF)

src/csharp/Generator.cs

@@ -34,13 +34,13 @@ public int[] GetSequence(int index)
         {
             IntPtr nullPtr = IntPtr.Zero;
             UIntPtr sequenceLength = UIntPtr.Zero;
-            Result.VerifySuccess(NativeMethods.OgaGenerator_GetSequence(_generatorHandle, index, out nullPtr, out sequenceLength));
-            int[] sequence = new int[sequenceLength.ToUInt32()];
+            Result.VerifySuccess(NativeMethods.OgaGenerator_GetSequence(_generatorHandle, index, nullPtr, out sequenceLength));
+            int[] sequence = new int[sequenceLength.ToUInt64()];
             GCHandle handle = GCHandle.Alloc(sequence, GCHandleType.Pinned);
             try
             {
                 IntPtr sequencePtr = handle.AddrOfPinnedObject();
-                Result.VerifySuccess(NativeMethods.OgaGenerator_GetSequence(_generatorHandle, index, out sequencePtr, out sequenceLength));
+                Result.VerifySuccess(NativeMethods.OgaGenerator_GetSequence(_generatorHandle, index, sequencePtr, out sequenceLength));
             }
             finally
             {

src/csharp/NativeMethods.cs

@@ -65,7 +65,7 @@ public static extern IntPtr OgaCreateGenerator(IntPtr /* OgaModel* */ model,
         [DllImport(NativeLib.DllName, CallingConvention = CallingConvention.Winapi)]
         public static extern IntPtr OgaGenerator_GetSequence(IntPtr /* OgaGenerator* */ generator,
                                                              int index,
-                                                             out IntPtr /* int32_t* */ tokens,
+                                                             IntPtr /* int32_t* */ tokens,
                                                              out UIntPtr /* size_t* */ tokensCount);
     }
 }

src/ort_genai_c.cpp

@@ -9,13 +9,15 @@
 #include "generators.h"
 #include "models/model.h"
 #include "search.h"
+#include <iostream>
 
 namespace Generators {
 
 std::unique_ptr<OrtEnv> g_ort_env;
 
 OrtEnv& GetOrtEnv() {
   if (!g_ort_env) {
+    Ort::InitApi();
     g_ort_env = OrtEnv::Create();
   }
   return *g_ort_env;

test/csharp/GeneratorTests.cs

@@ -34,7 +34,7 @@ public void TestGreedySearch()
             var expectedOutput = new int[] { 0, 0, 0, 52, 204, 204, 204, 204, 204, 204,
                                              0, 0, 195, 731, 731, 114, 114, 114, 114, 114 };
 
-            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "testdata", "hf_internal_testing", "tiny-random-gpt2-fp32");
+            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "testdata", "hf-internal-testing", "tiny-random-gpt2-fp32");
             using (var model = new Model(modelPath, DeviceType.CPU))
             {
                 Assert.NotNull(model);