Skip to content

Commit da1af52

Browse files
committed
cleanup: drop bloomz and ggllm as now supported by llama.cpp
Signed-off-by: Ettore Di Giacinto <[email protected]>
1 parent f227e91 commit da1af52

File tree

5 files changed

+2
-290
lines changed

5 files changed

+2
-290
lines changed

Makefile

+2-38
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,9 @@ BERT_VERSION?=6abe312cded14042f6b7c3cd8edf082713334a4d
3030
# go-piper version
3131
PIPER_VERSION?=56b8a81b4760a6fbee1a82e62f007ae7e8f010a7
3232

33-
# go-bloomz version
34-
BLOOMZ_VERSION?=1834e77b83faafe912ad4092ccf7f77937349e2f
35-
3633
# stablediffusion version
3734
STABLEDIFFUSION_VERSION?=d89260f598afb809279bc72aa0107b4292587632
3835

39-
# Go-ggllm
40-
GOGGLLM_VERSION?=862477d16eefb0805261c19c9b0d053e3b2b684b
41-
4236
export BUILD_TYPE?=
4337
export STABLE_BUILD_TYPE?=$(BUILD_TYPE)
4438
export CMAKE_ARGS?=
@@ -129,7 +123,7 @@ ifeq ($(findstring tts,$(GO_TAGS)),tts)
129123
OPTIONAL_GRPC+=backend-assets/grpc/piper
130124
endif
131125

132-
ALL_GRPC_BACKENDS=backend-assets/grpc/langchain-huggingface backend-assets/grpc/falcon-ggml backend-assets/grpc/bert-embeddings backend-assets/grpc/falcon backend-assets/grpc/bloomz backend-assets/grpc/llama backend-assets/grpc/llama-cpp backend-assets/grpc/llama-stable backend-assets/grpc/gpt4all backend-assets/grpc/dolly backend-assets/grpc/gpt2 backend-assets/grpc/gptj backend-assets/grpc/gptneox backend-assets/grpc/mpt backend-assets/grpc/replit backend-assets/grpc/starcoder backend-assets/grpc/rwkv backend-assets/grpc/whisper $(OPTIONAL_GRPC)
126+
ALL_GRPC_BACKENDS=backend-assets/grpc/langchain-huggingface backend-assets/grpc/falcon-ggml backend-assets/grpc/bert-embeddings backend-assets/grpc/llama backend-assets/grpc/llama-cpp backend-assets/grpc/llama-stable backend-assets/grpc/gpt4all backend-assets/grpc/dolly backend-assets/grpc/gpt2 backend-assets/grpc/gptj backend-assets/grpc/gptneox backend-assets/grpc/mpt backend-assets/grpc/replit backend-assets/grpc/starcoder backend-assets/grpc/rwkv backend-assets/grpc/whisper $(OPTIONAL_GRPC)
133127
GRPC_BACKENDS?=$(ALL_GRPC_BACKENDS) $(OPTIONAL_GRPC)
134128

135129
# If empty, then we build all
@@ -146,14 +140,6 @@ gpt4all:
146140
git clone --recurse-submodules $(GPT4ALL_REPO) gpt4all
147141
cd gpt4all && git checkout -b build $(GPT4ALL_VERSION) && git submodule update --init --recursive --depth 1
148142

149-
## go-ggllm
150-
go-ggllm:
151-
git clone --recurse-submodules https://github.com/mudler/go-ggllm.cpp go-ggllm
152-
cd go-ggllm && git checkout -b build $(GOGGLLM_VERSION) && git submodule update --init --recursive --depth 1
153-
154-
go-ggllm/libggllm.a: go-ggllm
155-
$(MAKE) -C go-ggllm BUILD_TYPE=$(BUILD_TYPE) libggllm.a
156-
157143
## go-piper
158144
go-piper:
159145
git clone --recurse-submodules https://github.com/mudler/go-piper go-piper
@@ -180,14 +166,6 @@ go-rwkv:
180166
go-rwkv/librwkv.a: go-rwkv
181167
cd go-rwkv && cd rwkv.cpp && cmake . -DRWKV_BUILD_SHARED_LIBRARY=OFF && cmake --build . && cp librwkv.a ..
182168

183-
## bloomz
184-
bloomz:
185-
git clone --recurse-submodules https://github.com/go-skynet/bloomz.cpp bloomz
186-
cd bloomz && git checkout -b build $(BLOOMZ_VERSION) && git submodule update --init --recursive --depth 1
187-
188-
bloomz/libbloomz.a: bloomz
189-
cd bloomz && make libbloomz.a
190-
191169
go-bert/libgobert.a: go-bert
192170
$(MAKE) -C go-bert libgobert.a
193171

