Update README.md

.gitea/workflows/build-comfyui-cuda.yaml

@@ -0,0 +1,41 @@
+name: Docker Build and Release Upload
+
+on:
+  push:
+    branches:
+      - torchaudio-builder
+
+jobs:
+
+  # Build ComfyUI-Rocm
+  build-comfyui-cuda:
+    runs-on: alpine-linux
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to docker.mistox.net
+        uses: docker/login-action@v3
+        with:
+          registry: docker.mistox.net
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: build and push comfyui-cuda
+        run: |
+          docker buildx build \
+          --platform=linux/arm64 \
+          -t docker.mistox.net/comfyui-cuda-ampere:latest \
+          -t mistox/comfyui-cuda-ampere:latest \
+          -f comfyui-cuda-dockerfile \
+          --push \
+          .

.gitea/workflows/build-comfyui-rocm.yaml

@@ -0,0 +1,51 @@
+name: Docker Build and Release Upload
+
+on:
+  push:
+    branches:
+      - torchaudio-builder
+
+jobs:
+
+  # Build ComfyUI-Rocm
+  build-comfyui-rocm:
+    runs-on: alpine-linux
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to docker.mistox.net
+        uses: docker/login-action@v3
+        with:
+          registry: docker.mistox.net
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: build and push rocm-aarch64-base
+        run: |
+          docker buildx build \
+          --platform=linux/arm64 \
+          -t docker.mistox.net/rocm-aarch64-base:latest \
+          -t mistox/rocm-aarch64-base:latest \
+          -f rocm-base-aarch64-dockerfile \
+          --push \
+          .
+
+      - name: build and push comfyui-rocm
+        run: |
+          docker buildx build \
+          --platform=linux/arm64 \
+          -t docker.mistox.net/comfyui-rocm-ampere:latest \
+          -t mistox/comfyui-rocm-ampere:latest \
+          -f comfyui-rocm-dockerfile \
+          --push \
+          .

.gitea/workflows/build-uvicorn.yaml

@@ -0,0 +1,41 @@
+name: Docker Build and Release Upload
+
+on:
+  push:
+    branches:
+      - torchaudio-builder
+
+jobs:
+
+  # Build uvicorn
+  build-uvicorn:
+    runs-on: alpine-linux
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to docker.mistox.net
+        uses: docker/login-action@v3
+        with:
+          registry: docker.mistox.net
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: build and push uvicorn
+        run: |
+          docker buildx build \
+          --platform=linux/arm64 \
+          -t docker.mistox.net/uvicorn-ampere:latest \
+          -t mistox/uvicorn-ampere:latest \
+          -f uvicorn-dockerfile \
+          --push \
+          .

.gitea/workflows/build.yaml

