Skip to content

Commit afee0f8

Browse files
committed
Merge branch 'master' into xsn/model_man_api
2 parents 82efd0f + b4024af commit afee0f8

622 files changed

Lines changed: 53710 additions & 19993 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devops/cpu.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
33
ARG APP_VERSION=N/A
44
ARG APP_REVISION=N/A
55

6-
FROM ubuntu:$UBUNTU_VERSION AS build
6+
FROM docker.io/ubuntu:$UBUNTU_VERSION AS build
77

88
ARG TARGETARCH
99

@@ -37,7 +37,7 @@ RUN mkdir -p /app/full \
3737
&& cp .devops/tools.sh /app/full/tools.sh
3838

3939
## Base image
40-
FROM ubuntu:$UBUNTU_VERSION AS base
40+
FROM docker.io/ubuntu:$UBUNTU_VERSION AS base
4141

4242
ARG BUILD_DATE=N/A
4343
ARG APP_VERSION=N/A
@@ -53,7 +53,7 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
5353
org.opencontainers.image.source=$IMAGE_SOURCE
5454

5555
RUN apt-get update \
56-
&& apt-get install -y libgomp1 curl \
56+
&& apt-get install -y libgomp1 curl ffmpeg \
5757
&& apt autoremove -y \
5858
&& apt clean -y \
5959
&& rm -rf /tmp/* /var/tmp/* \

.devops/cuda.Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
ARG UBUNTU_VERSION=24.04
22
# This needs to generally match the container host's environment.
33
ARG CUDA_VERSION=12.8.1
4+
ARG GCC_VERSION=14
45
# Target the CUDA build image
5-
ARG BASE_CUDA_DEV_CONTAINER=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
6+
ARG BASE_CUDA_DEV_CONTAINER=docker.io/nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
67

7-
ARG BASE_CUDA_RUN_CONTAINER=nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}
8+
ARG BASE_CUDA_RUN_CONTAINER=docker.io/nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}
89

910
ARG BUILD_DATE=N/A
1011
ARG APP_VERSION=N/A
1112
ARG APP_REVISION=N/A
1213

1314
FROM ${BASE_CUDA_DEV_CONTAINER} AS build
1415

16+
ARG GCC_VERSION
1517
# CUDA architecture to build for (defaults to all supported archs)
1618
ARG CUDA_DOCKER_ARCH=default
1719

1820
RUN apt-get update && \
19-
apt-get install -y gcc-14 g++-14 build-essential cmake python3 python3-pip git libssl-dev libgomp1
21+
apt-get install -y gcc-${GCC_VERSION} g++-${GCC_VERSION} build-essential cmake python3 python3-pip git libssl-dev libgomp1
2022

21-
ENV CC=gcc-14 CXX=g++-14 CUDAHOSTCXX=g++-14
23+
ENV CC=gcc-${GCC_VERSION} CXX=g++-${GCC_VERSION} CUDAHOSTCXX=g++-${GCC_VERSION}
2224

2325
WORKDIR /app
2426

@@ -59,7 +61,7 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
5961
org.opencontainers.image.source=$IMAGE_SOURCE
6062

6163
RUN apt-get update \
62-
&& apt-get install -y libgomp1 curl \
64+
&& apt-get install -y libgomp1 curl ffmpeg \
6365
&& apt autoremove -y \
6466
&& apt clean -y \
6567
&& rm -rf /tmp/* /var/tmp/* \

.devops/intel.Dockerfile

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ ARG APP_REVISION=N/A
55

66
## Build Image
77

8-
FROM intel/deep-learning-essentials:$ONEAPI_VERSION AS build
8+
FROM docker.io/intel/deep-learning-essentials:$ONEAPI_VERSION AS build
99

10-
ARG GGML_SYCL_F16=OFF
10+
ARG GGML_SYCL_F16=ON
1111
ARG LEVEL_ZERO_VERSION=1.28.2
1212
ARG LEVEL_ZERO_UBUNTU_VERSION=u24.04
1313
RUN apt-get update && \
@@ -24,7 +24,8 @@ COPY . .
2424

2525
RUN if [ "${GGML_SYCL_F16}" = "ON" ]; then \
2626
echo "GGML_SYCL_F16 is set" \
27-
&& export OPT_SYCL_F16="-DGGML_SYCL_F16=ON"; \
27+
&& export OPT_SYCL_F16="-DGGML_SYCL_F16=ON" \
28+
&& export SYCL_PROGRAM_COMPILE_OPTIONS="-cl-fp32-correctly-rounded-divide-sqrt"; \
2829
fi && \
2930
echo "Building with dynamic libs" && \
3031
cmake -B build -DGGML_NATIVE=OFF -DGGML_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DLLAMA_BUILD_TESTS=OFF ${OPT_SYCL_F16} && \
@@ -42,7 +43,7 @@ RUN mkdir -p /app/full \
4243
&& cp requirements.txt /app/full \
4344
&& cp .devops/tools.sh /app/full/tools.sh
4445

45-
FROM intel/deep-learning-essentials:$ONEAPI_VERSION AS base
46+
FROM docker.io/intel/deep-learning-essentials:$ONEAPI_VERSION AS base
4647

4748
ARG BUILD_DATE=N/A
4849
ARG APP_VERSION=N/A
@@ -57,11 +58,21 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
5758
org.opencontainers.image.url=$IMAGE_URL \
5859
org.opencontainers.image.source=$IMAGE_SOURCE
5960

60-
ARG IGC_VERSION=v2.20.5
61-
ARG IGC_VERSION_FULL=2_2.20.5+19972
62-
ARG COMPUTE_RUNTIME_VERSION=25.40.35563.10
63-
ARG COMPUTE_RUNTIME_VERSION_FULL=25.40.35563.10-0
64-
ARG IGDGMM_VERSION=22.8.2
61+
#Following versions are for multiple GPUs, since 26.x has known issue:
62+
# https://github.com/ggml-org/llama.cpp/issues/21747,
63+
# https://github.com/intel/compute-runtime/issues/921.
64+
#ARG IGC_VERSION=v2.20.5
65+
#ARG IGC_VERSION_FULL=2_2.20.5+19972
66+
#ARG COMPUTE_RUNTIME_VERSION=25.40.35563.10
67+
#ARG COMPUTE_RUNTIME_VERSION_FULL=25.40.35563.10-0
68+
#ARG IGDGMM_VERSION=22.8.2
69+
70+
71+
ARG IGC_VERSION=v2.34.4
72+
ARG IGC_VERSION_FULL=2_2.34.4+21428
73+
ARG COMPUTE_RUNTIME_VERSION=26.18.38308.1
74+
ARG COMPUTE_RUNTIME_VERSION_FULL=26.18.38308.1-0
75+
ARG IGDGMM_VERSION=22.10.0
6576
RUN mkdir /tmp/neo/ && cd /tmp/neo/ \
6677
&& wget https://github.com/intel/intel-graphics-compiler/releases/download/$IGC_VERSION/intel-igc-core-${IGC_VERSION_FULL}_amd64.deb \
6778
&& wget https://github.com/intel/intel-graphics-compiler/releases/download/$IGC_VERSION/intel-igc-opencl-${IGC_VERSION_FULL}_amd64.deb \
@@ -75,7 +86,7 @@ RUN mkdir /tmp/neo/ && cd /tmp/neo/ \
7586
&& dpkg --install *.deb
7687

7788
RUN apt-get update \
78-
&& apt-get install -y libgomp1 curl \
89+
&& apt-get install -y libgomp1 curl ffmpeg \
7990
&& apt autoremove -y \
8091
&& apt clean -y \
8192
&& rm -rf /tmp/* /var/tmp/* \

.devops/llama-cli-cann.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
33
ARG APP_VERSION=N/A
44
ARG APP_REVISION=N/A
55

6-
FROM ascendai/cann:$ASCEND_VERSION AS build
6+
FROM docker.io/ascendai/cann:$ASCEND_VERSION AS build
77

88
WORKDIR /app
99

@@ -30,7 +30,7 @@ RUN echo "Building with static libs" && \
3030
cmake --build build --config Release --target llama-completion
3131

3232
# TODO: use image with NNRT
33-
FROM ascendai/cann:$ASCEND_VERSION AS runtime
33+
FROM docker.io/ascendai/cann:$ASCEND_VERSION AS runtime
3434

3535
ARG BUILD_DATE=N/A
3636
ARG APP_VERSION=N/A

.devops/musa.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ ARG UBUNTU_VERSION=22.04
22
# This needs to generally match the container host's environment.
33
ARG MUSA_VERSION=rc4.3.0
44
# Target the MUSA build image
5-
ARG BASE_MUSA_DEV_CONTAINER=mthreads/musa:${MUSA_VERSION}-devel-ubuntu${UBUNTU_VERSION}-amd64
5+
ARG BASE_MUSA_DEV_CONTAINER=docker.io/mthreads/musa:${MUSA_VERSION}-devel-ubuntu${UBUNTU_VERSION}-amd64
66

7-
ARG BASE_MUSA_RUN_CONTAINER=mthreads/musa:${MUSA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}-amd64
7+
ARG BASE_MUSA_RUN_CONTAINER=docker.io/mthreads/musa:${MUSA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}-amd64
88

99
ARG BUILD_DATE=N/A
1010
ARG APP_VERSION=N/A
@@ -64,7 +64,7 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
6464
org.opencontainers.image.source=$IMAGE_SOURCE
6565

6666
RUN apt-get update \
67-
&& apt-get install -y libgomp1 curl \
67+
&& apt-get install -y libgomp1 curl ffmpeg \
6868
&& apt autoremove -y \
6969
&& apt clean -y \
7070
&& rm -rf /tmp/* /var/tmp/* \

.devops/openvino.Dockerfile

Lines changed: 66 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
ARG OPENVINO_VERSION_MAJOR=2026.0
2-
ARG OPENVINO_VERSION_FULL=2026.0.0.20965.c6d6a13a886
1+
ARG OPENVINO_VERSION_MAJOR=2026.2
2+
ARG OPENVINO_VERSION_FULL=2026.2.0.21903.52ddc073857
33
ARG UBUNTU_VERSION=24.04
44

55
# Intel GPU driver versions. https://github.com/intel/compute-runtime/releases
6-
ARG IGC_VERSION=v2.30.1
7-
ARG IGC_VERSION_FULL=2_2.30.1+20950
8-
ARG COMPUTE_RUNTIME_VERSION=26.09.37435.1
9-
ARG COMPUTE_RUNTIME_VERSION_FULL=26.09.37435.1-0
10-
ARG IGDGMM_VERSION=22.9.0
6+
ARG IGC_VERSION=v2.34.4
7+
ARG IGC_VERSION_FULL=2_2.34.4+21428
8+
ARG COMPUTE_RUNTIME_VERSION=26.18.38308.1
9+
ARG COMPUTE_RUNTIME_VERSION_FULL=26.18.38308.1-0
10+
ARG IGDGMM_VERSION=22.10.0
1111

1212
# Intel NPU driver versions. https://github.com/intel/linux-npu-driver/releases
13-
ARG NPU_DRIVER_VERSION=v1.32.0
14-
ARG NPU_DRIVER_FULL=v1.32.0.20260402-23905121947
13+
ARG NPU_DRIVER_VERSION=v1.33.0
14+
ARG NPU_DRIVER_FULL=v1.33.0.20260529-26625960453
1515
ARG LIBZE1_VERSION=1.27.0-1~24.04~ppa2
1616

1717
# Optional proxy build arguments
@@ -23,7 +23,7 @@ ARG APP_VERSION=N/A
2323
ARG APP_REVISION=N/A
2424

2525
## Build Image
26-
FROM ubuntu:${UBUNTU_VERSION} AS build
26+
FROM docker.io/ubuntu:${UBUNTU_VERSION} AS build
2727

2828
# Pass proxy args to build stage
2929
ARG http_proxy
@@ -46,13 +46,18 @@ RUN apt-get update && \
4646
intel-opencl-icd && \
4747
rm -rf /var/lib/apt/lists/*
4848

49-
# Install OpenVINO for Ubuntu 24.04
49+
# OpenVINO toolkit and GPU/NPU drivers are cached via BuildKit cache mounts to avoid re-downloading on rebuilds.
50+
# Install OpenVINO for Ubuntu 24.04.
5051
ARG OPENVINO_VERSION_MAJOR
5152
ARG OPENVINO_VERSION_FULL
52-
RUN mkdir -p /opt/intel && \
53-
wget https://storage.openvinotoolkit.org/repositories/openvino/packages/${OPENVINO_VERSION_MAJOR}/linux/openvino_toolkit_ubuntu24_${OPENVINO_VERSION_FULL}_x86_64.tgz && \
54-
tar -xf openvino_toolkit_ubuntu24_${OPENVINO_VERSION_FULL}_x86_64.tgz && \
55-
mv openvino_toolkit_ubuntu24_${OPENVINO_VERSION_FULL}_x86_64 /opt/intel/openvino_${OPENVINO_VERSION_MAJOR} && \
53+
RUN --mount=type=cache,target=/var/cache/openvino,sharing=locked \
54+
mkdir -p /opt/intel && \
55+
TGZ=/var/cache/openvino/openvino_toolkit_ubuntu24_${OPENVINO_VERSION_FULL}_x86_64.tgz && \
56+
if [ ! -f "$TGZ" ]; then \
57+
wget -O "$TGZ" https://storage.openvinotoolkit.org/repositories/openvino/packages/${OPENVINO_VERSION_MAJOR}/linux/openvino_toolkit_ubuntu24_${OPENVINO_VERSION_FULL}_x86_64.tgz; \
58+
fi && \
59+
tar -xf "$TGZ" -C /opt/intel/ && \
60+
mv /opt/intel/openvino_toolkit_ubuntu24_${OPENVINO_VERSION_FULL}_x86_64 /opt/intel/openvino_${OPENVINO_VERSION_MAJOR} && \
5661
cd /opt/intel/openvino_${OPENVINO_VERSION_MAJOR} && \
5762
echo "Y" | ./install_dependencies/install_openvino_dependencies.sh && \
5863
cd - && \
@@ -68,14 +73,14 @@ COPY . .
6873
RUN bash -c "source ${OpenVINO_DIR}/setupvars.sh && \
6974
cmake -B build/ReleaseOV -G Ninja \
7075
-DCMAKE_BUILD_TYPE=Release \
76+
-DLLAMA_BUILD_TESTS=OFF \
7177
-DGGML_OPENVINO=ON && \
72-
cmake --build build/ReleaseOV -j$(nproc)"
78+
cmake --build build/ReleaseOV --parallel "
7379

74-
# Copy all necessary libraries
80+
# Copy all necessary libraries (build outputs + OpenVINO runtime libs)
7581
RUN mkdir -p /app/lib && \
76-
find build/ReleaseOV -name '*.so*' -exec cp {} /app/lib \; && \
77-
find ${OpenVINO_DIR}/runtime/lib/intel64 -name '*.so*' -exec cp -P {} /app/lib \; 2>/dev/null || \
78-
find ${OpenVINO_DIR}/lib/intel64 -name '*.so*' -exec cp -P {} /app/lib \;
82+
find build/ReleaseOV -name '*.so*' -exec cp -P {} /app/lib \; && \
83+
find "${OpenVINO_DIR}/runtime/lib/intel64" -name '*.so*' -exec cp -P {} /app/lib \;
7984

8085
# Create runtime directories and copy binaries
8186
RUN mkdir -p /app/full \
@@ -88,7 +93,7 @@ RUN mkdir -p /app/full \
8893
&& cp .devops/tools.sh /app/full/tools.sh
8994

9095
## Base Runtime Image
91-
FROM ubuntu:${UBUNTU_VERSION} AS base
96+
FROM docker.io/ubuntu:${UBUNTU_VERSION} AS base
9297

9398
# Pass proxy args to runtime stage
9499
ARG http_proxy
@@ -107,7 +112,7 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
107112
org.opencontainers.image.source=$IMAGE_SOURCE
108113

109114
RUN apt-get update \
110-
&& apt-get install -y libgomp1 libtbb12 curl wget ocl-icd-libopencl1 \
115+
&& apt-get install -y libgomp1 libtbb12 curl wget ffmpeg ocl-icd-libopencl1 \
111116
&& apt autoremove -y \
112117
&& apt clean -y \
113118
&& rm -rf /tmp/* /var/tmp/* \
@@ -120,33 +125,41 @@ ARG IGC_VERSION_FULL
120125
ARG COMPUTE_RUNTIME_VERSION
121126
ARG COMPUTE_RUNTIME_VERSION_FULL
122127
ARG IGDGMM_VERSION
123-
RUN mkdir /tmp/neo/ && cd /tmp/neo/ \
124-
&& wget https://github.com/intel/intel-graphics-compiler/releases/download/${IGC_VERSION}/intel-igc-core-${IGC_VERSION_FULL}_amd64.deb \
125-
&& wget https://github.com/intel/intel-graphics-compiler/releases/download/${IGC_VERSION}/intel-igc-opencl-${IGC_VERSION_FULL}_amd64.deb \
126-
&& wget https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/intel-ocloc-dbgsym_${COMPUTE_RUNTIME_VERSION_FULL}_amd64.ddeb \
127-
&& wget https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/intel-ocloc_${COMPUTE_RUNTIME_VERSION_FULL}_amd64.deb \
128-
&& wget https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/intel-opencl-icd-dbgsym_${COMPUTE_RUNTIME_VERSION_FULL}_amd64.ddeb \
129-
&& wget https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/intel-opencl-icd_${COMPUTE_RUNTIME_VERSION_FULL}_amd64.deb \
130-
&& wget https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/libigdgmm12_${IGDGMM_VERSION}_amd64.deb \
131-
&& wget https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/libze-intel-gpu1-dbgsym_${COMPUTE_RUNTIME_VERSION_FULL}_amd64.ddeb \
132-
&& wget https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/libze-intel-gpu1_${COMPUTE_RUNTIME_VERSION_FULL}_amd64.deb \
133-
&& dpkg --install *.deb \
134-
&& rm -rf /tmp/neo/
128+
RUN --mount=type=cache,target=/var/cache/intel-gpu,sharing=locked \
129+
set -eux; \
130+
cd /var/cache/intel-gpu; \
131+
for url in \
132+
https://github.com/intel/intel-graphics-compiler/releases/download/${IGC_VERSION}/intel-igc-core-${IGC_VERSION_FULL}_amd64.deb \
133+
https://github.com/intel/intel-graphics-compiler/releases/download/${IGC_VERSION}/intel-igc-opencl-${IGC_VERSION_FULL}_amd64.deb \
134+
https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/intel-ocloc_${COMPUTE_RUNTIME_VERSION_FULL}_amd64.deb \
135+
https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/intel-opencl-icd_${COMPUTE_RUNTIME_VERSION_FULL}_amd64.deb \
136+
https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/libigdgmm12_${IGDGMM_VERSION}_amd64.deb \
137+
https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_VERSION}/libze-intel-gpu1_${COMPUTE_RUNTIME_VERSION_FULL}_amd64.deb ; do \
138+
f=$(basename "$url"); \
139+
[ -f "$f" ] || wget -q -O "$f" "$url"; \
140+
done; \
141+
apt-get update; \
142+
apt-get install -y --no-install-recommends ./*.deb; \
143+
rm -rf /var/lib/apt/lists/*
135144

136145
# Install NPU drivers
137146
ARG NPU_DRIVER_VERSION
138147
ARG NPU_DRIVER_FULL
139148
ARG LIBZE1_VERSION
140-
RUN mkdir /tmp/npu/ && cd /tmp/npu/ \
141-
&& wget https://github.com/intel/linux-npu-driver/releases/download/${NPU_DRIVER_VERSION}/linux-npu-driver-${NPU_DRIVER_FULL}-ubuntu2404.tar.gz \
142-
&& tar -xf linux-npu-driver-${NPU_DRIVER_FULL}-ubuntu2404.tar.gz \
143-
&& dpkg --install *.deb \
144-
&& rm -rf /tmp/npu/
145-
146-
RUN cd /tmp \
147-
&& wget https://snapshot.ppa.launchpadcontent.net/kobuk-team/intel-graphics/ubuntu/20260324T100000Z/pool/main/l/level-zero-loader/libze1_${LIBZE1_VERSION}_amd64.deb \
148-
&& dpkg --install libze1_${LIBZE1_VERSION}_amd64.deb \
149-
&& rm libze1_${LIBZE1_VERSION}_amd64.deb
149+
RUN --mount=type=cache,target=/var/cache/intel-npu,sharing=locked \
150+
set -eux; \
151+
TGZ=/var/cache/intel-npu/linux-npu-driver-${NPU_DRIVER_FULL}-ubuntu2404.tar.gz; \
152+
if [ ! -f "$TGZ" ]; then \
153+
wget -q -O "$TGZ" https://github.com/intel/linux-npu-driver/releases/download/${NPU_DRIVER_VERSION}/linux-npu-driver-${NPU_DRIVER_FULL}-ubuntu2404.tar.gz; \
154+
fi; \
155+
DEB=/var/cache/intel-npu/libze1_${LIBZE1_VERSION}_amd64.deb; \
156+
if [ ! -f "$DEB" ]; then \
157+
wget -q -O "$DEB" https://snapshot.ppa.launchpadcontent.net/kobuk-team/intel-graphics/ubuntu/20260324T100000Z/pool/main/l/level-zero-loader/libze1_${LIBZE1_VERSION}_amd64.deb; \
158+
fi; \
159+
mkdir /tmp/npu/ && cd /tmp/npu/ && tar -xf "$TGZ" && cp "$DEB" .; \
160+
apt-get update; \
161+
apt-get install -y --no-install-recommends ./*.deb; \
162+
rm -rf /tmp/npu/ /var/lib/apt/lists/*
150163

151164
COPY --from=build /app/lib/ /app/
152165

@@ -166,22 +179,26 @@ RUN apt-get update && \
166179
python3 \
167180
python3-venv \
168181
python3-pip && \
169-
python3 -m venv /ov-venv && \
170-
/ov-venv/bin/pip install --no-cache-dir --upgrade pip setuptools wheel && \
171-
/ov-venv/bin/pip install --no-cache-dir -r requirements.txt && \
182+
python3 -m venv /openvino-venv && \
183+
/openvino-venv/bin/pip install --no-cache-dir --upgrade pip setuptools wheel && \
184+
/openvino-venv/bin/pip install --no-cache-dir -r requirements.txt && \
172185
apt-get autoremove -y && \
173186
apt-get clean && \
174187
rm -rf /tmp/* /var/tmp/* && \
175188
find /var/cache/apt/archives /var/lib/apt/lists -not -name lock -type f -delete && \
176189
find /var/cache -type f -delete
177190

178-
ENTRYPOINT ["/bin/bash", "-c", "source /ov-venv/bin/activate && exec /app/tools.sh \"$@\"", "--"]
191+
# Activate the venv
192+
ENV VIRTUAL_ENV=/openvino-venv \
193+
PATH=/openvino-venv/bin:$PATH
194+
195+
ENTRYPOINT ["/app/tools.sh"]
179196

180197

181198
### Light, CLI only
182199
FROM base AS light
183200

184-
COPY --from=build /app/full/llama-cli /app/
201+
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app/
185202

186203
WORKDIR /app
187204

.devops/rocm.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG ROCM_VERSION=7.2.1
55
ARG AMDGPU_VERSION=7.2.1
66

77
# Target the ROCm build image
8-
ARG BASE_ROCM_DEV_CONTAINER=rocm/dev-ubuntu-${UBUNTU_VERSION}:${ROCM_VERSION}-complete
8+
ARG BASE_ROCM_DEV_CONTAINER=docker.io/rocm/dev-ubuntu-${UBUNTU_VERSION}:${ROCM_VERSION}-complete
99

1010
ARG BUILD_DATE=N/A
1111
ARG APP_VERSION=N/A
@@ -76,7 +76,7 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
7676
org.opencontainers.image.source=$IMAGE_SOURCE
7777

7878
RUN apt-get update \
79-
&& apt-get install -y libgomp1 curl \
79+
&& apt-get install -y libgomp1 curl ffmpeg \
8080
&& apt autoremove -y \
8181
&& apt clean -y \
8282
&& rm -rf /tmp/* /var/tmp/* \

0 commit comments

Comments
 (0)