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

Short hash, less fancy Makefile, and don't modify build-info.h if it wouldn't change it

Browse source
This commit is contained in:
Danny Daemonic 2023-04-30 18:39:33 -07:00
parent ddb3e88376
commit 52892512cd
9 changed files with 84 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

17
CMakeLists.txt
View file

@ -76,14 +76,25 @@ option(LLAMA_BUILD_EXAMPLES "llama: build examples" ${LLAMA_STANDALONE})
# Build info header # Build info header
# #
# Generate build-info.h initially # Write header template to binary dir to keep source directory clean
file(WRITE "${CMAKE_BINARY_DIR}/BUILD_INFO.h.in" "\
#ifndef BUILD_INFO_H\n\
#define BUILD_INFO_H\n\
\n\
#define BUILD_NUMBER @BUILD_NUMBER@\n\
#define BUILD_COMMIT \"@BUILD_COMMIT@\"\n\
\n\
#endif // BUILD_INFO_H\n\
")
# Generate initial build-info.h
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/build-info.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/build-info.cmake)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
# Add a custom target to regenerate build-info.h when .git/index changes # Add a custom target for build-info.h
add_custom_target(BUILD_INFO ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/build-info.h") add_custom_target(BUILD_INFO ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/build-info.h")
# Add a custom command to generate build-info.h when .git/index changes # Add a custom command to rebuild build-info.h when .git/index changes
add_custom_command( add_custom_command(
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/build-info.h" OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/build-info.h"
COMMENT "Generating build details from Git" COMMENT "Generating build details from Git"

87
Makefile
View file

@ -16,8 +16,6 @@ endif
CCV := $(shell $(CC) --version | head -n 1) CCV := $(shell $(CC) --version | head -n 1)
CXXV := $(shell $(CXX) --version | head -n 1) CXXV := $(shell $(CXX) --version | head -n 1)
GIT_INDEX = $(wildcard .git/index)
# Mac OS + Arm can report x86_64 # Mac OS + Arm can report x86_64
# ref: https://github.com/ggerganov/whisper.cpp/issues/66#issuecomment-1282546789 # ref: https://github.com/ggerganov/whisper.cpp/issues/66#issuecomment-1282546789
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
@ -183,77 +181,56 @@ llama.o: llama.cpp ggml.h ggml-cuda.h llama.h llama-util.h
common.o: examples/common.cpp examples/common.h common.o: examples/common.cpp examples/common.h
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CXXFLAGS) -c $< -o $@
clean: libllama.so: llama.o ggml.o $(OBJS)
rm -vf *.o main quantize quantize-stats perplexity embedding benchmark-matmult build-info.h $(CXX) $(CXXFLAGS) -shared -fPIC -o $@ $^ $(LDFLAGS)
build-info.h: $(GIT_INDEX) clean:
scripts/build-info.sh > $@ rm -vf *.o main quantize quantize-stats perplexity embedding benchmark-matmult save-load-state build-info.h
# #
# Examples # Examples
# #
TARGETS_CPP += main main: examples/main/main.cpp build-info.h ggml.o llama.o common.o $(OBJS)
DEPS_main := examples/main/main.cpp ggml.o llama.o common.o $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
EXEC_main :=\ @echo
@echo;\ @echo '==== Run ./main -h for help. ===='
echo "==== Run ./main -h for help. ====";\ @echo
echo
TARGETS_CPP += quantize quantize: examples/quantize/quantize.cpp build-info.h ggml.o llama.o $(OBJS)
DEPS_quantize := examples/quantize/quantize.cpp ggml.o llama.o $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
TARGETS_CPP += quantize-stats quantize-stats: examples/quantize-stats/quantize-stats.cpp build-info.h ggml.o llama.o $(OBJS)
DEPS_quantize-stats := examples/quantize-stats/quantize-stats.cpp ggml.o llama.o $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
TARGETS_CPP += perplexity perplexity: examples/perplexity/perplexity.cpp build-info.h ggml.o llama.o common.o $(OBJS)
DEPS_perplexity := examples/perplexity/perplexity.cpp ggml.o llama.o common.o $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
TARGETS_CPP += embedding embedding: examples/embedding/embedding.cpp build-info.h ggml.o llama.o common.o $(OBJS)
DEPS_embedding := examples/embedding/embedding.cpp ggml.o llama.o common.o $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
TARGETS_CPP += save-load-state save-load-state: examples/save-load-state/save-load-state.cpp build-info.h ggml.o llama.o common.o $(OBJS)
DEPS_save-load-state := examples/save-load-state/save-load-state.cpp ggml.o llama.o common.o $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
TARGETS_CPP += vdot build-info.h: $(wildcard .git/index) scripts/build-info.sh
DEPS_vdot := pocs/vdot/vdot.cpp ggml.o @scripts/build-info.sh > $@.tmp
@if ! cmp -s $@.tmp $@; then \
# mv $@.tmp $@; \
# libllama else \
# rm $@.tmp; \
fi
libllama.so: llama.o ggml.o $(OBJS)
$(CXX) $(CXXFLAGS) -shared -fPIC -o $@ $^ $(LDFLAGS)
# #
# Tests # Tests
# #
TARGETS_CPP += benchmark benchmark-matmult: examples/benchmark/benchmark-matmult.cpp build-info.h ggml.o $(OBJS)
DEPS_benchmark := examples/benchmark/benchmark-matmult.cpp build-info.h ggml.o $(OBJS) $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
OUTP_benchmark := benchmark-matmult ./$@
EXEC_benchmark := ./benchmark-matmult
vdot: pocs/vdot/vdot.cpp ggml.o $(OBJS)
$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
.PHONY: tests .PHONY: tests
tests: tests:
bash ./tests/run-tests.sh bash ./tests/run-tests.sh
#
# Templates
#
# C++ template
# To use this template:
# 1. Add your target to the TARGETS variable: TARGETS_CPP += target
# 2. Set target-specific dependencies: DEPS_target := source1 dependency1 dependency2 ...
# 3. Optionally, set target-specific output: OUTP_target := output_name
# 4. Optionally, set target-specific command: EXEC_target := command
define template_cpp
OUTP_$(1) ?= $(1)
$(1): $$(DEPS_$(1)) $$(OBJS) build-info.h
$$(CXX) $$(CXXFLAGS) $$(filter-out build-info.h,$$^) -o $$(OUTP_$(1)) $$(LDFLAGS)
$$(if $$(value EXEC_$(1)),$$(EXEC_$(1)))
endef
# This iterates through TARGETS_CPP and call the template for each target
$(foreach target,$(TARGETS_CPP),$(eval $(call template_cpp,$(target))))

3
examples/benchmark/CMakeLists.txt
View file

@ -2,3 +2,6 @@ set(TARGET benchmark)
add_executable(${TARGET} benchmark-matmult.cpp) add_executable(${TARGET} benchmark-matmult.cpp)
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
target_compile_features(${TARGET} PRIVATE cxx_std_11) target_compile_features(${TARGET} PRIVATE cxx_std_11)
if(TARGET BUILD_INFO)
add_dependencies(${TARGET} BUILD_INFO)
endif()

3
examples/embedding/CMakeLists.txt
View file

@ -2,3 +2,6 @@ set(TARGET embedding)
add_executable(${TARGET} embedding.cpp) add_executable(${TARGET} embedding.cpp)
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
target_compile_features(${TARGET} PRIVATE cxx_std_11) target_compile_features(${TARGET} PRIVATE cxx_std_11)
if(TARGET BUILD_INFO)
add_dependencies(${TARGET} BUILD_INFO)
endif()

3
examples/perplexity/CMakeLists.txt
View file

@ -2,3 +2,6 @@ set(TARGET perplexity)
add_executable(${TARGET} perplexity.cpp) add_executable(${TARGET} perplexity.cpp)
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
target_compile_features(${TARGET} PRIVATE cxx_std_11) target_compile_features(${TARGET} PRIVATE cxx_std_11)
if(TARGET BUILD_INFO)
add_dependencies(${TARGET} BUILD_INFO)
endif()

3
examples/quantize/CMakeLists.txt
View file

@ -2,3 +2,6 @@ set(TARGET quantize)
add_executable(${TARGET} quantize.cpp) add_executable(${TARGET} quantize.cpp)
target_link_libraries(${TARGET} PRIVATE llama ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${TARGET} PRIVATE llama ${CMAKE_THREAD_LIBS_INIT})
target_compile_features(${TARGET} PRIVATE cxx_std_11) target_compile_features(${TARGET} PRIVATE cxx_std_11)
if(TARGET BUILD_INFO)
add_dependencies(${TARGET} BUILD_INFO)
endif()

3
examples/save-load-state/CMakeLists.txt
View file

@ -2,3 +2,6 @@ set(TARGET save-load-state)
add_executable(${TARGET} save-load-state.cpp) add_executable(${TARGET} save-load-state.cpp)
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
target_compile_features(${TARGET} PRIVATE cxx_std_11) target_compile_features(${TARGET} PRIVATE cxx_std_11)
if(TARGET BUILD_INFO)
add_dependencies(${TARGET} BUILD_INFO)
endif()

37
scripts/build-info.cmake
View file

@ -1,6 +1,9 @@
set(HEAD "unknown") set(TEMPLATE_FILE "${CMAKE_BINARY_DIR}/BUILD_INFO.h.in")
set(COUNT 0) set(HEADER_FILE "${CMAKE_CURRENT_SOURCE_DIR}/build-info.h")
set(BUILD_NUMBER 0)
set(BUILD_COMMIT "unknown")
# Look for git
find_package(Git) find_package(Git)
if(NOT Git_FOUND) if(NOT Git_FOUND)
execute_process( execute_process(
@ -16,33 +19,35 @@ if(NOT Git_FOUND)
endif() endif()
endif() endif()
# Get the commit count and hash
if(Git_FOUND) if(Git_FOUND)
execute_process( execute_process(
COMMAND ${GIT_EXECUTABLE} rev-parse HEAD COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE TEMP_HEAD OUTPUT_VARIABLE HEAD
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE GIT_HEAD_RESULT RESULT_VARIABLE GIT_HEAD_RESULT
) )
execute_process( execute_process(
COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE TEMP_COUNT OUTPUT_VARIABLE COUNT
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE GIT_COUNT_RESULT RESULT_VARIABLE GIT_COUNT_RESULT
) )
if(GIT_HEAD_RESULT EQUAL 0 AND GIT_COUNT_RESULT EQUAL 0) if(GIT_HEAD_RESULT EQUAL 0 AND GIT_COUNT_RESULT EQUAL 0)
set(HEAD ${TEMP_HEAD}) set(BUILD_COMMIT ${HEAD})
set(COUNT ${TEMP_COUNT}) set(BUILD_NUMBER ${COUNT})
endif() endif()
endif() endif()
file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/build-info.h" "\ # Only write the header if it's changed to prevent unnecessary recompilation
#ifndef BUILD_INFO_H\n\ if(EXISTS ${HEADER_FILE})
#define BUILD_INFO_H\n\ file(STRINGS ${HEADER_FILE} CONTENTS REGEX "BUILD_COMMIT \"([^\"]*)\"")
\n\ list(GET CONTENTS 0 EXISTING)
#define BUILD_NUMBER ${COUNT}\n\ if(NOT EXISTING STREQUAL "#define BUILD_COMMIT \"${BUILD_COMMIT}\"")
#define BUILD_COMMIT \"${HEAD}\"\n\ configure_file(${TEMPLATE_FILE} ${HEADER_FILE})
\n\ endif()
#endif // BUILD_INFO_H\n\ else()
") configure_file(${TEMPLATE_FILE} ${HEADER_FILE})
endif()

4
scripts/build-info.sh
View file

@ -3,12 +3,12 @@
BUILD_NUMBER="0" BUILD_NUMBER="0"
BUILD_COMMIT="unknown" BUILD_COMMIT="unknown"
REV_LIST=$(git rev-list HEAD --count) REV_LIST=$(git rev-list --count HEAD)
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
BUILD_NUMBER=$REV_LIST BUILD_NUMBER=$REV_LIST
fi fi
REV_PARSE=$(git rev-parse HEAD) REV_PARSE=$(git rev-parse --short HEAD)
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
BUILD_COMMIT=$REV_PARSE BUILD_COMMIT=$REV_PARSE
fi fi