8000 cmake: remove shader-gen step-targets from ggml-vulkan by bandoti · Pull Request #14226 · ggml-org/llama.cpp · GitHub
[go: up one dir, main page]
Skip to content

cmake: remove shader-gen step-targets from ggml-vulkan #14226

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
merged 2 commits into from
Jun 17, 2025
Merged

cmake: remove shader-gen step-targets from ggml-vulkan #14226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90ccac2
Remove step-targets from vulkan-shaders-gen
bandoti Jun 16, 2025
0dc8221
Unset DESTDIR when building vulkan-shaders-gen
bandoti Jun 17, 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
12 changes: 8 additions & 4 deletions ggml/src/ggml-vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,15 @@ if (Vulkan_FOUND)
${VULKAN_SHADER_GEN_CMAKE_ARGS}

BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
INSTALL_COMMAND ${CMAKE_COMMAND} --install . --config $<CONFIG>

# NOTE: When DESTDIR is set using Makefile generators and
# "make install" triggers the build step, vulkan-shaders-gen
# would be installed into the DESTDIR prefix, so it is unset
# to ensure that does not happen.

INSTALL_COMMAND ${CMAKE_COMMAND} -E env --unset=DESTDIR
${CMAKE_COMMAND} --install . --config $<CONFIG>
)
ExternalProject_Add_StepTargets(vulkan-shaders-gen build install)

set (_ggml_vk_host_suffix $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_NAME},Windows>,.exe,>)
set (_ggml_vk_genshaders_dir "${CMAKE_BINARY_DIR}/$<CONFIG>")
Expand All @@ -172,8 +178,6 @@ if (Vulkan_FOUND)

DEPENDS ${_ggml_vk_shader_files}
vulkan-shaders-gen
vulkan-shaders-gen-build
vulkan-shaders-gen-install

COMMENT "Generate vulkan shaders"
)
Expand Down
Loading
0