From: kononnable Date: Wed, 17 Jun 2026 07:43:45 +0000 (+0200) Subject: ci: fix vulkan docker images (#24595) X-Git-Tag: upstream/0.0.10438~758 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=d5376cf5d711b9be87232b25fea82fe62d607400;p=pkg%2Fggml%2Fsources%2Fllama.cpp ci: fix vulkan docker images (#24595) * Update vulkan-shaders-gen.cpp * Update vulkan-shaders-gen.cpp add comment describing code change intention * Update vulkan-shaders-gen.cpp fix potential UB --- diff --git a/ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp b/ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp index 27d088e0e..ca6b44431 100644 --- a/ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp +++ b/ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp @@ -407,7 +407,7 @@ std::map merge_maps(const std::map> compiles; +static std::deque> compiles; void string_to_spv(std::string name, const std::string& source, const std::map& defines, bool fp16 = true, bool coopmat = false, bool coopmat2 = false, bool f16acc = false, const std::string& suffix = "") { name = name + (f16acc ? "_f16acc" : "") + (coopmat ? "_cm1" : "") + (coopmat2 ? "_cm2" : (fp16 ? "" : "_fp32")) + suffix; std::string out_path = join_paths(output_dir, name + ".spv"); @@ -426,6 +426,11 @@ void string_to_spv(std::string name, const std::string& source, const std::map