dearwolf/LocalAI
1
0
Fork 0
mirror of https://github.com/mudler/LocalAI.git synced 2025-06-06 19:04:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge 808286c596 into 489c289916

Browse source
This commit is contained in:
Ettore Di Giacinto 2025-06-02 09:13:28 +02:00 • committed by GitHub
commit cc89abb953
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/generate_grpc_cache.yaml vendored
View file

@ -16,7 +16,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- grpc-base-image: ubuntu:22.04 - grpc-base-image: ubuntu:24.04
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
platforms: 'linux/amd64,linux/arm64' platforms: 'linux/amd64,linux/arm64'
runs-on: ${{matrix.runs-on}} runs-on: ${{matrix.runs-on}}

2
.github/workflows/generate_intel_image.yaml vendored
View file

@ -15,7 +15,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- base-image: intel/oneapi-basekit:2025.1.0-0-devel-ubuntu22.04 - base-image: intel/oneapi-basekit:2025.1.3-0-devel-ubuntu24.04
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
platforms: 'linux/amd64' platforms: 'linux/amd64'
runs-on: ${{matrix.runs-on}} runs-on: ${{matrix.runs-on}}

20
.github/workflows/image-pr.yml vendored
View file

@ -44,7 +44,7 @@ jobs:
# ffmpeg: 'true' # ffmpeg: 'true'
# image-type: 'extras' # image-type: 'extras'
# runs-on: 'arc-runner-set' # runs-on: 'arc-runner-set'
# base-image: "ubuntu:22.04" # base-image: "ubuntu:24.04"
# makeflags: "--jobs=3 --output-sync=target" # makeflags: "--jobs=3 --output-sync=target"
- build-type: 'cublas' - build-type: 'cublas'
cuda-major-version: "12" cuda-major-version: "12"
@ -55,7 +55,7 @@ jobs:
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'extras' image-type: 'extras'
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
base-image: "ubuntu:22.04" base-image: "ubuntu:24.04"
makeflags: "--jobs=3 --output-sync=target" makeflags: "--jobs=3 --output-sync=target"
- build-type: 'hipblas' - build-type: 'hipblas'
platforms: 'linux/amd64' platforms: 'linux/amd64'
@ -63,15 +63,15 @@ jobs:
tag-suffix: '-hipblas' tag-suffix: '-hipblas'
ffmpeg: 'false' ffmpeg: 'false'
image-type: 'extras' image-type: 'extras'
base-image: "rocm/dev-ubuntu-22.04:6.1" base-image: "rocm/dev-ubuntu-24.04:6.4.1"
grpc-base-image: "ubuntu:22.04" grpc-base-image: "ubuntu:24.04"
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
makeflags: "--jobs=3 --output-sync=target" makeflags: "--jobs=3 --output-sync=target"
- build-type: 'sycl_f16' - build-type: 'sycl_f16'
platforms: 'linux/amd64' platforms: 'linux/amd64'
tag-latest: 'false' tag-latest: 'false'
base-image: "quay.io/go-skynet/intel-oneapi-base:latest" base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
grpc-base-image: "ubuntu:22.04" grpc-base-image: "ubuntu:24.04"
tag-suffix: 'sycl-f16-ffmpeg' tag-suffix: 'sycl-f16-ffmpeg'
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'extras' image-type: 'extras'
@ -84,7 +84,7 @@ jobs:
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'core' image-type: 'core'
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
base-image: "ubuntu:22.04" base-image: "ubuntu:24.04"
makeflags: "--jobs=4 --output-sync=target" makeflags: "--jobs=4 --output-sync=target"
# core-image-build: # core-image-build:
# uses: ./.github/workflows/image_build.yml # uses: ./.github/workflows/image_build.yml
@ -116,13 +116,13 @@ jobs:
# ffmpeg: 'true' # ffmpeg: 'true'
# image-type: 'core' # image-type: 'core'
# runs-on: 'ubuntu-latest' # runs-on: 'ubuntu-latest'
# base-image: "ubuntu:22.04" # base-image: "ubuntu:24.04"
# makeflags: "--jobs=4 --output-sync=target" # makeflags: "--jobs=4 --output-sync=target"
# - build-type: 'sycl_f16' # - build-type: 'sycl_f16'
# platforms: 'linux/amd64' # platforms: 'linux/amd64'
# tag-latest: 'false' # tag-latest: 'false'
# base-image: "quay.io/go-skynet/intel-oneapi-base:latest" # base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
# grpc-base-image: "ubuntu:22.04" # grpc-base-image: "ubuntu:24.04"
# tag-suffix: 'sycl-f16-ffmpeg-core' # tag-suffix: 'sycl-f16-ffmpeg-core'
# ffmpeg: 'true' # ffmpeg: 'true'
# image-type: 'core' # image-type: 'core'
@ -137,7 +137,7 @@ jobs:
# ffmpeg: 'true' # ffmpeg: 'true'
# image-type: 'core' # image-type: 'core'
# runs-on: 'ubuntu-latest' # runs-on: 'ubuntu-latest'
# base-image: "ubuntu:22.04" # base-image: "ubuntu:24.04"
# makeflags: "--jobs=4 --output-sync=target" # makeflags: "--jobs=4 --output-sync=target"
# - build-type: 'vulkan' # - build-type: 'vulkan'
# platforms: 'linux/amd64' # platforms: 'linux/amd64'
@ -146,5 +146,5 @@ jobs:
# ffmpeg: 'true' # ffmpeg: 'true'
# image-type: 'core' # image-type: 'core'
# runs-on: 'ubuntu-latest' # runs-on: 'ubuntu-latest'
# base-image: "ubuntu:22.04" # base-image: "ubuntu:24.04"
# makeflags: "--jobs=4 --output-sync=target" # makeflags: "--jobs=4 --output-sync=target"

