Skip to content

Fix --no-clean for vulkan-shaders-gen #10445

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

Closed
wants to merge 5 commits into from
Closed

Fix --no-clean for vulkan-shaders-gen #10445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c3543a
64 thread experiment
netrunnereve Nov 16, 2024
be5295b
test
netrunnereve Nov 21, 2024
ac3973b
revert and update
netrunnereve Nov 21, 2024
0ae6edb
Merge https://github.com/ggerganov/llama.cpp into vulkan
netrunnereve Nov 21, 2024
feadead
fix --no-clean
netrunnereve Nov 21, 2024
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 ggml/src/ggml-vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if (Vulkan_FOUND)
--output-dir ${_ggml_vk_output_dir}
--target-hpp ${_ggml_vk_header}
--target-cpp ${_ggml_vk_source}
--no-clean
--no-clean true

DEPENDS ${_ggml_vk_shader_deps}
COMMENT "Generate vulkan shaders"
Expand Down
6 changes: 3 additions & 3 deletions ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ std::string input_dir = "vulkan-shaders";
std::string output_dir = "/tmp";
std::string target_hpp = "ggml-vulkan-shaders.hpp";
std::string target_cpp = "ggml-vulkan-shaders.cpp";
bool no_clean = false;
std::string no_clean = "FALSE";

const std::vector<std::string> type_names = {
"f32",
Expand Down Expand Up @@ -463,7 +463,7 @@ void write_output_files() {
}
fprintf(src, "\n};\n\n");

if (!no_clean) {
if (no_clean != "TRUE") {
std::remove(path.c_str());
}
}
Expand Down Expand Up @@ -496,7 +496,7 @@ int main(int argc, char** argv) {
target_cpp = args["--target-cpp"]; // Path to generated cpp file
}
if (args.find("--no-clean") != args.end()) {
no_clean = true; // Keep temporary SPIR-V files in output-dir after build
no_clean = to_uppercase(args["--no-clean"]); // Keep temporary SPIR-V files in output-dir after build
}

if (!directory_exists(input_dir)) {
Expand Down
Loading