Skip to content

fix: use the current build config for vulkan-shaders-gen #13595

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
May 17, 2025
Merged

fix: use the current build config for vulkan-shaders-gen #13595

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e58704d
fix: use the current build config for `vulkan-shaders-gen`
giladgd May 17, 2025
fac930a
fix: only pass a valid build type to `--config`
giladgd May 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
7 changes: 6 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 @@ -54,6 +54,11 @@ if (Vulkan_FOUND)
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
)

set(VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS "")
if (CMAKE_BUILD_TYPE AND CMAKE_BUILD_TYPE MATCHES "Debug|Release|MinSizeRel|RelWithDebInfo")
list(APPEND VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS --config=${CMAKE_BUILD_TYPE})
endif()

# Test all shader extensions
test_shader_extension_support(
"GL_KHR_cooperative_matrix"
Expand Down Expand Up @@ -149,7 +154,7 @@ if (Vulkan_FOUND)
vulkan-shaders-gen
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders
CMAKE_ARGS ${VULKAN_SHADER_GEN_CMAKE_ARGS}
BUILD_COMMAND ${CMAKE_COMMAND} --build .
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of passing these arguments as a build switch, I am wondering if we should instead add more flags to CMAKE_ARGS to control these things at generation time. For example:

# Pass additional important variables
if(CMAKE_CONFIGURATION_TYPES)
    # Multi-configuration generator case (Visual Studio, Xcode)
    list(APPEND VULKAN_SHADER_GEN_CMAKE_ARGS
        -DCMAKE_CONFIGURATION_TYPES="${CMAKE_CONFIGURATION_TYPES}")
else()
    # Single-configuration generator case (Makefile, Ninja)
    if(CMAKE_BUILD_TYPE)
        list(APPEND VULKAN_SHADER_GEN_CMAKE_ARGS
            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
    endif()
endif()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doing that way my first try, but it didn't seem to affect the output folder.
With the current build type being Release and a -DCMAKE_BUILD_TYPE=Release flag in VULKAN_SHADER_GEN_CMAKE_ARGS, the output was still being put in a Debug directory.

BTW do we use the vulkan-shaders-gen binary after using it once here?
If we don't need it afterwards, it may be a good idea to remove it later from the output directory.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, well if you tried it already and the current change is working then I'm happy to approve the change as-is.

We want to keep that binary in there in case one wants to run it afterward manually I think. If it's not impeding anything to keep it around it should be fine.

INSTALL_COMMAND ${CMAKE_COMMAND} --install .
INSTALL_DIR ${CMAKE_BINARY_DIR}
)
Expand Down
Loading