28
.github/workflows/image.yml vendored
View file

@ -49,8 +49,8 @@ jobs:
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'extras' image-type: 'extras'
aio: "-aio-gpu-hipblas" aio: "-aio-gpu-hipblas"
base-image: "rocm/dev-ubuntu-22.04:6.1" base-image: "rocm/dev-ubuntu-24.04:6.4.1"
grpc-base-image: "ubuntu:22.04" grpc-base-image: "ubuntu:24.04"
latest-image: 'latest-gpu-hipblas-extras' latest-image: 'latest-gpu-hipblas-extras'
latest-image-aio: 'latest-aio-gpu-hipblas' latest-image-aio: 'latest-aio-gpu-hipblas'
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
@ -61,8 +61,8 @@ jobs:
tag-suffix: '-hipblas' tag-suffix: '-hipblas'
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'core' image-type: 'core'
base-image: "rocm/dev-ubuntu-22.04:6.1" base-image: "rocm/dev-ubuntu-24.04:6.4.1"
grpc-base-image: "ubuntu:22.04" grpc-base-image: "ubuntu:24.04"
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
makeflags: "--jobs=3 --output-sync=target" makeflags: "--jobs=3 --output-sync=target"
latest-image: 'latest-gpu-hipblas' latest-image: 'latest-gpu-hipblas'
@ -104,7 +104,7 @@ jobs:
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'extras' image-type: 'extras'
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
base-image: "ubuntu:22.04" base-image: "ubuntu:24.04"
aio: "-aio-gpu-nvidia-cuda-11" aio: "-aio-gpu-nvidia-cuda-11"
latest-image: 'latest-gpu-nvidia-cuda-11-extras' latest-image: 'latest-gpu-nvidia-cuda-11-extras'
latest-image-aio: 'latest-aio-gpu-nvidia-cuda-11' latest-image-aio: 'latest-aio-gpu-nvidia-cuda-11'
@ -118,7 +118,7 @@ jobs:
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'extras' image-type: 'extras'
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
base-image: "ubuntu:22.04" base-image: "ubuntu:24.04"
aio: "-aio-gpu-nvidia-cuda-12" aio: "-aio-gpu-nvidia-cuda-12"
latest-image: 'latest-gpu-nvidia-cuda-12-extras' latest-image: 'latest-gpu-nvidia-cuda-12-extras'
latest-image-aio: 'latest-aio-gpu-nvidia-cuda-12' latest-image-aio: 'latest-aio-gpu-nvidia-cuda-12'
@ -127,7 +127,7 @@ jobs:
platforms: 'linux/amd64' platforms: 'linux/amd64'
tag-latest: 'false' tag-latest: 'false'
base-image: "quay.io/go-skynet/intel-oneapi-base:latest" base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
grpc-base-image: "ubuntu:22.04" grpc-base-image: "ubuntu:24.04"
tag-suffix: '-sycl-f16-extras' tag-suffix: '-sycl-f16-extras'
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'extras' image-type: 'extras'
@ -140,7 +140,7 @@ jobs:
platforms: 'linux/amd64' platforms: 'linux/amd64'
tag-latest: 'false' tag-latest: 'false'
base-image: "quay.io/go-skynet/intel-oneapi-base:latest" base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
grpc-base-image: "ubuntu:22.04" grpc-base-image: "ubuntu:24.04"
tag-suffix: '-sycl-f32-extras' tag-suffix: '-sycl-f32-extras'
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'extras' image-type: 'extras'
@ -154,7 +154,7 @@ jobs:
platforms: 'linux/amd64' platforms: 'linux/amd64'
tag-latest: 'false' tag-latest: 'false'
base-image: "quay.io/go-skynet/intel-oneapi-base:latest" base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
grpc-base-image: "ubuntu:22.04" grpc-base-image: "ubuntu:24.04"
tag-suffix: '-sycl-f16' tag-suffix: '-sycl-f16'
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'core' image-type: 'core'
@ -165,7 +165,7 @@ jobs:
platforms: 'linux/amd64' platforms: 'linux/amd64'
tag-latest: 'false' tag-latest: 'false'
base-image: "quay.io/go-skynet/intel-oneapi-base:latest" base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
grpc-base-image: "ubuntu:22.04" grpc-base-image: "ubuntu:24.04"
tag-suffix: '-sycl-f32' tag-suffix: '-sycl-f32'
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'core' image-type: 'core'
@ -207,7 +207,7 @@ jobs:
tag-suffix: '' tag-suffix: ''
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'core' image-type: 'core'
base-image: "ubuntu:22.04" base-image: "ubuntu:24.04"
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
aio: "-aio-cpu" aio: "-aio-cpu"
latest-image: 'latest-cpu' latest-image: 'latest-cpu'
@ -223,7 +223,7 @@ jobs:
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'core' image-type: 'core'
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
base-image: "ubuntu:22.04" base-image: "ubuntu:24.04"
makeflags: "--jobs=4 --output-sync=target" makeflags: "--jobs=4 --output-sync=target"
skip-drivers: 'false' skip-drivers: 'false'
latest-image: 'latest-gpu-nvidia-cuda-12' latest-image: 'latest-gpu-nvidia-cuda-12'
@ -236,7 +236,7 @@ jobs:
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'core' image-type: 'core'
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
base-image: "ubuntu:22.04" base-image: "ubuntu:24.04"
skip-drivers: 'false' skip-drivers: 'false'
makeflags: "--jobs=4 --output-sync=target" makeflags: "--jobs=4 --output-sync=target"
latest-image: 'latest-gpu-nvidia-cuda-12' latest-image: 'latest-gpu-nvidia-cuda-12'
@ -247,7 +247,7 @@ jobs:
ffmpeg: 'true' ffmpeg: 'true'
image-type: 'core' image-type: 'core'
runs-on: 'arc-runner-set' runs-on: 'arc-runner-set'
base-image: "ubuntu:22.04" base-image: "ubuntu:24.04"
skip-drivers: 'false' skip-drivers: 'false'
makeflags: "--jobs=4 --output-sync=target" makeflags: "--jobs=4 --output-sync=target"
latest-image: 'latest-gpu-vulkan' latest-image: 'latest-gpu-vulkan'

