Skip to content

Commit 65f4420

Browse files
authored
Remove unused final-diffusers Docker image variant and fix duplicate backend registration (#768)
* remove diffusers from Docker configuration and related files (it has been updated to be deferred backend) * fix: remove diffusers backend from main.go as it has been updated to deferred backend
1 parent 3c1be71 commit 65f4420

5 files changed

Lines changed: 0 additions & 81 deletions

File tree

Dockerfile

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -147,59 +147,6 @@ RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
147147

148148
RUN /opt/sglang-env/bin/python -c "import sglang; print(sglang.__version__)" > /opt/sglang-env/version
149149

150-
# --- Diffusers variant ---
151-
FROM llamacpp AS diffusers
152-
153-
# Python package versions for reproducible builds
154-
ARG DIFFUSERS_VERSION=0.36.0
155-
ARG TORCH_VERSION=2.9.1
156-
ARG TRANSFORMERS_VERSION=4.57.5
157-
ARG ACCELERATE_VERSION=1.3.0
158-
ARG SAFETENSORS_VERSION=0.5.2
159-
ARG HUGGINGFACE_HUB_VERSION=0.34.0
160-
ARG BITSANDBYTES_VERSION=0.49.1
161-
ARG FASTAPI_VERSION=0.115.12
162-
ARG UVICORN_VERSION=0.34.1
163-
ARG PILLOW_VERSION=11.2.1
164-
165-
USER root
166-
167-
RUN apt update && apt install -y \
168-
python3 python3-venv python3-dev \
169-
curl ca-certificates build-essential \
170-
&& rm -rf /var/lib/apt/lists/*
171-
172-
RUN mkdir -p /opt/diffusers-env && chown -R modelrunner:modelrunner /opt/diffusers-env
173-
174-
USER modelrunner
175-
176-
# Install uv and diffusers as modelrunner user
177-
RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
178-
&& ~/.local/bin/uv venv --python /usr/bin/python3 /opt/diffusers-env \
179-
&& ~/.local/bin/uv pip install --python /opt/diffusers-env/bin/python \
180-
"diffusers==${DIFFUSERS_VERSION}" \
181-
"torch==${TORCH_VERSION}" \
182-
"transformers==${TRANSFORMERS_VERSION}" \
183-
"accelerate==${ACCELERATE_VERSION}" \
184-
"safetensors==${SAFETENSORS_VERSION}" \
185-
"huggingface_hub==${HUGGINGFACE_HUB_VERSION}" \
186-
"bitsandbytes==${BITSANDBYTES_VERSION}" \
187-
"fastapi==${FASTAPI_VERSION}" \
188-
"uvicorn[standard]==${UVICORN_VERSION}" \
189-
"pillow==${PILLOW_VERSION}"
190-
191-
# Copy Python server code
192-
USER root
193-
COPY python/diffusers_server /tmp/diffusers_server/
194-
RUN PYTHON_SITE_PACKAGES=$(/opt/diffusers-env/bin/python -c "import site; print(site.getsitepackages()[0])") && \
195-
mkdir -p "$PYTHON_SITE_PACKAGES/diffusers_server" && \
196-
cp -r /tmp/diffusers_server/* "$PYTHON_SITE_PACKAGES/diffusers_server/" && \
197-
chown -R modelrunner:modelrunner "$PYTHON_SITE_PACKAGES/diffusers_server/" && \
198-
rm -rf /tmp/diffusers_server
199-
USER modelrunner
200-
201-
RUN /opt/diffusers-env/bin/python -c "import diffusers; print(diffusers.__version__)" > /opt/diffusers-env/version
202-
203150
FROM llamacpp AS final-llamacpp
204151
# Copy the built binary from builder
205152
COPY --from=builder /app/model-runner /app/model-runner
@@ -211,7 +158,3 @@ COPY --from=builder /app/model-runner /app/model-runner
211158
FROM sglang AS final-sglang
212159
# Copy the built binary from builder-sglang (without vLLM)
213160
COPY --from=builder-sglang /app/model-runner /app/model-runner
214-
215-
FROM diffusers AS final-diffusers
216-
# Copy the built binary from builder (with diffusers support)
217-
COPY --from=builder /app/model-runner /app/model-runner

Makefile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ VLLM_VERSION ?= 0.17.0
99
DOCKER_IMAGE := docker/model-runner:latest
1010
DOCKER_IMAGE_VLLM := docker/model-runner:latest-vllm-cuda
1111
DOCKER_IMAGE_SGLANG := docker/model-runner:latest-sglang
12-
DOCKER_IMAGE_DIFFUSERS := docker/model-runner:latest-diffusers
1312
DOCKER_TARGET ?= final-llamacpp
1413
PORT := 8080
1514
LLAMA_ARGS ?=
@@ -31,7 +30,6 @@ BUILD_DMR ?= 1
3130
.PHONY: validate validate-all lint help
3231
.PHONY: docker-build docker-build-multiplatform docker-run docker-run-impl
3332
.PHONY: docker-build-vllm docker-run-vllm docker-build-sglang docker-run-sglang
34-
.PHONY: docker-build-diffusers docker-run-diffusers
3533
.PHONY: test-docker-ce-installation
3634
.PHONY: vllm-metal-build vllm-metal-install vllm-metal-dev vllm-metal-clean
3735
.PHONY: diffusers-build diffusers-install diffusers-dev diffusers-clean
@@ -151,16 +149,6 @@ docker-build-sglang:
151149
docker-run-sglang: docker-build-sglang
152150
@$(MAKE) -s docker-run-impl DOCKER_IMAGE=$(DOCKER_IMAGE_SGLANG)
153151

154-
# Build Diffusers Docker image
155-
docker-build-diffusers:
156-
@$(MAKE) docker-build \
157-
DOCKER_TARGET=final-diffusers \
158-
DOCKER_IMAGE=$(DOCKER_IMAGE_DIFFUSERS)
159-
160-
# Run Diffusers Docker container with TCP port access and mounted model storage
161-
docker-run-diffusers: docker-build-diffusers
162-
@$(MAKE) -s docker-run-impl DOCKER_IMAGE=$(DOCKER_IMAGE_DIFFUSERS)
163-
164152
# Common implementation for running Docker container
165153
docker-run-impl:
166154
@echo ""
@@ -338,8 +326,6 @@ help:
338326
@echo " docker-run-vllm - Run vLLM Docker container"
339327
@echo " docker-build-sglang - Build SGLang Docker image"
340328
@echo " docker-run-sglang - Run SGLang Docker container"
341-
@echo " docker-build-diffusers - Build Diffusers Docker image"
342-
@echo " docker-run-diffusers - Run Diffusers Docker container"
343329
@echo " vllm-metal-build - Build vllm-metal tarball locally (macOS ARM64)"
344330
@echo " vllm-metal-install - Install vllm-metal from local tarball"
345331
@echo " vllm-metal-dev - Install vllm-metal from local source (editable)"

cmd/cli/pkg/standalone/controller_image.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"os"
55

66
gpupkg "github.com/docker/model-runner/cmd/cli/pkg/gpu"
7-
"github.com/docker/model-runner/pkg/inference/backends/diffusers"
87
"github.com/docker/model-runner/pkg/inference/backends/vllm"
98
)
109

@@ -33,10 +32,6 @@ func controllerImageVariant(detectedGPU gpupkg.GPUSupport, backend string) strin
3332
if backend == vllm.Name {
3433
return "vllm-cuda"
3534
}
36-
// If diffusers backend is requested, return diffusers variant
37-
if backend == diffusers.Name {
38-
return "diffusers"
39-
}
4035
// Default to llama.cpp backend behavior
4136
switch detectedGPU {
4237
case gpupkg.GPUSupportCUDA:

main.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717

1818
"github.com/docker/model-runner/pkg/envconfig"
1919
"github.com/docker/model-runner/pkg/inference"
20-
"github.com/docker/model-runner/pkg/inference/backends/diffusers"
2120
"github.com/docker/model-runner/pkg/inference/backends/llamacpp"
2221
"github.com/docker/model-runner/pkg/inference/backends/sglang"
2322
"github.com/docker/model-runner/pkg/inference/config"
@@ -132,9 +131,6 @@ func main() {
132131
routing.BackendDef{Name: sglang.Name, Init: func(mm *models.Manager) (inference.Backend, error) {
133132
return sglang.New(log, mm, log.With("component", sglang.Name), nil, sglangServerPath)
134133
}},
135-
routing.BackendDef{Name: diffusers.Name, Init: func(mm *models.Manager) (inference.Backend, error) {
136-
return diffusers.New(log, mm, log.With("component", diffusers.Name), nil, diffusersServerPath)
137-
}},
138134
),
139135
OnBackendError: func(name string, err error) {
140136
log.Error("unable to initialize backend", "backend", name, "error", err)

scripts/docker-run.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
add_accelerators() {
44
# Add NVIDIA GPU support for CUDA variants and GPU-accelerated backends
55
if [[ "${DOCKER_IMAGE-}" == *"-cuda" ]] || \
6-
[[ "${DOCKER_IMAGE-}" == *"-diffusers" ]] || \
76
[[ "${DOCKER_IMAGE-}" == *"-sglang" ]]; then
87
if docker info -f '{{range $k, $v := .Runtimes}}{{$k}}{{"\n"}}{{end}}' 2>/dev/null | grep -qx "nvidia"; then
98
args+=("--gpus" "all" "--runtime=nvidia")

0 commit comments

Comments
 (0)