Skip to content

Commit 7cc2d2c

Browse files
slarenggerganov
slaren
and
ggerganov
authored
ggml : move AMX to the CPU backend (ggml-org#10570)
* ggml : move AMX to the CPU backend --------- Co-authored-by: Georgi Gerganov <[email protected]>
1 parent b782e5c commit 7cc2d2c

Some content is hidden

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

64 files changed

+515
-802
lines changed

‎.clang-tidy

+2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ Checks: >
1717
-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
1818
performance-*,
1919
portability-*,
20+
-portability-simd-intrinsics,
2021
misc-*,
2122
-misc-const-correctness,
2223
-misc-non-private-member-variables-in-classes,
2324
-misc-no-recursion,
25+
-misc-use-anonymous-namespace,
2426
FormatStyle: none

‎.github/workflows/build.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,11 @@ jobs:
11211121
run: |
11221122
& 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' --version
11231123
1124+
- name: Install ccache
1125+
uses: hendrikmuhs/[email protected]
1126+
with:
1127+
key: ${{ github.job }}
1128+
11241129
- name: Build
11251130
id: cmake_build
11261131
run: |

‎Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ endif
254254
# keep standard at C11 and C++11
255255
MK_CPPFLAGS = -Iggml/include -Iggml/src -Iinclude -Isrc -Icommon -DGGML_USE_CPU
256256
MK_CFLAGS = -std=c11 -fPIC
257-
MK_CXXFLAGS = -std=c++11 -fPIC
258-
MK_NVCCFLAGS = -std=c++11
257+
MK_CXXFLAGS = -std=c++17 -fPIC
258+
MK_NVCCFLAGS = -std=c++17
259259

260260
ifdef LLAMA_NO_CCACHE
261261
GGML_NO_CCACHE := 1
@@ -575,9 +575,12 @@ endif
575575

576576
ifndef GGML_NO_AMX
577577
MK_CPPFLAGS += -DGGML_USE_AMX
578-
OBJ_GGML_EXT += ggml/src/ggml-amx/ggml-amx.o ggml/src/ggml-amx/mmq.o
578+
OBJ_GGML_EXT += ggml/src/ggml-cpu/amx/amx.o ggml/src/ggml-cpu/amx/mmq.o
579579
endif
580580

581+
# only necessary for the CPU backend files
582+
MK_CPPFLAGS += -Iggml/src/ggml-cpu
583+
581584
ifdef GGML_RPC
582585
MK_CPPFLAGS += -DGGML_USE_RPC
583586
OBJ_GGML_EXT += ggml/src/ggml-rpc.o

‎Package.swift

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,16 @@ var cSettings: [CSetting] = [
2828
.unsafeFlags(["-Wno-shorten-64-to-32", "-O3", "-DNDEBUG"]),
2929
.unsafeFlags(["-fno-objc-arc"]),
3030
.headerSearchPath("ggml/src"),
31+
.headerSearchPath("ggml/src/ggml-cpu"),
3132
// NOTE: NEW_LAPACK will required iOS version 16.4+
3233
// We should consider add this in the future when we drop support for iOS 14
3334
// (ref: ref: https://developer.apple.com/documentation/accelerate/1513264-cblas_sgemm?language=objc)
3435
// .define("ACCELERATE_NEW_LAPACK"),
3536
// .define("ACCELERATE_LAPACK_ILP64")
37+
.define("GGML_USE_CPU"),
3638
]
3739

40+
3841
#if canImport(Darwin)
3942
sources.append("ggml/src/ggml-common.h")
4043
sources.append("ggml/src/ggml-metal/ggml-metal.m")
@@ -44,7 +47,6 @@ cSettings.append(
4447
contentsOf: [
4548
.define("GGML_USE_ACCELERATE"),
4649
.define("GGML_USE_METAL"),
47-
.define("GGML_USE_CPU")
4850
]
4951
)
5052
#endif

‎common/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,5 @@ if (LLAMA_CURL)
8888
endif ()
8989

9090
target_include_directories(${TARGET} PUBLIC .)
91-
target_compile_features (${TARGET} PUBLIC cxx_std_11)
91+
target_compile_features (${TARGET} PUBLIC cxx_std_17)
9292
target_link_libraries (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} PUBLIC llama Threads::Threads)

