diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5913c5b03..68e3b7dcb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -356,9 +356,9 @@ jobs: id: depends run: | sudo wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key add - - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list + sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list sudo apt-get update -y - sudo apt-get install -y build-essential vulkan-sdk + sudo apt-get install -y build-essential vulkan-sdk - name: Build id: cmake_build diff --git a/CMakeLists.txt b/CMakeLists.txt index 81184822e..9447d4fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -553,33 +553,33 @@ if (LLAMA_VULKAN) set (_llama_vk_genshaders_cmd ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ggml_vk_generate_shaders.py) set (_llama_vk_header ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp) - set (_llama_vk_source ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp) - set (_llama_vk_input_dir ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders) - set (_llama_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv) + set (_llama_vk_source ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp) + set (_llama_vk_input_dir ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders) + set (_llama_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv) file(GLOB _llama_vk_shader_deps "${_llama_vk_input_dir}/*.comp") add_custom_command( - OUTPUT ${_llama_vk_header} - ${_llama_vk_source} + OUTPUT ${_llama_vk_header} + ${_llama_vk_source} COMMAND ${_llama_vk_genshaders_cmd} - --glslc ${Vulkan_GLSLC_EXECUTABLE} - --input-dir ${_llama_vk_input_dir} - --output-dir ${_llama_vk_output_dir} - --target-hpp ${_llama_vk_header} - --target-cpp ${_llama_vk_source} - --no-clean + --glslc ${Vulkan_GLSLC_EXECUTABLE} + --input-dir ${_llama_vk_input_dir} + --output-dir ${_llama_vk_output_dir} + --target-hpp ${_llama_vk_header} + --target-cpp ${_llama_vk_source} + --no-clean - DEPENDS ${_llama_vk_shader_deps} - COMMENT "Generate vulkan shaders" - ) + DEPENDS ${_llama_vk_shader_deps} + COMMENT "Generate vulkan shaders" + ) set(GGML_HEADERS_VULKAN ggml-vulkan.h ${_llama_vk_header}) set(GGML_SOURCES_VULKAN ggml-vulkan.cpp ${_llama_vk_source}) set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} Vulkan::Vulkan) - set(LLAMA_EXTRA_INCLUDES ${LLAMA_EXTRA_INCLUDES} ${CMAKE_BINARY_DIR}) + set(LLAMA_EXTRA_INCLUDES ${LLAMA_EXTRA_INCLUDES} ${CMAKE_BINARY_DIR}) else() message(WARNING "Vulkan not found") endif()