Merge branch 'master' into main

apicalshark · Feb 6, 2025 · 52b4868 · 52b4868
2 parents 2fb3c32 + 6258f0b
commit 52b4868
Show file tree

Hide file tree

Showing 11 changed files with 580 additions and 26 deletions.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,22 @@ project("llama.cpp" C CXX)
 include(CheckIncludeFileCXX)
 
 #set(CMAKE_WARN_DEPRECATED YES)
-set(CMAKE_WARN_UNUSED_CLI YES)
+#set(CMAKE_WARN_UNUSED_CLI YES)
+
+#enable O3 flag
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-variable -Wno-unused-function -Wno-error")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-Ofast")
+
+#add lto
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+
+#no warn
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -59,7 +74,7 @@ endif()
 #
 
 # debug
-option(LLAMA_ALL_WARNINGS           "llama: enable all compiler warnings"                   ON)
+option(LLAMA_ALL_WARNINGS           "llama: enable all compiler warnings"                   OFF)
 option(LLAMA_ALL_WARNINGS_3RD_PARTY "llama: enable all compiler warnings in 3rd party libs" OFF)
 
 # build

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -1,5 +1,15 @@
 # common
+#enable O3 flag
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-variable -Wno-unused-function -Wno-error")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-Ofast")
 
+#add lto
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 find_package(Threads REQUIRED)
 
 llama_add_compile_flags()

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,5 +1,15 @@
 # dependencies
+#enable O3 flag
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-variable -Wno-unused-function -Wno-error")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-Ofast")
 
+#add lto
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 find_package(Threads REQUIRED)
 
 # third-party

diff --git a/examples/llava/requirements.txt b/examples/llava/requirements.txt
@@ -1,5 +1,5 @@
 -r ../../requirements/requirements-convert_legacy_llama.txt
 --extra-index-url https://download.pytorch.org/whl/cpu
-pillow~=10.2.0
+pillow~=11.0.0
 torch~=2.2.1
 torchvision~=0.17.1
diff --git a/examples/server/tests/requirements.txt b/examples/server/tests/requirements.txt
@@ -1,4 +1,4 @@
-aiohttp~=3.9.3
+aiohttp~=3.11.11
 pytest~=8.3.3
 huggingface_hub~=0.23.2
 numpy~=1.26.4

diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt
@@ -1,7 +1,17 @@
 cmake_minimum_required(VERSION 3.14) # for add_link_options and implicit target directories.
 project("ggml" C CXX)
 include(CheckIncludeFileCXX)
+#enable O3 flag
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-variable -Wno-unused-function -Wno-error")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-Ofast")
 
+#add lto
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if (NOT XCODE AND NOT MSVC AND NOT CMAKE_BUILD_TYPE)

diff --git a/pocs/CMakeLists.txt b/pocs/CMakeLists.txt
@@ -1,5 +1,15 @@
 # dependencies
+#enable O3 flag
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-variable -Wno-unused-function -Wno-error")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-Ofast")
 
+#add lto
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 find_package(Threads REQUIRED)
 
 # third-party

diff --git a/pocs/vdot/CMakeLists.txt b/pocs/vdot/CMakeLists.txt
@@ -1,3 +1,14 @@
+#enable O3 flag
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-variable -Wno-unused-function -Wno-error")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-Ofast")
+
+#add lto
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 set(TARGET llama-vdot)
 add_executable(${TARGET} vdot.cpp)
 target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})

diff --git a/poetry.lock b/poetry.lock
diff --git a/scripts/sync-ggml.last b/scripts/sync-ggml.last
@@ -1 +1 @@
-694244a6e40dc255f6bb4376fb17431c06633e6c
+694244a6e40dc255f6bb4376fb17431c06633e6c
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		694244a6e40dc255f6bb4376fb17431c06633e6c
		694244a6e40dc255f6bb4376fb17431c06633e6c