Skip to content

Commit cbfdf1b

Browse files
mixa3607mixa3607
committed
docs/scripts
1 parent 0fbc0bc commit cbfdf1b

22 files changed

+81
-101
lines changed

‎comfyui/build-and-push.comfyui.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cd $(dirname $0)
55
source ../env.sh
66

77
IMAGE_TAGS=(
8+
"$COMFYUI_IMAGE:${COMFYUI_GIT_REF}-torch-${COMFYUI_PYTORCH_VERSION}-rocm-${COMFYUI_ROCM_VERSION}-patch-${REPO_GIT_REF}"
89
"$COMFYUI_IMAGE:${COMFYUI_GIT_REF}-rocm-${COMFYUI_ROCM_VERSION}-patch-${REPO_GIT_REF}"
910
"$COMFYUI_IMAGE:${COMFYUI_GIT_REF}-rocm-${COMFYUI_ROCM_VERSION}"
1011
"$COMFYUI_IMAGE:latest-rocm-${COMFYUI_ROCM_VERSION}"
@@ -22,6 +23,5 @@ done
2223

2324
mkdir ./logs || true
2425
docker buildx build ${DOCKER_EXTRA_ARGS[@]} --push \
25-
--build-arg BASE_ROCM_IMAGE=$PATCHED_ROCM_IMAGE:${COMFYUI_ROCM_VERSION}-complete \
26-
--build-arg BASE_COMFY_IMAGE=$COMFYUI_BASE_IMAGE \
26+
--build-arg BASE_PYTORCH_IMAGE=$COMFYUI_TORCH_IMAGE:${COMFYUI_PYTORCH_VERSION}-rocm-${COMFYUI_ROCM_VERSION} \
2727
--progress=plain --target final -f ./comfyui.Dockerfile --push ./submodules/ComfyUI 2>&1 | tee ./logs/build_$(date +%Y%m%d%H%M%S).log

‎comfyui/comfyui.Dockerfile‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,7 @@
1-
ARG BASE_ROCM_IMAGE=docker.io/mixa3607/rocm-gfx906:6.4.4-complete
2-
ARG BASE_COMFY_IMAGE=docker.io/library/ubuntu:24.04
1+
ARG BASE_PYTORCH_IMAGE=docker.io/mixa3607/pytorch-gfx906:v2.7.1-rocm-6.3.3
32

4-
FROM ${BASE_ROCM_IMAGE} AS rocm
5-
RUN echo "Detected rocm version is $(cat /opt/ROCM_VERSION_FULL)" && \
6-
mkdir -p /comfy-rocm/rocm/lib && \
7-
cp -R /opt/rocm-$(cat /opt/ROCM_VERSION_FULL)/lib/rocblas /comfy-rocm/rocm/lib && \
8-
cp -R /opt/ROCM_* /comfy-rocm && \
9-
true
10-
11-
FROM ${BASE_COMFY_IMAGE} AS final
3+
FROM ${BASE_PYTORCH_IMAGE} AS final
124
WORKDIR /comfyui
13-
COPY --from=rocm /comfy-rocm /opt
145
COPY ./requirements.txt ./requirements.txt
15-
RUN apt-get update && apt-get install -y python3-pip && \
16-
python3 -m pip config set global.break-system-packages true && \
17-
(pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm$(cat /opt/ROCM_VERSION) || \
18-
pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm$(cat /opt/ROCM_VERSION)) && \
19-
pip install -r requirements.txt && \
20-
TORCH_DIR=$(pip show torch | sed -nE 's|Location: (.*)|\1|1p')/torch && \
21-
echo "Detected torch dir is $TORCH_DIR" && \
22-
rm -r $TORCH_DIR/lib/rocblas && \
23-
ln -s /opt/rocm/lib/rocblas $TORCH_DIR/lib/rocblas && \
24-
true
25-
6+
RUN sed -i 's|torchaudio||g' requirements.txt && pip install -r requirements.txt
267
COPY ./ ./

‎comfyui/env.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ if [ "$COMFYUI_IMAGE" == "" ]; then
66
COMFYUI_IMAGE=docker.io/mixa3607/comfyui-gfx906
77
fi
88

9-
if [ "$COMFYUI_BASE_IMAGE" == "" ]; then
10-
COMFYUI_BASE_IMAGE="docker.io/library/ubuntu:24.04"
9+
if [ "$COMFYUI_TORCH_IMAGE" == "" ]; then
10+
COMFYUI_TORCH_IMAGE="docker.io/mixa3607/pytorch-gfx906"
1111
fi
12-
1312
if [ "$COMFYUI_ROCM_VERSION" == "" ]; then
14-
COMFYUI_ROCM_VERSION="6.4.4"
13+
COMFYUI_ROCM_VERSION="6.3.3"
14+
fi
15+
if [ "$COMFYUI_PYTORCH_VERSION" == "" ]; then
16+
COMFYUI_PYTORCH_VERSION="v2.7.1"
1517
fi
1618

1719
if [ "$COMFYUI_GIT_REF" == "" ]; then

‎comfyui/preset.rocm-6.3.3.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
export COMFYUI_ROCM_VERSION="6.3.3"
4+
export COMFYUI_PYTORCH_VERSION="v2.7.1"

‎comfyui/preset.rocm-6.4.4.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/bin/bash
22

33
export COMFYUI_ROCM_VERSION="6.4.4"
4+
export COMFYUI_PYTORCH_VERSION="v2.7.1"

‎comfyui/readme.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ The most powerful and modular diffusion model GUI, api and backend with a graph/
33

44
Recommend use `docker.io/mixa3607/comfyui-gfx906:latest-rocm-6.4.4`
55

6+
## Benchmarks
7+
| tag | rocm | comfy | pytorch | preset | batch | exec time (sec) |
8+
|------------------------------------------------------|-------|---------|---------|--------|-------|-----------------|
9+
| v0.3.63-torch-v2.7.1-rocm-6.4.4-patch-20251010004720 | 6.4.4 | v0.3.63 | v2.7.1 | SDXL | 1 | 33 |
10+
| v0.3.63-torch-v2.7.1-rocm-6.4.4-patch-20251010004720 | 6.4.4 | v0.3.63 | v2.7.1 | SDXL | 2 | 65 |
11+
| v0.3.63-torch-v2.7.1-rocm-6.4.4-patch-20251010004720 | 6.4.4 | v0.3.63 | v2.7.1 | SD 1.5 | 1 | 3,8 |
12+
| v0.3.63-torch-v2.7.1-rocm-6.4.4-patch-20251010004720 | 6.4.4 | v0.3.63 | v2.7.1 | SD 1.5 | 2 | 7 |
13+
| v0.3.63-torch-v2.7.1-rocm-6.3.3-patch-20251010004720 | 6.3.3 | v0.3.63 | v2.7.1 | SDXL | 1 | 33 |
14+
| v0.3.63-torch-v2.7.1-rocm-6.3.3-patch-20251010004720 | 6.3.3 | v0.3.63 | v2.7.1 | SDXL | 2 | 65 |
15+
| v0.3.63-torch-v2.7.1-rocm-6.3.3-patch-20251010004720 | 6.3.3 | v0.3.63 | v2.7.1 | SD 1.5 | 1 | 3,8 |
16+
| v0.3.63-torch-v2.7.1-rocm-6.3.3-patch-20251010004720 | 6.3.3 | v0.3.63 | v2.7.1 | SD 1.5 | 2 | 7 |
17+
618
## Run
719
### Docker
820
See https://github.com/hartmark/sd-rocm/blob/main/docker-compose.yml

‎llama.cpp/build-and-push.rocm.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ cd $(dirname $0)
55
source ../env.sh
66

77
IMAGE_TAGS=(
8-
"$PATCHED_LLAMA_IMAGE:full-${LLAMA_GIT_REF}-rocm-${LLAMA_ROCM_VERSION}-patch-${REPO_GIT_REF}"
9-
"$PATCHED_LLAMA_IMAGE:full-${LLAMA_GIT_REF}-rocm-${LLAMA_ROCM_VERSION}"
10-
"$PATCHED_LLAMA_IMAGE:full-rocm-${LLAMA_ROCM_VERSION}"
8+
"$LLAMA_IMAGE:full-${LLAMA_GIT_REF}-rocm-${LLAMA_ROCM_VERSION}-patch-${REPO_GIT_REF}"
9+
"$LLAMA_IMAGE:full-${LLAMA_GIT_REF}-rocm-${LLAMA_ROCM_VERSION}"
10+
"$LLAMA_IMAGE:full-rocm-${LLAMA_ROCM_VERSION}"
1111
)
1212

1313
if docker_image_pushed ${IMAGE_TAGS[0]}; then

‎llama.cpp/env.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
pushd $(dirname ${BASH_SOURCE[0]})
44

5-
if [ "$PATCHED_LLAMA_IMAGE" == "" ]; then
6-
PATCHED_LLAMA_IMAGE=docker.io/mixa3607/llama.cpp-gfx906:full-rocm-7.0.0
5+
if [ "$LLAMA_IMAGE" == "" ]; then
6+
LLAMA_IMAGE=docker.io/mixa3607/llama.cpp-gfx906
77
fi
88

99
# rocm ver

‎llama.cpp/submodules/llama.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit ef4c5b87ea2556ff8ca99cca3abdf48bdbca22f2
1+
Subproject commit e60f01d941bc5b7fae62dd57fee4cec76ec0ea6e

‎pytorch/build-and-push.torch.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ mkdir ./logs || true
2323
docker buildx build ${DOCKER_EXTRA_ARGS[@]} --push \
2424
--build-arg BASE_ROCM_IMAGE="${PATCHED_ROCM_IMAGE}:${TORCH_ROCM_VERSION}-complete" \
2525
--build-arg ROCM_ARCH="${ROCM_ARCH}" \
26-
--build-arg PYTORCH_BRANCH=$TORCH_BRANCH \
27-
--build-arg PYTORCH_VISION_BRANCH=$TORCH_VISION_BRANCH \
26+
--build-arg PYTORCH_BRANCH=$TORCH_VERSION \
27+
--build-arg PYTORCH_VISION_BRANCH=$TORCH_VISION_VERSION \
2828
--target final -f ./torch.Dockerfile --progress=plain ./submodules 2>&1 | tee ./logs/build_$(date +%Y%m%d%H%M%S).log

0 commit comments

Comments
 (0)