@@ -1,88 +0,0 @@
-name: Docker Build and Release Upload
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-
-  # Build ComfyUI-Vulkan
-  build-vulkan:
-    runs-on: alpine-linux
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: Log in to registry
-        run: |
-          printf '%s' '${{ secrets.DOCKERHUB_TOKEN }}' |
-          podman login docker.mistox.net \
-          --username '${{ secrets.DOCKERHUB_USERNAME }}' \
-          --password-stdin
-
-      - name: Build and Push ComfyUI-Vulkan
-        run: |
-          podman build \
-            -t docker.mistox.net/derek/comfyui-vulkan-ampere:latest \
-            -f ${{ github.workspace }}/comfyui-rocm-dockerfile \
-            ${{ github.workspace }}
-          podman push docker.mistox.net/derek/comfyui-vulkan-ampere:latest
-
-  # Build ComfyUI-Cuda
-  build-cuda:
-    runs-on: alpine-linux
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: Log in to registry
-        run: |
-          printf '%s' '${{ secrets.DOCKERHUB_TOKEN }}' |
-          podman login docker.mistox.net \
-          --username '${{ secrets.DOCKERHUB_USERNAME }}' \
-          --password-stdin
-
-      - name: Get Upstream Commit SHA
-        id: get-sha
-        run: |
-          SHA=$(curl -s https://api.github.com/repos/comfy-org/comfyui/commits?sha=master&per_page=1 | jq -r '.sha')
-          echo "sha=$SHA" >> $GITHUB_OUTPUT
-
-      - name: Build and Push ComfyUI-Cuda
-        run: |
-          podman build \
-            -t docker.mistox.net/derek/comfyui-cuda-ampere:latest \
-            -f ${{ github.workspace }}/comfyui-cuda-dockerfile \
-            --build-arg gitversion=${{ steps.get-sha.outputs.sha }} \
-            ${{ github.workspace }}
-          podman push docker.mistox.net/derek/comfyui-cuda-ampere:latest
-
-  # Job 3: Uvicorn Build
-  build-uvicorn:
-    runs-on: alpine-linux
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: Log in to registry
-        run: |
-          printf '%s' '${{ secrets.DOCKERHUB_TOKEN }}' |
-          podman login docker.mistox.net \
-          --username '${{ secrets.DOCKERHUB_USERNAME }}' \
-          --password-stdin
-
-      - name: Get Upstream Commit SHA
-        id: get-sha
-        run: |
-          SHA=$(curl -s https://api.github.com/repos/mythrantic/ollama-docker/commits/main | jq -r '.sha')
-          echo "sha=$SHA" >> $GITHUB_OUTPUT
-
-      - name: Build and Push Uvicorn
-        run: |
-          podman build \
-            -t docker.mistox.net/derek/uvicorn-ampere:latest \
-            -f ${{ github.workspace }}/uvicorn-dockerfile \
-            --build-arg gitversion=${{ steps.get-sha.outputs.sha }} \
-            ${{ github.workspace }}
-          podman push docker.mistox.net/derek/uvicorn-ampere:latest

README.md

@@ -4,5 +4,8 @@ In order to use this repos please just copy the docker-compose
   
 ONLY TESTED WITH AMPERE ALTRA USING RTX40 SERIES  
   
-https://hub.docker.com/r/mistox/uvicorn-ampere  
-https://hub.docker.com/r/mistox/comfyui-ampere
+https://hub.docker.com/r/mistox/uvicorn-ampere - working  
+https://hub.docker.com/r/mistox/comfyui-cuda-ampere - working  
+  
+https://hub.docker.com/r/mistox/rocm-aarch64-base - work in progress  
+https://hub.docker.com/r/mistox/comfyui-rocm-ampere - pending rocm-aarch64-base before testing  

comfyui-cuda-dockerfile

@@ -1,24 +1,41 @@
 # Get cuda version from https://hub.docker.com/r/nvidia/cuda
-FROM nvcr.io/nvidia/pytorch:25.05-py3 AS build-deps
+FROM nvcr.io/nvidia/pytorch:26.04-py3 AS build-deps
 
-# Install system dependencies
-RUN pip install imageio controlnet_aux
+# Set ENV
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
+ENV PYTHONUNBUFFERED=1
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USE_CUDA=1
+ENV BUILD_SOX=1
+
+# Install system packages to build torchaudio
+RUN apt update && \
+    apt upgrade -y && \
+    apt install -y \
+    libavformat-dev \
+    libavcodec-dev \
+    libavutil-dev \
+    libavdevice-dev \
+    libavfilter-dev \
+    libswresample-dev \
+    sox \
+    libsox-dev
+
+# 2. Clone and build the torchaudio stable
+RUN wget https://github.com/pytorch/audio/archive/refs/tags/v2.11.0.tar.gz && \
+    tar -xf v2.11.0.tar.gz && \
+    cd audio-2.11.0 && \
+    pip install --no-build-isolation --no-deps -v .
 
 # Set working directory
 WORKDIR /app
 
-ARG gitversion
-
 # Clone ComfyUI
 RUN git clone https://github.com/comfyanonymous/ComfyUI.git .
 
-# Link in python
-RUN ln -sf /usr/bin/python3 /usr/bin/python && \
-    ln -sf /usr/bin/pip3 /usr/bin/pip
-
-# Install
+# Install depencies
 RUN grep -vE "^(torch|#)" requirements.txt | xargs pip install && \
-    pip install torchsde
+    pip install torchsde imageio controlnet_aux
 
 # Set custom Nodes
 WORKDIR /app/custom_nodes

comfyui-rocm-dockerfile

@@ -1,103 +1,27 @@
-FROM ubuntu:24.04 AS builder
-ENV DEBIAN_FRONTEND=noninteractive
+# Use the rocm-base-aarch64-dockerfile
+FROM mistox/rocm-aarch64-base:latest AS base
 
-#install build deps
-RUN apt-get update && apt-get install -y \
-    git \
-    python3-mako \
-    python3-yaml \
-    python3-packaging \
-    meson \
-    ninja-build \
-    build-essential \
-    pkg-config \
-    flex \
-    bison \
-    libpciaccess-dev \
-    libexpat1-dev \
-    libelf-dev \
-    libvulkan-dev \
-    glslang-tools \
-    spirv-tools \
-    llvm-dev \
-    libclang-dev \
-    cmake \
-    libwayland-dev \
-    wayland-protocols \
-    libwayland-bin \
-    libxcb1-dev \
-    libx11-xcb-dev \
-    libxcb-dri3-dev \
-    libxcb-present-dev \
-    libxcb-sync-dev \
-    libxshmfence-dev \
-    libx11-dev \
-    libxcb-shm0-dev \
-    libxrandr-dev \
-    python3-pip \
-    curl \
-    wget \
-    golang-go \
-    ca-certificates \
-    vulkan-tools \
-    spirv-headers \
-    libshaderc-dev \
-    glslc \
-    && rm -rf /var/lib/apt/lists/*
-RUN pip3 install --no-cache-dir --break-system-packages --upgrade meson
-
-# Build libdrm
-RUN git clone --depth 1 https://gitlab.freedesktop.org/mesa/drm.git /drm
-WORKDIR /drm
-RUN meson setup build -Dbuildtype=release -Dprefix=/opt/mesa
-RUN ninja -C build -j16 && ninja -C build install
-
-# Build LLVMSPIRVLib
-RUN git clone --branch llvm_release_180 --depth 1 https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git /spirv-llvm-translator
-WORKDIR /spirv-llvm-translator
-RUN cmake -B build \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/opt/mesa \
-    -DLLVM_DIR=/usr/lib/llvm-18/cmake
-RUN cmake --build build --parallel 16
-RUN cmake --install build
-
-# Build Mesa-git
-RUN git clone --depth 1 https://gitlab.freedesktop.org/mesa/mesa.git /mesa
-WORKDIR /mesa
-ENV PKG_CONFIG_PATH=/opt/mesa/lib/pkgconfig:/opt/mesa/lib/aarch64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH
-ENV CMAKE_PREFIX_PATH=/opt/mesa:$CMAKE_PREFIX_PATH
-RUN meson setup build \
-    -Dbuildtype=release \
-    -Dgallium-drivers= \
-    -Dvulkan-drivers=amd \
-    -Dplatforms=x11,wayland \
-    -Dprefix=/opt/mesa
-RUN ninja -C build
-RUN ninja -C build install
-
-# Build Ollama
-RUN git clone --recursive https://github.com/ollama/ollama.git /app
+# Set Workdir
 WORKDIR /app
-ENV CGO_ENABLED=1
-RUN cmake -B build . \
-    -DOLLAMA_LLAMA_BACKENDS="vulkan" \
-    -DGGML_VULKAN=ON \
-    -DGGML_CPU_ALL_VARIANTS=OFF \
-    -DCMAKE_BUILD_TYPE=Release
-RUN cmake --build build --parallel 16
-RUN go build -o ollama .
 
-EXPOSE 11434
+# Clone ComfyUI
+RUN git clone https://github.com/comfyanonymous/ComfyUI.git .
 
-ENV OLLAMA_HOST=0.0.0.0:11434
-ENV GGML_VULKAN_DISABLE_FMA=1
-ENV RADV_PERFOPTS="no_outoforder"
-ENV AMD_DEBUG="notcc"
-ENV OLLAMA_MODELS=/root/.ollama/models
+# Install depencies
+RUN grep -vE "^(torch|#)" requirements.txt | xargs pip install && \
+    pip install torchsde imageio controlnet_aux
 
-# Point the loader directly to the custom Mesa-git ICD driver
-ENV VK_ICD_FILENAMES=/opt/mesa/share/vulkan/icd.d/radeon_icd.aarch64.json
-ENV LD_LIBRARY_PATH=/opt/mesa/lib/aarch64-linux-gnu:/opt/mesa/lib:$LD_LIBRARY_PATH
+# Set custom Nodes
+WORKDIR /app/custom_nodes
 
-ENTRYPOINT ["/app/ollama", "serve"]
+# Install ComfyUi Manager
+RUN git clone https://github.com/Comfy-Org/ComfyUI-Manager.git
+
+# Go back to root
+WORKDIR /app
+
+# Expose the default ComfyUI port
+EXPOSE 8188
+
+# Launch ComfyUI
+CMD ["python3", "main.py", "--listen", "0.0.0.0"]

rocm-base-aarch64-dockerfile

@@ -0,0 +1,173 @@
+# Use the LTS Ubuntu repo
+FROM ubuntu:26.04 AS reqs
+# Set global build variables
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
+ENV PYTHONUNBUFFERED=1
+ENV DEBIAN_FRONTEND=noninteractive
+
+# My sad server with 96 Gbytes of ram keeps running out of ram ;(
+# I would love to use the whole 80 core CPU ;(
+ENV MAX_JOBS=5
+
+# Install libraries
+RUN apt update -y && \
+    apt upgrade -y && \
+    apt install -y --no-install-recommends \
+    ca-certificates \
+    wget \
+    curl \
+    git \
+    gfortran \
+    ninja-build \
+    g++ \
+    pkg-config \
+    xxd \
+    automake \
+    libtool \
+    libegl1-mesa-dev \
+    texinfo \
+    bison \
+    flex \
+    cmake \
+    build-essential \
+    libsimde-dev \
+    zlib1g-dev \
+    libncurses5-dev \
+    libopenblas-dev \
+    libjpeg-dev \
+    libpng-dev \
+    libavcodec-dev \
+    libavformat-dev \
+    libswscale-dev \
+    libpthreadpool-dev \
+    libgoogle-glog-dev \
+    libgtest-dev \
+    libbenchmark-dev \
+    libgdbm-dev \
+    libnss3-dev \
+    libssl-dev \
+    libreadline-dev \
+    libffi-dev \
+    libsqlite3-dev \
+    libelf-dev \
+    libpciaccess-dev \
+    protobuf-compiler \
+    libprotobuf-dev \
+    libbz2-dev \
+    liblzma-dev \
+    && rm -rf /var/lib/apt/lists/*
+    # Tested Working
+
+# Build python 3.11
+FROM reqs AS python
+WORKDIR /build/python
+RUN wget https://www.python.org/ftp/python/3.11.15/Python-3.11.15.tgz && \
+    tar -xf Python-3.11.15.tgz && \
+    cd Python-3.11.15 && \
+    ./configure --enable-optimizations --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" && \
+    make -j 80 && \
+    make install && \
+    ldconfig /usr/local/lib && \
+    wget https://bootstrap.pypa.io/get-pip.py && \
+    python3 get-pip.py && \
+    ln -s /usr/local/bin/pip3 /bin/pip && \
+    ln -s /usr/local/bin/pip3 /bin/pip3 && \
+    ln -s /usr/local/bin/python3 /bin/python && \
+    ln -s /usr/local/bin/python3 /bin/python3.11
+    # Tested Working
+
+# Build ROCm latest
+FROM python AS rocm
+WORKDIR /build/therock
+COPY ./TheRock .
+ENV CFLAGS="-Wno-error=discarded-qualifiers -fcommon -w"
+ENV CXXFLAGS="-Wno-error=discarded-qualifiers -fcommon -w"
+RUN env INSTALL_PREFIX=/usr/local ./dockerfiles/install_pinned_patchelf.sh && \
+    pip install -r requirements.txt && \
+    cmake -S . -B build \
+    -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DTHEROCK_AMDGPU_TARGETS="gfx1100" \
+    -DTHEROCK_DIST_AMDGPU_FAMILIES="gfx1100" \
+    -DTHEROCK_AMDGPU_DIST_BUNDLE_NAME="gfx1100" \
+    -DLLVM_HOST_TRIPLE="aarch64-unknown-linux-gnu" \
+    -DLLVM_DEFAULT_TARGET_TRIPLE="aarch64-unknown-linux-gnu" \
+    -DCMAKE_C_FLAGS="$CFLAGS" \
+    -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+    -DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi" \
+    -DLLVM_ENABLE_PROJECTS="clang;lld;flang" \
+    -DCOMPILER_RT_BUILD_SANITIZERS=OFF \
+    -DCMAKE_INSTALL_PREFIX=./install && \
+    cmake --build build -- -j${MAX_JOBS}
+    # Work in progress [ Breaking due to x86 intrinsics not ported to Aarch64 ]
+
+# Build pytorch
+FROM rocm AS pytorch
+# Setup Envronment
+ENV PYTORCH_ROCM_ARCH=1100
+ENV USE_ROCM=1
+ENV USE_CUDA=0
+ENV USE_AOTRITON=0
+ENV USE_SYSTEM_PTHREADPOOL=1
+ENV USE_SYSTEM_PROTOC=1
+ENV BUILD_CUSTOM_PROTOBUF=OFF
+ENV USE_PYTORCH_QNNPACK=OFF
+ENV USE_XNNPACK=OFF
+ENV USE_ONNX=OFF
+ENV USE_QNNPACK=OFF
+ENV USE_NNPACK=OFF
+ENV USE_KINETO=OFF
+ENV USE_OPENMP=OFF
+ENV USE_TENSORPIPE=OFF
+ENV ROCM_PATH=/usr
+ENV DEVICE_LIB_PATH=/usr/lib/llvm-21/lib/clang/21/amdgcn/bitcode
+ENV HIPFLAGS="--rocm-device-lib-path=$DEVICE_LIB_PATH"
+ENV CMAKE_ARGS="-DCMAKE_HIP_COMPILER_WORKS=1 \
+-DCMAKE_CXX_COMPILER_WORKS=1 \
+-DCMAKE_C_COMPILER_WORKS=1 \
+-DCMAKE_HIP_COMPILER_ROCM_LIB_PATH=$DEVICE_LIB_PATH \
+-DCMAKE_HIP_FLAGS=--rocm-device-lib-path=$DEVICE_LIB_PATH \
+-DCMAKE_C_COMPILER=/usr/lib/llvm-21/bin/clang \
+-DCMAKE_CXX_COMPILER=/usr/lib/llvm-21/bin/clang++ \
+-DCMAKE_HIP_COMPILER=/usr/lib/llvm-21/bin/clang++ \
+-DPython3_ROOT_DIR=/usr/local \
+-DPYTHON_EXECUTABLE=/usr/local/bin/python3.11 \
+-DPYTHON_LIBRARY=/usr/local/lib/libpython3.11.so \
+-DPYTHON_INCLUDE_DIR=/usr/local/include/python3.11"
+# Pull and build pytorch
+WORKDIR /build/pytorch
+RUN git clone https://github.com/pytorch/pytorch.git && \
+    cd pytorch && \
+    git submodule update --init --recursive && \
+    make triton && \
+    python tools/amd_build/build_amd.py && \
+    pip install -r requirements.txt && \
+    mkdir -p /opt/rocm/bin \
+    ln -s /usr/bin/hipcc /opt/rocm/bin/hipcc \
+    ln -s /usr/lib/llvm-21/bin/clang++ /usr/bin/clang++ \
+    python3 setup.py build && \
+    python3 setup.py install
+    # Failing
+
+# Build pytorch-audio
+FROM pytorch AS torchaudio
+WORKDIR /build/torchaudio
+RUN wget https://github.com/pytorch/audio/archive/refs/tags/v2.11.0.tar.gz && \
+    tar -xf v2.11.0.tar.gz && \
+    cd audio-2.11.0 && \
+    pip install --no-build-isolation --no-deps -v .
+    # Tested Working via comfyui-cuda-dockerfile
+
+# Build pytorch-vision
+FROM torchaudio AS torchvision
+WORKDIR /build/torchaudio
+ENV FORCE_CUDA=0
+RUN git clone https://github.com/pytorch/vision.git . && \
+    pip install numpy pillow ninja setuptools wheel && \
+    python setup.py bdist_wheel && \
+    pip install dist/torchvision-*.whl
+    # Not tested and not verified ROCM build
+
+# Build final stripped down image
+FROM ubuntu:26.04
+# Copy in rocm, pytorch, torchaudio, torchvision

uvicorn-dockerfile

@@ -4,8 +4,6 @@ WORKDIR /code
 
 RUN apt-get update && apt-get install git -y && apt-get install curl -y
 
-ARG gitversion
-
 RUN git clone https://github.com/mythrantic/ollama-docker.git
 
 WORKDIR /code/ollama-docker