Skip to content

Commit d4cdd9c

Browse files
authored
ggml : remove kompute backend (#14501)
ggml-ci
1 parent 55c2646 commit d4cdd9c

Some content is hidden

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

53 files changed

+3
-4376
lines changed

.github/ISSUE_TEMPLATE/010-bug-compilation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ body:
4040
attributes:
4141
label: GGML backends
4242
description: Which GGML backends do you know to be affected?
43-
options: [AMX, BLAS, CPU, CUDA, HIP, Kompute, Metal, Musa, RPC, SYCL, Vulkan, OpenCL]
43+
options: [AMX, BLAS, CPU, CUDA, HIP, Metal, Musa, RPC, SYCL, Vulkan, OpenCL]
4444
multiple: true
4545
validations:
4646
required: true

.github/ISSUE_TEMPLATE/011-bug-results.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ body:
4242
attributes:
4343
label: GGML backends
4444
description: Which GGML backends do you know to be affected?
45-
options: [AMX, BLAS, CPU, CUDA, HIP, Kompute, Metal, Musa, RPC, SYCL, Vulkan, OpenCL]
45+
options: [AMX, BLAS, CPU, CUDA, HIP, Metal, Musa, RPC, SYCL, Vulkan, OpenCL]
4646
multiple: true
4747
validations:
4848
required: true

.github/labeler.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
# https://github.com/actions/labeler
2-
Kompute:
3-
- changed-files:
4-
- any-glob-to-any-file:
5-
- ggml/include/ggml-kompute.h
6-
- ggml/src/ggml-kompute/**
7-
- README-kompute.md
82
Apple Metal:
93
- changed-files:
104
- any-glob-to-any-file:

.github/workflows/build.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -740,9 +740,6 @@ jobs:
740740
- build: 'llvm-arm64-opencl-adreno'
741741
arch: 'arm64'
742742
defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/opencl-arm64-release" -DGGML_OPENCL=ON -DGGML_OPENCL_USE_ADRENO_KERNELS=ON'
743-
# - build: 'kompute-x64'
744-
# arch: 'x64'
745-
# defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_KOMPUTE=ON -DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON'
746743

747744
steps:
748745
- name: Clone
@@ -756,12 +753,6 @@ jobs:
756753
variant: ccache
757754
evict-old-files: 1d
758755

759-
- name: Clone Kompute submodule
760-
id: clone_kompute
761-
if: ${{ matrix.build == 'kompute-x64' }}
762-
run: |
763-
git submodule update --init ggml/src/ggml-kompute/kompute
764-
765756
- name: Download OpenBLAS
766757
id: get_openblas
767758
if: ${{ matrix.build == 'openblas-x64' }}
@@ -777,7 +768,7 @@ jobs:
777768
778769
- name: Install Vulkan SDK
779770
id: get_vulkan
780-
if: ${{ matrix.build == 'kompute-x64' || matrix.build == 'vulkan-x64' }}
771+
if: ${{ matrix.build == 'vulkan-x64' }}
781772
run: |
782773
curl.exe -o $env:RUNNER_TEMP/VulkanSDK-Installer.exe -L "https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows/vulkansdk-windows-X64-${env:VULKAN_VERSION}.exe"
783774
& "$env:RUNNER_TEMP\VulkanSDK-Installer.exe" --accept-licenses --default-answer --confirm-command install

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "kompute"]
2-
path = ggml/src/ggml-kompute/kompute
3-
url = https://github.com/nomic-ai/kompute.git

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ endfunction()
120120

121121
llama_option_depr(FATAL_ERROR LLAMA_CUBLAS GGML_CUDA)
122122
llama_option_depr(WARNING LLAMA_CUDA GGML_CUDA)
123-
llama_option_depr(WARNING LLAMA_KOMPUTE GGML_KOMPUTE)
124123
llama_option_depr(WARNING LLAMA_METAL GGML_METAL)
125124
llama_option_depr(WARNING LLAMA_METAL_EMBED_LIBRARY GGML_METAL_EMBED_LIBRARY)
126125
llama_option_depr(WARNING LLAMA_NATIVE GGML_NATIVE)

ggml/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ option(GGML_VULKAN_MEMORY_DEBUG "ggml: enable Vulkan memory debug ou
181181
option(GGML_VULKAN_SHADER_DEBUG_INFO "ggml: enable Vulkan shader debug info" OFF)
182182
option(GGML_VULKAN_VALIDATE "ggml: enable Vulkan validation" OFF)
183183
option(GGML_VULKAN_RUN_TESTS "ggml: run Vulkan tests" OFF)
184-
option(GGML_KOMPUTE "ggml: use Kompute" OFF)
185184
option(GGML_METAL "ggml: use Metal" ${GGML_METAL_DEFAULT})
186185
option(GGML_METAL_USE_BF16 "ggml: use bfloat if available" OFF)
187186
option(GGML_METAL_NDEBUG "ggml: disable Metal debugging" OFF)
@@ -266,7 +265,6 @@ set(GGML_PUBLIC_HEADERS
266265
include/ggml-cann.h
267266
include/ggml-cpp.h
268267
include/ggml-cuda.h
269-
include/ggml-kompute.h
270268
include/ggml-opt.h
271269
include/ggml-metal.h
272270
include/ggml-rpc.h

ggml/include/ggml-kompute.h

Lines changed: 0 additions & 50 deletions
This file was deleted.

ggml/src/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ ggml_add_backend(BLAS)
365365
ggml_add_backend(CANN)
366366
ggml_add_backend(CUDA)
367367
ggml_add_backend(HIP)
368-
ggml_add_backend(Kompute)
369368
ggml_add_backend(METAL)
370369
ggml_add_backend(MUSA)
371370
ggml_add_backend(RPC)

ggml/src/ggml-backend-reg.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@
6161
#include "ggml-cann.h"
6262
#endif
6363

64-
#ifdef GGML_USE_KOMPUTE
65-
#include "ggml-kompute.h"
66-
#endif
67-
6864
// disable C++17 deprecation warning for std::codecvt_utf8
6965
#if defined(__clang__)
7066
# pragma clang diagnostic push
@@ -189,9 +185,6 @@ struct ggml_backend_registry {
189185
#ifdef GGML_USE_RPC
190186
register_backend(ggml_backend_rpc_reg());
191187
#endif
192-
#ifdef GGML_USE_KOMPUTE
193-
register_backend(ggml_backend_kompute_reg());
194-
#endif
195188
#ifdef GGML_USE_CPU
196189
register_backend(ggml_backend_cpu_reg());
197190
#endif
@@ -575,7 +568,6 @@ void ggml_backend_load_all_from_path(const char * dir_path) {
575568
ggml_backend_load_best("cann", silent, dir_path);
576569
ggml_backend_load_best("cuda", silent, dir_path);
577570
ggml_backend_load_best("hip", silent, dir_path);
578-
ggml_backend_load_best("kompute", silent, dir_path);
579571
ggml_backend_load_best("metal", silent, dir_path);
580572
ggml_backend_load_best("rpc", silent, dir_path);
581573
ggml_backend_load_best("sycl", silent, dir_path);

ggml/src/ggml-kompute/CMakeLists.txt

Lines changed: 0 additions & 166 deletions
This file was deleted.

0 commit comments

Comments
 (0)