Skip to content

Commit 7804e42

Browse files
authored
Merge pull request #570 from doringeman/rm-mdltool
chore: remove mdltool
2 parents 5a561e9 + 5bb4243 commit 7804e42

7 files changed

Lines changed: 14 additions & 1027 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,3 @@ jobs:
6060

6161
- name: validate
6262
run: make validate
63-
64-
- name: model-distribution # TODO: Create a single Makefile for the monorepo
65-
run: make -C ./pkg/distribution/ all

.gitignore

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
.idea/
2-
model-distribution-tool
32
model-runner
43
model-runner.sock
54
docker-model
65
# Default MODELS_PATH in Makefile
76
models-store/
8-
# Default MODELS_PATH in mdltool
9-
model-store/
107
# Directory where we store the updated llama.cpp
118
updated-inference/
129
vendor/
1310

14-
# monorepo migration
15-
# model-distribution
16-
pkg/distribution/bin/
17-
/parallelget
18-
/cli
19-
2011
llamacpp/build
2112
llamacpp/install
2213

Makefile

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,18 @@ DOCKER_BUILD_ARGS := \
2121
--target $(DOCKER_TARGET) \
2222
-t $(DOCKER_IMAGE)
2323

24-
# Model distribution tool configuration
25-
MDL_TOOL_NAME := model-distribution-tool
26-
STORE_PATH ?= ./model-store
27-
SOURCE ?=
28-
TAG ?=
29-
LICENSE ?=
30-
3124
# Test configuration
3225
BUILD_DMR ?= 1
3326

3427
# Main targets
35-
.PHONY: build run clean test integration-tests test-docker-ce-installation docker-build docker-build-multiplatform docker-run docker-build-vllm docker-run-vllm docker-build-sglang docker-run-sglang docker-run-impl help validate lint model-distribution-tool
28+
.PHONY: build run clean test integration-tests test-docker-ce-installation docker-build docker-build-multiplatform docker-run docker-build-vllm docker-run-vllm docker-build-sglang docker-run-sglang docker-run-impl help validate lint
3629
# Default target
3730
.DEFAULT_GOAL := build
3831

3932
# Build the Go application
4033
build:
4134
CGO_ENABLED=1 go build -ldflags="-s -w" -o $(APP_NAME) .
4235

43-
# Build model-distribution-tool
44-
model-distribution-tool:
45-
CGO_ENABLED=1 go build -ldflags="-s -w" -o $(MDL_TOOL_NAME) ./cmd/mdltool
46-
4736
# Run the application locally
4837
run: build
4938
@LLAMACPP_BIN="llamacpp/install/bin"; \
@@ -56,7 +45,6 @@ run: build
5645
# Clean build artifacts
5746
clean:
5847
rm -f $(APP_NAME)
59-
rm -f $(MDL_TOOL_NAME)
6048
rm -f model-runner.sock
6149
rm -rf $(MODELS_PATH)
6250

@@ -145,40 +133,10 @@ docker-run-impl:
145133
DEBUG="${DEBUG}" \
146134
scripts/docker-run.sh
147135

148-
# Model distribution tool operations
149-
mdl-pull: model-distribution-tool
150-
@echo "Pulling model from $(TAG)..."
151-
./$(MDL_TOOL_NAME) --store-path $(STORE_PATH) pull $(TAG)
152-
153-
mdl-package: model-distribution-tool
154-
@echo "Packaging model $(SOURCE) to $(TAG)..."
155-
./$(MDL_TOOL_NAME) package --tag $(TAG) $(if $(LICENSE),--licenses $(LICENSE)) $(SOURCE)
156-
157-
mdl-list: model-distribution-tool
158-
@echo "Listing models..."
159-
./$(MDL_TOOL_NAME) --store-path $(STORE_PATH) list
160-
161-
mdl-get: model-distribution-tool
162-
@echo "Getting model $(TAG)..."
163-
./$(MDL_TOOL_NAME) --store-path $(STORE_PATH) get $(TAG)
164-
165-
mdl-get-path: model-distribution-tool
166-
@echo "Getting path for model $(TAG)..."
167-
./$(MDL_TOOL_NAME) --store-path $(STORE_PATH) get-path $(TAG)
168-
169-
mdl-rm: model-distribution-tool
170-
@echo "Removing model $(TAG)..."
171-
./$(MDL_TOOL_NAME) --store-path $(STORE_PATH) rm $(TAG)
172-
173-
mdl-tag: model-distribution-tool
174-
@echo "Tagging model $(SOURCE) as $(TAG)..."
175-
./$(MDL_TOOL_NAME) --store-path $(STORE_PATH) tag $(SOURCE) $(TAG)
176-
177136
# Show help
178137
help:
179138
@echo "Available targets:"
180139
@echo " build - Build the Go application"
181-
@echo " model-distribution-tool - Build the model distribution tool"
182140
@echo " run - Run the application locally"
183141
@echo " clean - Clean build artifacts"
184142
@echo " test - Run tests"
@@ -195,15 +153,6 @@ help:
195153
@echo " docker-run-sglang - Run SGLang Docker container"
196154
@echo " help - Show this help message"
197155
@echo ""
198-
@echo "Model distribution tool targets:"
199-
@echo " mdl-pull - Pull a model (TAG=registry/model:tag)"
200-
@echo " mdl-package - Package and push a model (SOURCE=path/to/model.gguf TAG=registry/model:tag LICENSE=path/to/license.txt)"
201-
@echo " mdl-list - List all models"
202-
@echo " mdl-get - Get model info (TAG=registry/model:tag)"
203-
@echo " mdl-get-path - Get model path (TAG=registry/model:tag)"
204-
@echo " mdl-rm - Remove a model (TAG=registry/model:tag)"
205-
@echo " mdl-tag - Tag a model (SOURCE=registry/model:tag TAG=registry/model:newtag)"
206-
@echo ""
207156
@echo "Backend configuration options:"
208157
@echo " LLAMA_ARGS - Arguments for llama.cpp (e.g., \"--verbose --jinja -ngl 999 --ctx-size 2048\")"
209158
@echo " LOCAL_LLAMA - Use local llama.cpp build from llamacpp/install/bin (set to 1 to enable)"
@@ -212,10 +161,3 @@ help:
212161
@echo " make run LLAMA_ARGS=\"--verbose --jinja -ngl 999 --ctx-size 2048\""
213162
@echo " make run LOCAL_LLAMA=1"
214163
@echo " make docker-run LLAMA_ARGS=\"--verbose --jinja -ngl 999 --threads 4 --ctx-size 2048\""
215-
@echo ""
216-
@echo "Model distribution tool examples:"
217-
@echo " make mdl-pull TAG=registry.example.com/models/llama:v1.0"
218-
@echo " make mdl-package SOURCE=./model.gguf TAG=registry.example.com/models/llama:v1.0 LICENSE=./license.txt"
219-
@echo " make mdl-package SOURCE=./qwen2.5-3b-instruct TAG=registry.example.com/models/qwen:v1.0"
220-
@echo " make mdl-list"
221-
@echo " make mdl-rm TAG=registry.example.com/models/llama:v1.0"

0 commit comments

Comments
 (0)