From feadeadf5026c309e603835787f465d30a7e8f24 Mon Sep 17 00:00:00 2001 From: Eve <139727413+netrunnereve@users.noreply.github.com> Date: Thu, 21 Nov 2024 12:19:53 -0500 Subject: [PATCH] fix --no-clean --- ggml/src/ggml-vulkan/CMakeLists.txt | 2 +- ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ggml/src/ggml-vulkan/CMakeLists.txt b/ggml/src/ggml-vulkan/CMakeLists.txt index 1e85dd15b..d15ce97f2 100644 --- a/ggml/src/ggml-vulkan/CMakeLists.txt +++ b/ggml/src/ggml-vulkan/CMakeLists.txt @@ -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" diff --git a/ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp b/ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp index 6bbe8e96e..8ffc041ea 100644 --- a/ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp +++ b/ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp @@ -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 type_names = { "f32", @@ -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()); } } @@ -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)) {