17
Dockerfile
View file

@ -1,5 +1,5 @@
ARG IMAGE_TYPE=extras ARG IMAGE_TYPE=extras
ARG BASE_IMAGE=ubuntu:22.04 ARG BASE_IMAGE=ubuntu:24.04
ARG GRPC_BASE_IMAGE=${BASE_IMAGE} ARG GRPC_BASE_IMAGE=${BASE_IMAGE}
ARG INTEL_BASE_IMAGE=${BASE_IMAGE} ARG INTEL_BASE_IMAGE=${BASE_IMAGE}
@ -29,7 +29,7 @@ RUN apt-get update && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install CMake (the version in 22.04 is too old) # Install CMake (the version in 24.04 is too old)
RUN <<EOT bash RUN <<EOT bash
if [ "${CMAKE_FROM_SOURCE}}" = "true" ]; then if [ "${CMAKE_FROM_SOURCE}}" = "true" ]; then
curl -L -s https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz -o cmake.tar.gz && tar xvf cmake.tar.gz && cd cmake-${CMAKE_VERSION} && ./configure && make && make install curl -L -s https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz -o cmake.tar.gz && tar xvf cmake.tar.gz && cd cmake-${CMAKE_VERSION} && ./configure && make && make install
@ -96,11 +96,12 @@ RUN apt-get update && \
python3-dev llvm \ python3-dev llvm \
python3-venv && \ python3-venv && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/*
pip install --upgrade pip # && \
# pip install --upgrade pip --break-system-packages
# Install grpcio-tools (the version in 22.04 is too old) # Install grpcio-tools (the version in 24.04 is too old)
RUN pip install --user grpcio-tools RUN pip install --user grpcio-tools --break-system-packages
################################### ###################################
################################### ###################################
@ -216,7 +217,7 @@ RUN apt-get update && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install CMake (the version in 22.04 is too old) # Install CMake (the version in 24.04 is too old)
RUN <<EOT bash RUN <<EOT bash
if [ "${CMAKE_FROM_SOURCE}}" = "true" ]; then if [ "${CMAKE_FROM_SOURCE}}" = "true" ]; then
curl -L -s https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz -o cmake.tar.gz && tar xvf cmake.tar.gz && cd cmake-${CMAKE_VERSION} && ./configure && make && make install curl -L -s https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz -o cmake.tar.gz && tar xvf cmake.tar.gz && cd cmake-${CMAKE_VERSION} && ./configure && make && make install
@ -266,7 +267,7 @@ RUN echo "GO_TAGS: $GO_TAGS" && echo "TARGETARCH: $TARGETARCH"
WORKDIR /build WORKDIR /build
# We need protoc installed, and the version in 22.04 is too old. We will create one as part installing the GRPC build below # We need protoc installed, and the version in 24.04 is too old. We will create one as part installing the GRPC build below
# but that will also being in a newer version of absl which stablediffusion cannot compile with. This version of protoc is only # but that will also being in a newer version of absl which stablediffusion cannot compile with. This version of protoc is only
# here so that we can generate the grpc code for the stablediffusion build # here so that we can generate the grpc code for the stablediffusion build
RUN <<EOT bash RUN <<EOT bash

6
Makefile
View file

@ -818,7 +818,7 @@ grpcs: prepare $(GRPC_BACKENDS)
DOCKER_IMAGE?=local-ai DOCKER_IMAGE?=local-ai
DOCKER_AIO_IMAGE?=local-ai-aio DOCKER_AIO_IMAGE?=local-ai-aio
IMAGE_TYPE?=core IMAGE_TYPE?=core
BASE_IMAGE?=ubuntu:22.04 BASE_IMAGE?=ubuntu:24.04
docker: docker:
docker build \ docker build \
@ -853,7 +853,7 @@ docker-aio-all:
docker-image-intel: docker-image-intel:
docker build \ docker build \
--build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.0-0-devel-ubuntu24.04 \ --build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.3-0-devel-ubuntu24.04 \
--build-arg IMAGE_TYPE=$(IMAGE_TYPE) \ --build-arg IMAGE_TYPE=$(IMAGE_TYPE) \
--build-arg GO_TAGS="$(GO_TAGS)" \ --build-arg GO_TAGS="$(GO_TAGS)" \
--build-arg MAKEFLAGS="$(DOCKER_MAKEFLAGS)" \ --build-arg MAKEFLAGS="$(DOCKER_MAKEFLAGS)" \
@ -861,7 +861,7 @@ docker-image-intel:
docker-image-intel-xpu: docker-image-intel-xpu:
docker build \ docker build \
--build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.0-0-devel-ubuntu22.04 \ --build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.3-0-devel-ubuntu24.04 \
--build-arg IMAGE_TYPE=$(IMAGE_TYPE) \ --build-arg IMAGE_TYPE=$(IMAGE_TYPE) \
--build-arg GO_TAGS="$(GO_TAGS)" \ --build-arg GO_TAGS="$(GO_TAGS)" \
--build-arg MAKEFLAGS="$(DOCKER_MAKEFLAGS)" \ --build-arg MAKEFLAGS="$(DOCKER_MAKEFLAGS)" \

2
docker-compose.yaml
View file

@ -11,7 +11,7 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- IMAGE_TYPE=core - IMAGE_TYPE=core
- BASE_IMAGE=ubuntu:22.04 - BASE_IMAGE=ubuntu:24.04
ports: ports:
- 8080:8080 - 8080:8080
env_file: env_file: