Skip to content

Commit e48c2eb

Browse files
slarenslaren
committed
fixes
1 parent c4e9c7c commit e48c2eb

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎ggml/CMakeLists.txt

+24-25
Original file line numberDiff line numberDiff line change
@@ -92,30 +92,33 @@ else()
9292
set(INS_ENB ON)
9393
endif()
9494

95-
option(GGML_CPU_HBM "ggml: use memkind for CPU HBM" OFF)
96-
option(GGML_CPU_AARCH64 "ggml: use runtime weight conversion of Q4_0 to Q4_X_X" ON)
97-
98-
option(GGML_AVX "ggml: enable AVX" ${INS_ENB})
99-
option(GGML_AVX_VNNI "ggml: enable AVX-VNNI" OFF)
100-
option(GGML_AVX2 "ggml: enable AVX2" ${INS_ENB})
101-
option(GGML_AVX512 "ggml: enable AVX512" OFF)
102-
option(GGML_AVX512_VBMI "ggml: enable AVX512-VBMI" OFF)
103-
option(GGML_AVX512_VNNI "ggml: enable AVX512-VNNI" OFF)
104-
option(GGML_AVX512_BF16 "ggml: enable AVX512-BF16" OFF)
105-
option(GGML_AMX_TILE "ggml: enable AMX-TILE" OFF)
106-
option(GGML_AMX_INT8 "ggml: enable AMX-INT8" OFF)
107-
option(GGML_AMX_BF16 "ggml: enable AMX-BF16" OFF)
108-
option(GGML_FMA "ggml: enable FMA" ${INS_ENB})
95+
option(GGML_CPU_HBM "ggml: use memkind for CPU HBM" OFF)
96+
option(GGML_CPU_AARCH64 "ggml: use runtime weight conversion of Q4_0 to Q4_X_X" ON)
97+
option(GGML_AVX "ggml: enable AVX" ${INS_ENB})
98+
option(GGML_AVX_VNNI "ggml: enable AVX-VNNI" OFF)
99+
option(GGML_AVX2 "ggml: enable AVX2" ${INS_ENB})
100+
option(GGML_AVX512 "ggml: enable AVX512F" OFF)
101+
option(GGML_AVX512_VBMI "ggml: enable AVX512-VBMI" OFF)
102+
option(GGML_AVX512_VNNI "ggml: enable AVX512-VNNI" OFF)
103+
option(GGML_AVX512_BF16 "ggml: enable AVX512-BF16" OFF)
109104
if (NOT MSVC)
110-
option(GGML_F16C "ggml: enable F16C" ${INS_ENB}) # in MSVC F16C is implied with AVX2/AVX512
105+
# in MSVC F16C and FMA is implied with AVX2/AVX512
106+
option(GGML_FMA "ggml: enable FMA" ${INS_ENB})
107+
option(GGML_F16C "ggml: enable F16C" ${INS_ENB})
108+
# MSVC does not seem to support AMX
109+
option(GGML_AMX_TILE "ggml: enable AMX-TILE" OFF)
110+
option(GGML_AMX_INT8 "ggml: enable AMX-INT8" OFF)
111+
option(GGML_AMX_BF16 "ggml: enable AMX-BF16" OFF)
111112
endif()
112-
option(GGML_LASX "ggml: enable lasx" ON)
113-
option(GGML_LSX "ggml: enable lsx" ON)
114-
option(GGML_RVV "ggml: enable rvv" ON)
115-
option(GGML_SVE "ggml: enable SVE" OFF)
113+
option(GGML_LASX "ggml: enable lasx" ON)
114+
option(GGML_LSX "ggml: enable lsx" ON)
115+
option(GGML_RVV "ggml: enable rvv" ON)
116+
option(GGML_SVE "ggml: enable SVE" OFF)
117+
option(GGML_CPU_ALL_VARIANTS "ggml: build all variants of the CPU backend (requires GGML_BACKEND_DL)" OFF)
118+
116119

