From: k.h.lai <redacted>
Date: Wed, 22 May 2024 12:53:21 +0000 (+0800)
Subject: vulkan: add workaround for iterator boundary check to fix clang-cl debug build (... 
X-Git-Tag: upstream/0.0.4488~1521
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=fcda1128bc5f8eb7e1811708fe9d9867b9aec815;p=pkg%2Fggml%2Fsources%2Fllama.cpp

vulkan: add workaround for iterator boundary check to fix clang-cl debug build (#7426)
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cc60039..c09d834f 100644
--- 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()