Merge branch 'ggerganov:master' into master

sealad886 · May 22, 2024 · e828560 · e828560
2 parents cdf3bc1 + cd93a28
commit e828560
Show file tree

Hide file tree

Showing 47 changed files with 2,217 additions and 1,423 deletions.
diff --git a/.github/workflows/zig-build.yml b/.github/workflows/zig-build.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -505,6 +505,12 @@ if (LLAMA_VULKAN)
 
         add_compile_definitions(GGML_USE_VULKAN)
 
+        # Workaround to the "can't dereference invalidated vector iterator" bug in clang-cl debug build
+        # Posssibly relevant: https://stackoverflow.com/questions/74748276/visual-studio-no-displays-the-correct-length-of-stdvector
+        if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            add_compile_definitions(_ITERATOR_DEBUG_LEVEL=0)
+        endif()
+
         if (LLAMA_VULKAN_CHECK_RESULTS)
             add_compile_definitions(GGML_VULKAN_CHECK_RESULTS)
         endif()

diff --git a/build.zig b/build.zig