Skip to content

Commit ca12aae

Browse files
authored
Merge pull request #527 from doringeman/Makefile-rm-sglang-cpu
chore(makefile): remove sglang CPU variant
2 parents 4d8940a + 09c4d55 commit ca12aae

File tree

1 file changed

+7
-22
lines changed

1 file changed

+7
-22
lines changed

Makefile

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ VLLM_BASE_IMAGE := nvidia/cuda:13.0.2-runtime-ubuntu24.04
88
DOCKER_IMAGE := docker/model-runner:latest
99
DOCKER_IMAGE_VLLM := docker/model-runner:latest-vllm-cuda
1010
DOCKER_IMAGE_SGLANG := docker/model-runner:latest-sglang
11-
DOCKER_IMAGE_SGLANG_CUDA := docker/model-runner:latest-sglang-cuda
1211
DOCKER_TARGET ?= final-llamacpp
1312
PORT := 8080
1413
MODELS_PATH := $(shell pwd)/models-store
@@ -33,7 +32,7 @@ LICENSE ?=
3332
BUILD_DMR ?= 1
3433

3534
# Main targets
36-
.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-build-sglang-cuda docker-run-sglang-cuda docker-run-impl help validate lint model-distribution-tool
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
3736
# Default target
3837
.DEFAULT_GOAL := build
3938

@@ -118,29 +117,17 @@ docker-build-vllm:
118117
docker-run-vllm: docker-build-vllm
119118
@$(MAKE) -s docker-run-impl DOCKER_IMAGE=$(DOCKER_IMAGE_VLLM)
120119

121-
# Build SGLang Docker image (CPU variant)
120+
# Build SGLang Docker image
122121
docker-build-sglang:
123122
@$(MAKE) docker-build \
124123
DOCKER_TARGET=final-sglang \
125124
DOCKER_IMAGE=$(DOCKER_IMAGE_SGLANG) \
126-
LLAMA_SERVER_VARIANT=cpu \
127-
BASE_IMAGE=$(BASE_IMAGE)
128-
129-
# Run SGLang Docker container (CPU variant) with TCP port access and mounted model storage
130-
docker-run-sglang: docker-build-sglang
131-
@$(MAKE) -s docker-run-impl DOCKER_IMAGE=$(DOCKER_IMAGE_SGLANG)
132-
133-
# Build SGLang Docker image (CUDA variant)
134-
docker-build-sglang-cuda:
135-
@$(MAKE) docker-build \
136-
DOCKER_TARGET=final-sglang \
137-
DOCKER_IMAGE=$(DOCKER_IMAGE_SGLANG_CUDA) \
138125
LLAMA_SERVER_VARIANT=cuda \
139126
BASE_IMAGE=$(VLLM_BASE_IMAGE)
140127

141-
# Run SGLang Docker container (CUDA variant) with TCP port access and mounted model storage
142-
docker-run-sglang-cuda: docker-build-sglang-cuda
143-
@$(MAKE) -s docker-run-impl DOCKER_IMAGE=$(DOCKER_IMAGE_SGLANG_CUDA)
128+
# Run SGLang Docker container with TCP port access and mounted model storage
129+
docker-run-sglang: docker-build-sglang
130+
@$(MAKE) -s docker-run-impl DOCKER_IMAGE=$(DOCKER_IMAGE_SGLANG)
144131

145132
# Common implementation for running Docker container
146133
docker-run-impl:
@@ -204,10 +191,8 @@ help:
204191
@echo " docker-run - Run in Docker container with TCP port access and mounted model storage"
205192
@echo " docker-build-vllm - Build vLLM Docker image"
206193
@echo " docker-run-vllm - Run vLLM Docker container"
207-
@echo " docker-build-sglang - Build SGLang Docker image (CPU)"
208-
@echo " docker-run-sglang - Run SGLang Docker container (CPU)"
209-
@echo " docker-build-sglang-cuda - Build SGLang Docker image (CUDA)"
210-
@echo " docker-run-sglang-cuda - Run SGLang Docker container (CUDA)"
194+
@echo " docker-build-sglang - Build SGLang Docker image"
195+
@echo " docker-run-sglang - Run SGLang Docker container"
211196
@echo " help - Show this help message"
212197
@echo ""
213198
@echo "Model distribution tool targets:"

0 commit comments

Comments
 (0)