cpu all
This commit is contained in:
parent
ffd9914d0a
commit
a48bd5bbe7
@ -24,6 +24,7 @@ set(GGML_CUDA_PEER_MAX_BATCH_SIZE 128)
|
|||||||
set(GGML_LLAMAFILE ON)
|
set(GGML_LLAMAFILE ON)
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
||||||
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ml/backend/ggml/ggml/src)
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ml/backend/ggml/ggml/src)
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ml/backend/ggml/ggml/src/include)
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ml/backend/ggml/ggml/src/include)
|
||||||
|
@ -55,7 +55,9 @@
|
|||||||
"buildPresets": [
|
"buildPresets": [
|
||||||
{
|
{
|
||||||
"name": "Default",
|
"name": "Default",
|
||||||
"configurePreset": "Default"
|
"configurePreset": "Default",
|
||||||
|
"configuration": "Release",
|
||||||
|
"targets": [ "ggml-cpu" ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "CUDA",
|
"name": "CUDA",
|
||||||
|
@ -0,0 +1,29 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Yang <mxyng@pm.me>
|
||||||
|
Date: Tue, 14 Jan 2025 15:59:04 -0800
|
||||||
|
Subject: [PATCH] add phony target ggml-cpu for all cpu variants
|
||||||
|
|
||||||
|
---
|
||||||
|
ggml/src/CMakeLists.txt | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
|
||||||
|
index 84101c32..72b488dd 100644
|
||||||
|
--- a/ggml/src/CMakeLists.txt
|
||||||
|
+++ b/ggml/src/CMakeLists.txt
|
||||||
|
@@ -278,6 +278,7 @@ function(ggml_add_cpu_backend_variant tag_name)
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
ggml_add_cpu_backend_variant_impl(${tag_name})
|
||||||
|
+ add_dependencies(ggml-cpu ggml-cpu-${tag_name})
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
ggml_add_backend(CPU)
|
||||||
|
@@ -286,6 +287,7 @@ if (GGML_CPU_ALL_VARIANTS)
|
||||||
|
if (NOT GGML_BACKEND_DL)
|
||||||
|
message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS requires GGML_BACKEND_DL")
|
||||||
|
endif()
|
||||||
|
+ add_custom_target(ggml-cpu)
|
||||||
|
ggml_add_cpu_backend_variant(sandybridge AVX)
|
||||||
|
ggml_add_cpu_backend_variant(haswell AVX F16C AVX2 FMA)
|
||||||
|
ggml_add_cpu_backend_variant(skylakex AVX F16C AVX2 FMA AVX512)
|
@ -278,6 +278,7 @@ function(ggml_add_cpu_backend_variant tag_name)
|
|||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
ggml_add_cpu_backend_variant_impl(${tag_name})
|
ggml_add_cpu_backend_variant_impl(${tag_name})
|
||||||
|
add_dependencies(ggml-cpu ggml-cpu-${tag_name})
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
ggml_add_backend(CPU)
|
ggml_add_backend(CPU)
|
||||||
@ -286,6 +287,7 @@ if (GGML_CPU_ALL_VARIANTS)
|
|||||||
if (NOT GGML_BACKEND_DL)
|
if (NOT GGML_BACKEND_DL)
|
||||||
message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS requires GGML_BACKEND_DL")
|
message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS requires GGML_BACKEND_DL")
|
||||||
endif()
|
endif()
|
||||||
|
add_custom_target(ggml-cpu)
|
||||||
ggml_add_cpu_backend_variant(sandybridge AVX)
|
ggml_add_cpu_backend_variant(sandybridge AVX)
|
||||||
ggml_add_cpu_backend_variant(haswell AVX F16C AVX2 FMA)
|
ggml_add_cpu_backend_variant(haswell AVX F16C AVX2 FMA)
|
||||||
ggml_add_cpu_backend_variant(skylakex AVX F16C AVX2 FMA AVX512)
|
ggml_add_cpu_backend_variant(skylakex AVX F16C AVX2 FMA AVX512)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user