Skip to content

Commit bd2ec74

Browse files
stduhpfjeffbolznv
authored andcommitted
Vulkan: RTE rounding for cpy to quant (ggml-org#12480)
* Vulkan: RTE rounding for cpy to quant Co-Authored-By: Jeff Bolz <[email protected]> * remove trailing whitespace * avoid duplicating pipeline_cpy_f32_quant * fix copypasting issue * remove duplicated code --------- Co-Authored-By: Jeff Bolz <[email protected]>
1 parent 30c42ef commit bd2ec74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+29054
-24910
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ DEP_FILES = $(OBJ_GGML:.o=.d) $(OBJ_LLAMA:.o=.d) $(OBJ_COMMON:.o=.d)
11191119
all: $(BUILD_TARGETS)
11201120

11211121
# force c++ build for source file that have same name as c file
1122-
# Note: need this exception because `ggml-cpu.c` and `ggml-cpu.cpp` both produce the same obj/dep files
1122+
# Note: need this exception because `ggml-cpu.cpp` and `ggml-cpu.cpp` both produce the same obj/dep files
11231123
$(DIR_GGML)/%_cpp.o: $(DIR_GGML)/%.cpp
11241124
$(CXX) $(CXXFLAGS) -MMD -c $< -o $@
11251125

common/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,5 +137,5 @@ if (LLAMA_LLGUIDANCE)
137137
endif ()
138138

139139
target_include_directories(${TARGET} PUBLIC .)
140-
target_compile_features (${TARGET} PUBLIC cxx_std_17)
140+
target_compile_features (${TARGET} PUBLIC cxx_std_20)
141141
target_link_libraries (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} PUBLIC llama Threads::Threads)

examples/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ else()
2626
add_subdirectory(gbnf-validator)
2727
endif()
2828

29-
add_subdirectory(gguf-hash)
3029
add_subdirectory(gguf-split)
3130
add_subdirectory(gguf)
3231
add_subdirectory(gritlm)

examples/batched-bench/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-batched-bench)
22
add_executable(${TARGET} batched-bench.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_17)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_20)

examples/batched/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-batched)
22
add_executable(${TARGET} batched.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_17)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_20)

examples/convert-llama2c-to-ggml/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-convert-llama2c-to-ggml)
22
add_executable(${TARGET} convert-llama2c-to-ggml.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_17)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_20)

examples/cvector-generator/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-cvector-generator)
22
add_executable(${TARGET} cvector-generator.cpp pca.hpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_17)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_20)

examples/embedding/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-embedding)
22
add_executable(${TARGET} embedding.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_17)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_20)

examples/eval-callback/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set(TARGET llama-eval-callback)
22
add_executable(${TARGET} eval-callback.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_17)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_20)
66

77
set(TEST_TARGET test-eval-callback)
88
add_test(NAME ${TEST_TARGET}

examples/export-lora/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-export-lora)
22
add_executable(${TARGET} export-lora.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_17)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_20)

0 commit comments

Comments
 (0)