Skip to content
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

fix: Vulkan shader gen binary path when Cross-compiling #11096

Merged
merged 4 commits into from
Jan 8, 2025
+5 −1
Merged

fix: Vulkan shader gen binary path when Cross-compiling #11096

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9224cb
fix: Vulkan shader gen binary path when cross compiling
ag2s20150909 Jan 6, 2025
19e9ca1
Update CMakeLists.txt
ag2s20150909 Jan 6, 2025
bb936ea
Update CMakeLists.txt
ag2s20150909 Jan 6, 2025
86319f6
Update CMakeLists.txt
ag2s20150909 Jan 7, 2025
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
6 changes: 5 additions & 1 deletion ggml/src/ggml-vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,15 @@ if (Vulkan_FOUND)

file(GLOB _ggml_vk_shader_deps "${_ggml_vk_input_dir}/*.comp")

if (CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME)
ag2s20150909 marked this conversation as resolved.
Show resolved Hide resolved
set(_ggml_vk_genshaders_cmd "$<TARGET_FILE_DIR:vulkan-shaders-gen>/${_ggml_vk_genshaders_cmd}")
endif ()

add_custom_command(
OUTPUT ${_ggml_vk_header}
${_ggml_vk_source}

COMMAND "$<TARGET_FILE_DIR:vulkan-shaders-gen>/${_ggml_vk_genshaders_cmd}"
COMMAND ${_ggml_vk_genshaders_cmd}
--glslc ${Vulkan_GLSLC_EXECUTABLE}
--input-dir ${_ggml_vk_input_dir}
--output-dir ${_ggml_vk_output_dir}
Expand Down
Loading