@@ -241,7 +219,7 @@ go-llama-stable/libbinding.a: go-llama-stable
241219
go-piper/libpiper_binding.a: go-piper
242220
$(MAKE) -C go-piper libpiper_binding.a example/main
243221

244-
get-sources: go-llama go-llama-stable go-ggllm go-ggml-transformers gpt4all go-piper go-rwkv whisper.cpp go-bert bloomz go-stable-diffusion
222+
get-sources: go-llama go-llama-stable go-ggml-transformers gpt4all go-piper go-rwkv whisper.cpp go-bert go-stable-diffusion
245223
touch $@
246224

247225
replace:
@@ -250,10 +228,8 @@ replace:
250228
$(GOCMD) mod edit -replace github.com/donomii/go-rwkv.cpp=$(shell pwd)/go-rwkv
251229
$(GOCMD) mod edit -replace github.com/ggerganov/whisper.cpp=$(shell pwd)/whisper.cpp
252230
$(GOCMD) mod edit -replace github.com/go-skynet/go-bert.cpp=$(shell pwd)/go-bert
253-
$(GOCMD) mod edit -replace github.com/go-skynet/bloomz.cpp=$(shell pwd)/bloomz
254231
$(GOCMD) mod edit -replace github.com/mudler/go-stable-diffusion=$(shell pwd)/go-stable-diffusion
255232
$(GOCMD) mod edit -replace github.com/mudler/go-piper=$(shell pwd)/go-piper
256-
$(GOCMD) mod edit -replace github.com/mudler/go-ggllm.cpp=$(shell pwd)/go-ggllm
257233

258234
prepare-sources: get-sources replace
259235
$(GOCMD) mod download
@@ -269,9 +245,7 @@ rebuild: ## Rebuilds the project
269245
$(MAKE) -C whisper.cpp clean
270246
$(MAKE) -C go-stable-diffusion clean
271247
$(MAKE) -C go-bert clean
272-
$(MAKE) -C bloomz clean
273248
$(MAKE) -C go-piper clean
274-
$(MAKE) -C go-ggllm clean
275249
$(MAKE) build
276250

277251
prepare: prepare-sources $(OPTIONAL_TARGETS)
@@ -289,10 +263,8 @@ clean: ## Remove build related file
289263
rm -rf ./backend-assets
290264
rm -rf ./go-rwkv
291265
rm -rf ./go-bert
292-
rm -rf ./bloomz
293266
rm -rf ./whisper.cpp
294267
rm -rf ./go-piper
295-
rm -rf ./go-ggllm
296268
rm -rf $(BINARY_NAME)
297269
rm -rf release/
298270
$(MAKE) -C backend/cpp/llama clean
@@ -418,10 +390,6 @@ protogen-python:
418390
backend-assets/grpc:
419391
mkdir -p backend-assets/grpc
420392

421-
backend-assets/grpc/falcon: backend-assets/grpc go-ggllm/libggllm.a
422-
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(shell pwd)/go-ggllm LIBRARY_PATH=$(shell pwd)/go-ggllm \
423-
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/falcon ./cmd/grpc/falcon/
424-
425393
backend-assets/grpc/llama: backend-assets/grpc go-llama/libbinding.a
426394
$(GOCMD) mod edit -replace github.com/go-skynet/go-llama.cpp=$(shell pwd)/go-llama
427395
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(shell pwd)/go-llama LIBRARY_PATH=$(shell pwd)/go-llama \
@@ -486,10 +454,6 @@ backend-assets/grpc/rwkv: backend-assets/grpc go-rwkv/librwkv.a
486454
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(shell pwd)/go-rwkv LIBRARY_PATH=$(shell pwd)/go-rwkv \
487455
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/rwkv ./cmd/grpc/rwkv/
488456

489-
backend-assets/grpc/bloomz: backend-assets/grpc bloomz/libbloomz.a
490-
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(shell pwd)/bloomz LIBRARY_PATH=$(shell pwd)/bloomz \
491-
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/bloomz ./cmd/grpc/bloomz/
492-
493457
backend-assets/grpc/bert-embeddings: backend-assets/grpc go-bert/libgobert.a
494458
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(shell pwd)/go-bert LIBRARY_PATH=$(shell pwd)/go-bert \
495459
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/bert-embeddings ./cmd/grpc/bert-embeddings/

cmd/grpc/bloomz/main.go

-23
This file was deleted.

cmd/grpc/falcon/main.go

-25
This file was deleted.

pkg/backend/llm/bloomz/bloomz.go

-59
This file was deleted.

pkg/backend/llm/falcon/falcon.go

-145
This file was deleted.

0 commit comments

Comments
 (0)