Skip to content

Merge wave-14 CI fixes from eliza/token-trie-sampler #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lalalune merged 3 commits into from
May 19, 2026
+7 −2
Merged

Merge wave-14 CI fixes from eliza/token-trie-sampler #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c1aa80
fix(adapter): cast ab_map.size() to uint32_t in get_n_nodes()
lalalune May 19, 2026
c95a925
fix(debug): widen src1_str buffer to 256 to avoid format-truncation
lalalune May 19, 2026
b12f29b
fix(vulkan): undef windows.h MemoryBarrier macro to fix MSVC C2146
lalalune May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ bool common_debug_cb_eval(struct ggml_tensor * t, bool ask, void * user_data) {
}
}

char src1_str[128] = { 0 };
char src1_str[256] = { 0 };
if (src1) {
snprintf(src1_str, sizeof(src1_str), "%s{%s}", src1->name, common_ggml_ne_string(src1).c_str());
}
Expand Down
5 changes: 5 additions & 0 deletions ggml/src/ggml-vulkan/ggml-vulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ DispatchLoaderDynamic & ggml_vk_default_dispatcher();
#if defined(_MSC_VER)
# define NOMINMAX 1
# include <windows.h>
// windows.h (winnt.h) defines MemoryBarrier as a macro that expands to an
// intrinsic call (e.g. __faststorefence()). That collides with vk::MemoryBarrier
// and causes MSVC C2146 syntax errors. Undefine it; nothing in this TU needs
// the Win32 MemoryBarrier intrinsic.
# undef MemoryBarrier
# define YIELD() YieldProcessor()
#elif defined(__clang__) || defined(__GNUC__)
# if defined(__x86_64__) ||defined(__i386__)
Expand Down
2 changes: 1 addition & 1 deletion src/llama-adapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ struct llama_adapter_lora {
llama_adapter_lora_weight * get_weight(ggml_tensor * w);

uint32_t get_n_nodes() const {
return ab_map.size() * 6u; // a, b, scale, add, 2 x mul_mat
return static_cast<uint32_t>(ab_map.size()) * 6u; // a, b, scale, add, 2 x mul_mat
}
};

Expand Down
Loading