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

code review changes

Browse source
This commit is contained in:
Mason M 2024-07-01 11:42:47 -03:00
parent 4eab311ed0
commit 9bca872be0
6 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -59,8 +59,6 @@ llama-batched-swift
/rpc-server /rpc-server
out/ out/
tmp/ tmp/
ggml-vulkan-shaders.hpp
ggml-vulkan-shaders.cpp
# CI # CI

32
Makefile
View file

@ -188,7 +188,7 @@ ifdef GGML_RPC
endif endif
ifdef GGML_VULKAN ifdef GGML_VULKAN
BUILD_TARGETS += vulkan-gen-shaders BUILD_TARGETS += vulkan-shaders-gen
endif endif
default: $(BUILD_TARGETS) default: $(BUILD_TARGETS)
@ -717,26 +717,26 @@ ifdef GGML_VULKAN_RUN_TESTS
endif endif
GLSLC_CMD = glslc GLSLC_CMD = glslc
_llama_vk_genshaders_cmd = $(shell pwd)/vulkan-gen-shaders _ggml_vk_genshaders_cmd = $(shell pwd)/vulkan-shaders-gen
_llama_vk_header = ggml/src/ggml-vulkan-shaders.hpp _ggml_vk_header = ggml/src/ggml-vulkan-shaders.hpp
_llama_vk_source = ggml/src/ggml-vulkan-shaders.cpp _ggml_vk_source = ggml/src/ggml-vulkan-shaders.cpp
_llama_vk_input_dir = ggml/src/vulkan-shaders _ggml_vk_input_dir = ggml/src/vulkan-shaders
_llama_vk_shader_deps = $(echo $(_llama_vk_input_dir)/*.comp) _ggml_vk_shader_deps = $(echo $(_ggml_vk_input_dir)/*.comp)
ggml/src/ggml-vulkan.o: ggml/src/ggml-vulkan.cpp ggml/include/ggml-vulkan.h $(_llama_vk_header) $(_llama_vk_source) ggml/src/ggml-vulkan.o: ggml/src/ggml-vulkan.cpp ggml/include/ggml-vulkan.h $(_ggml_vk_header) $(_ggml_vk_source)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CXXFLAGS) -c $< -o $@
$(_llama_vk_header): $(_llama_vk_source) $(_ggml_vk_header): $(_ggml_vk_source)
$(_llama_vk_source): $(_llama_vk_shader_deps) vulkan-gen-shaders $(_ggml_vk_source): $(_ggml_vk_shader_deps) vulkan-shaders-gen
$(_llama_vk_genshaders_cmd) \ $(_ggml_vk_genshaders_cmd) \
--glslc $(GLSLC_CMD) \ --glslc $(GLSLC_CMD) \
--input-dir $(_llama_vk_input_dir) \ --input-dir $(_ggml_vk_input_dir) \
--target-hpp $(_llama_vk_header) \ --target-hpp $(_ggml_vk_header) \
--target-cpp $(_llama_vk_source) --target-cpp $(_ggml_vk_source)
vulkan-gen-shaders: ggml/src/vulkan-gen-shaders/vulkan-gen-shaders.cpp vulkan-shaders-gen: ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp
$(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) ggml/src/vulkan-gen-shaders/vulkan-gen-shaders.cpp $(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp
endif # GGML_VULKAN endif # GGML_VULKAN
@ -1108,7 +1108,7 @@ clean:
rm -vrf ggml/src/ggml-cuda/template-instances/*.o rm -vrf ggml/src/ggml-cuda/template-instances/*.o
rm -rvf $(BUILD_TARGETS) rm -rvf $(BUILD_TARGETS)
rm -rvf $(TEST_TARGETS) rm -rvf $(TEST_TARGETS)
rm -f vulkan-gen-shaders ggml/src/ggml-vulkan-shaders.hpp ggml/src/ggml-vulkan-shaders.cpp rm -f vulkan-shaders-gen ggml/src/ggml-vulkan-shaders.hpp ggml/src/ggml-vulkan-shaders.cpp
find examples pocs -type f -name "*.o" -delete find examples pocs -type f -name "*.o" -delete
# #

2
ggml/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
src/ggml-vulkan-shaders.hpp
src/ggml-vulkan-shaders.cpp

34
ggml/src/CMakeLists.txt
View file

@ -558,34 +558,34 @@ if (GGML_VULKAN)
add_compile_definitions(GGML_VULKAN_RUN_TESTS) add_compile_definitions(GGML_VULKAN_RUN_TESTS)
endif() endif()
add_subdirectory(vulkan-gen-shaders) add_subdirectory(vulkan-shaders)
set (_llama_vk_genshaders_cmd vulkan-gen-shaders) set (_ggml_vk_genshaders_cmd vulkan-shaders-gen)
set (_llama_vk_header ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp) set (_ggml_vk_header ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp)
set (_llama_vk_source ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp) set (_ggml_vk_source ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp)
set (_llama_vk_input_dir ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders) set (_ggml_vk_input_dir ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders)
set (_llama_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv) set (_ggml_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv)
file(GLOB _llama_vk_shader_deps "${_llama_vk_input_dir}/*.comp") file(GLOB _ggml_vk_shader_deps "${_ggml_vk_input_dir}/*.comp")
add_custom_command( add_custom_command(
OUTPUT ${_llama_vk_header} OUTPUT ${_ggml_vk_header}
${_llama_vk_source} ${_ggml_vk_source}
COMMAND ${_llama_vk_genshaders_cmd} COMMAND ${_ggml_vk_genshaders_cmd}
--glslc ${Vulkan_GLSLC_EXECUTABLE} --glslc ${Vulkan_GLSLC_EXECUTABLE}
--input-dir ${_llama_vk_input_dir} --input-dir ${_ggml_vk_input_dir}
--output-dir ${_llama_vk_output_dir} --output-dir ${_ggml_vk_output_dir}
--target-hpp ${_llama_vk_header} --target-hpp ${_ggml_vk_header}
--target-cpp ${_llama_vk_source} --target-cpp ${_ggml_vk_source}
--no-clean --no-clean
DEPENDS ${_llama_vk_shader_deps} DEPENDS ${_ggml_vk_shader_deps}
COMMENT "Generate vulkan shaders" COMMENT "Generate vulkan shaders"
) )
set(GGML_HEADERS_VULKAN ${CMAKE_CURRENT_SOURCE_DIR}/../include/ggml-vulkan.h ${_llama_vk_header}) set(GGML_HEADERS_VULKAN ${CMAKE_CURRENT_SOURCE_DIR}/../include/ggml-vulkan.h ${_ggml_vk_header})
set(GGML_SOURCES_VULKAN ggml-vulkan.cpp ${_llama_vk_source}) set(GGML_SOURCES_VULKAN ggml-vulkan.cpp ${_ggml_vk_source})
set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} Vulkan::Vulkan) set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} Vulkan::Vulkan)
set(GGML_EXTRA_INCLUDES ${GGML_EXTRA_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) set(GGML_EXTRA_INCLUDES ${GGML_EXTRA_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})

4
ggml/src/vulkan-gen-shaders/CMakeLists.txt → ggml/src/vulkan-shaders/CMakeLists.txt
View file

@ -1,5 +1,5 @@
set(TARGET vulkan-gen-shaders) set(TARGET vulkan-shaders-gen)
add_executable(${TARGET} vulkan-gen-shaders.cpp) add_executable(${TARGET} vulkan-shaders-gen.cpp)
install(TARGETS ${TARGET} RUNTIME) install(TARGETS ${TARGET} RUNTIME)
target_compile_features(${TARGET} PRIVATE cxx_std_11) target_compile_features(${TARGET} PRIVATE cxx_std_11)

0
ggml/src/vulkan-gen-shaders/vulkan-gen-shaders.cpp → ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp
View file