vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up tabs

Browse source
This commit is contained in:
Mason M 2024-06-26 08:49:16 -03:00
parent 885954646e
commit c61cd05611
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View file

@ -356,9 +356,9 @@ jobs:
id: depends id: depends
run: | run: |
sudo wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key add - 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 update -y
sudo apt-get install -y build-essential vulkan-sdk sudo apt-get install -y build-essential vulkan-sdk
- name: Build - name: Build
id: cmake_build id: cmake_build

30
CMakeLists.txt
View file

@ -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_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_header ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp)
set (_llama_vk_source ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp) 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_input_dir ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders)
set (_llama_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv) set (_llama_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv)
file(GLOB _llama_vk_shader_deps "${_llama_vk_input_dir}/*.comp") file(GLOB _llama_vk_shader_deps "${_llama_vk_input_dir}/*.comp")
add_custom_command( add_custom_command(
OUTPUT ${_llama_vk_header} OUTPUT ${_llama_vk_header}
${_llama_vk_source} ${_llama_vk_source}
COMMAND ${_llama_vk_genshaders_cmd} COMMAND ${_llama_vk_genshaders_cmd}
--glslc ${Vulkan_GLSLC_EXECUTABLE} --glslc ${Vulkan_GLSLC_EXECUTABLE}
--input-dir ${_llama_vk_input_dir} --input-dir ${_llama_vk_input_dir}
--output-dir ${_llama_vk_output_dir} --output-dir ${_llama_vk_output_dir}
--target-hpp ${_llama_vk_header} --target-hpp ${_llama_vk_header}
--target-cpp ${_llama_vk_source} --target-cpp ${_llama_vk_source}
--no-clean --no-clean
DEPENDS ${_llama_vk_shader_deps} DEPENDS ${_llama_vk_shader_deps}
COMMENT "Generate vulkan shaders" COMMENT "Generate vulkan shaders"
) )
set(GGML_HEADERS_VULKAN ggml-vulkan.h ${_llama_vk_header}) set(GGML_HEADERS_VULKAN ggml-vulkan.h ${_llama_vk_header})
set(GGML_SOURCES_VULKAN ggml-vulkan.cpp ${_llama_vk_source}) set(GGML_SOURCES_VULKAN ggml-vulkan.cpp ${_llama_vk_source})
set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} Vulkan::Vulkan) 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() else()
message(WARNING "Vulkan not found") message(WARNING "Vulkan not found")
endif() endif()