‎common/common.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,17 @@ bool fs_validate_filename(const std::string & filename) {
652652

653653
std::u32string filename_utf32;
654654
try {
655+
#if defined(__clang__)
656+
// disable C++17 deprecation warning for std::codecvt_utf8
657+
# pragma clang diagnostic push
658+
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
659+
#endif
655660
std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> converter;
661+
662+
#if defined(__clang__)
663+
# pragma clang diagnostic pop
664+
#endif
665+
656666
filename_utf32 = converter.from_bytes(filename);
657667

658668
// If the reverse conversion mismatches, it means overlong UTF-8 sequences were used,

‎examples/batched-bench/CMakeLists.txt

+1-1
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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/batched/CMakeLists.txt

+1-1
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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

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

+1-1
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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/cvector-generator/CMakeLists.txt

+1-1
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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/embedding/CMakeLists.txt

+1-1
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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/eval-callback/CMakeLists.txt

+1-1
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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)
66

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

‎examples/export-lora/CMakeLists.txt

+1-1
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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/gbnf-validator/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-gbnf-validator)
22
add_executable(${TARGET} gbnf-validator.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/gen-docs/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-gen-docs)
22
add_executable(${TARGET} gen-docs.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/gguf-hash/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ add_library(sha256 OBJECT deps/sha256/sha256.c deps/sha256/sha256.h)
1919
target_link_libraries(${TARGET} PRIVATE sha256)
2020

2121
target_link_libraries(${TARGET} PRIVATE ggml ${CMAKE_THREAD_LIBS_INIT})
22-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
22+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/gguf-split/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-gguf-split)
22
add_executable(${TARGET} gguf-split.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/gguf/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-gguf)
22
add_executable(${TARGET} gguf.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE ggml ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/gritlm/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-gritlm)
22
add_executable(${TARGET} gritlm.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/imatrix/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-imatrix)
22
add_executable(${TARGET} imatrix.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/infill/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-infill)
22
add_executable(${TARGET} infill.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/llama-bench/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-bench)
22
add_executable(${TARGET} llama-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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/llava/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ target_include_directories(llava PUBLIC .)
1111
target_include_directories(llava PUBLIC ../..)
1212
target_include_directories(llava PUBLIC ../../common)
1313

14-
target_compile_features(llava PRIVATE cxx_std_11)
14+
target_compile_features(llava PRIVATE cxx_std_17)
1515

1616
add_library(llava_static STATIC $<TARGET_OBJECTS:llava>)
1717
if (BUILD_SHARED_LIBS)
@@ -35,11 +35,11 @@ add_executable(${TARGET} llava-cli.cpp)
3535
set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME llama-llava-cli)
3636
install(TARGETS ${TARGET} RUNTIME)
3737
target_link_libraries(${TARGET} PRIVATE common llava ${CMAKE_THREAD_LIBS_INIT})
38-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
38+
target_compile_features(${TARGET} PRIVATE cxx_std_17)
3939

4040
set(TARGET llama-minicpmv-cli)
4141
add_executable(${TARGET} minicpmv-cli.cpp)
4242
set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME llama-minicpmv-cli)
4343
install(TARGETS ${TARGET} RUNTIME)
4444
target_link_libraries(${TARGET} PRIVATE common llava ${CMAKE_THREAD_LIBS_INIT})
45-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
45+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/lookahead/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-lookahead)
22
add_executable(${TARGET} lookahead.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/lookup/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ set(TARGET llama-lookup)
22
add_executable(${TARGET} lookup.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)
66

77
set(TARGET llama-lookup-create)
88
add_executable(${TARGET} lookup-create.cpp)
99
install(TARGETS ${TARGET} RUNTIME)
1010
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
11-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
11+
target_compile_features(${TARGET} PRIVATE cxx_std_17)
1212

1313
set(TARGET llama-lookup-merge)
1414
add_executable(${TARGET} lookup-merge.cpp)
1515
install(TARGETS ${TARGET} RUNTIME)
1616
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
17-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
17+
target_compile_features(${TARGET} PRIVATE cxx_std_17)
1818

1919
set(TARGET llama-lookup-stats)
2020
add_executable(${TARGET} lookup-stats.cpp)
2121
install(TARGETS ${TARGET} RUNTIME)
2222
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
23-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
23+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/main-cmake-pkg/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ add_executable(${TARGET} ${CMAKE_CURRENT_LIST_DIR}/../main/main.cpp)
2929
target_include_directories(${TARGET} PRIVATE ${_common_path})
3030
install(TARGETS ${TARGET} RUNTIME)
3131
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
32-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
32+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/main/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-cli)
22
add_executable(${TARGET} main.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/parallel/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-parallel)
22
add_executable(${TARGET} parallel.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/passkey/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-passkey)
22
add_executable(${TARGET} passkey.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/perplexity/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-perplexity)
22
add_executable(${TARGET} perplexity.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/quantize-stats/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ add_executable(${TARGET} quantize-stats.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE llama build_info ${CMAKE_THREAD_LIBS_INIT})
55
target_include_directories(${TARGET} PRIVATE ../../common)
6-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
6+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/quantize/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ add_executable(${TARGET} quantize.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
55
target_include_directories(${TARGET} PRIVATE ../../common)
6-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
6+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/retrieval/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-retrieval)
22
add_executable(${TARGET} retrieval.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/run/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-run)
22
add_executable(${TARGET} run.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/save-load-state/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-save-load-state)
22
add_executable(${TARGET} save-load-state.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/server/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ if (WIN32)
5050
TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ws2_32)
5151
endif()
5252

53-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
53+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/simple-chat/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-simple-chat)
22
add_executable(${TARGET} simple-chat.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/simple/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-simple)
22
add_executable(${TARGET} simple.cpp)
33
install(TARGETS ${TARGET} RUNTIME)
44
target_link_libraries(${TARGET} PRIVATE llama ${CMAKE_THREAD_LIBS_INIT})
5-
target_compile_features(${TARGET} PRIVATE cxx_std_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/speculative-simple/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-speculative-simple)
22
add_executable(${TARGET} speculative-simple.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/speculative/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-speculative)
22
add_executable(${TARGET} speculative.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎examples/tokenize/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set(TARGET llama-tokenize)
22
add_executable(${TARGET} tokenize.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_11)
5+
target_compile_features(${TARGET} PRIVATE cxx_std_17)

‎ggml/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ set (GGML_METAL_MACOSX_VERSION_MIN "" CACHE STRING
161161
set (GGML_METAL_STD "" CACHE STRING "ggml: metal standard version (-std flag)")
162162
option(GGML_OPENMP "ggml: use OpenMP" ON)
163163
option(GGML_RPC "ggml: use RPC" OFF)
164-
option(GGML_AMX "ggml: use AMX" OFF)
165164
option(GGML_SYCL "ggml: use SYCL" OFF)
166165
option(GGML_SYCL_F16 "ggml: use 16 bit floats for sycl calculations" OFF)
167166
set (GGML_SYCL_TARGET "INTEL" CACHE STRING

‎ggml/include/ggml-amx.h

-25
This file was deleted.

0 commit comments

Comments
 (0)