117120
if (WIN32)
118-
set(GGML_WIN_VER "0x602" CACHE STRING "ggml: Windows Version")
121+
set(GGML_WIN_VER "0x602" CACHE STRING "ggml: Windows version")
119122
endif()
120123

121124
# ggml core
@@ -180,11 +183,7 @@ option(GGML_BUILD_EXAMPLES "ggml: build examples" ${GGML_STANDALONE})
180183
set(CMAKE_C_STANDARD 11)
181184
set(CMAKE_C_STANDARD_REQUIRED true)
182185

183-
if (GGML_SYCL)
184-
set(CMAKE_CXX_STANDARD 17)
185-
else()
186-
set(CMAKE_CXX_STANDARD 11)
187-
endif()
186+
set(CMAKE_CXX_STANDARD 17)
188187
set(CMAKE_CXX_STANDARD_REQUIRED true)
189188

190189
set(THREADS_PREFER_PTHREAD_FLAG ON)

‎ggml/src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ if (GGML_CPU_ALL_VARIANTS)
299299
ggml_add_cpu_backend_variant(icelake AVX F16C AVX2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
300300
ggml_add_cpu_backend_variant(sapphirerapids AVX F16C AVX2 FMA AVX512 AVX512_VBMI AVX512_VNNI AVX512_BF16 AMX_TILE AMX_INT8)
301301
else ()
302-
ggml_add_cpu_backend_variant_impl()
302+
ggml_add_cpu_backend_variant_impl("")
303303
endif()
304304

305305
ggml_add_backend(BLAS)

‎ggml/src/ggml-cpu/CMakeLists.txt

+9-8
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
232232
list(APPEND ARCH_FLAGS -mavxvnni)
233233
endif()
234234
endif()
235-
else()
235+
else ()
236236
if (GGML_NATIVE)
237237
list(APPEND ARCH_FLAGS -march=native)
238238
else ()
@@ -340,13 +340,14 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
340340
# The feature detection code is compiled as a separate target so that
341341
# it can be built without the architecture flags
342342
# Since multiple variants of the CPU backend may be included in the same
343-
# build, using set_source_files_properties() is not possible
344-
add_library(${GGML_CPU_NAME}_feats OBJECT ggml-cpu/cpu-feats-x86.cpp)
345-
target_include_directories(${GGML_CPU_NAME}_feats PRIVATE . .. ../include)
346-
target_compile_definitions(${GGML_CPU_NAME}_feats PRIVATE ${ARCH_DEFINITIONS})
347-
target_compile_definitions(${GGML_CPU_NAME}_feats PRIVATE GGML_BACKEND_DL GGML_BACKEND_BUILD GGML_BACKEND_SHARED)
348-
set_target_properties(${GGML_CPU_NAME}_feats PROPERTIES POSITION_INDEPENDENT_CODE ON)
349-
target_link_libraries(${GGML_CPU_NAME} PRIVATE ${GGML_CPU_NAME}_feats)
343+
# build, using set_source_files_properties() to set the arch flags is not possible
344+
set(GGML_CPU_FEATS_NAME ${GGML_CPU_NAME}-feats)
345+
add_library(${GGML_CPU_FEATS_NAME} OBJECT ggml-cpu/cpu-feats-x86.cpp)
346+
target_include_directories(${GGML_CPU_FEATS_NAME} PRIVATE . .. ../include)
347+
target_compile_definitions(${GGML_CPU_FEATS_NAME} PRIVATE ${ARCH_DEFINITIONS})
348+
target_compile_definitions(${GGML_CPU_FEATS_NAME} PRIVATE GGML_BACKEND_DL GGML_BACKEND_BUILD GGML_BACKEND_SHARED)
349+
set_target_properties(${GGML_CPU_FEATS_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
350+
target_link_libraries(${GGML_CPU_NAME} PRIVATE ${GGML_CPU_FEATS_NAME})
350351
endif()
351352

352353
if (EMSCRIPTEN)

0 commit comments

Comments
 (0)