docker : copy conversion files (#23370)

diff --git a/.devops/cann.Dockerfile b/.devops/cann.Dockerfile
index acd1e26bcec8bb18f0c132fe0ba7e24ee627ffd5..9df86d0489bf3a19d423bb35f08aeb98d01fc821 100644 (file)
--- a/.devops/cann.Dockerfile
+++ b/.devops/cann.Dockerfile
@@ -58,6 +58,7 @@ RUN mkdir -p /app/lib && \
 RUN mkdir -p /app/full && \
     cp build/bin/* /app/full/ && \
     cp *.py /app/full/ && \
+    cp -r conversion /app/full/ && \
     cp -r gguf-py /app/full/ && \
     cp -r requirements /app/full/ && \
     cp requirements.txt /app/full/

diff --git a/.devops/cpu.Dockerfile b/.devops/cpu.Dockerfile
index c8f32235d162fdd943149dfe9c78e45d650bca7f..c19b7038bbefca761c8187b707098a181d730a00 100644 (file)
--- a/.devops/cpu.Dockerfile
+++ b/.devops/cpu.Dockerfile
@@ -30,6 +30,7 @@ RUN mkdir -p /app/lib && \
 RUN mkdir -p /app/full \
     && cp build/bin/* /app/full \
     && cp *.py /app/full \
+    && cp -r conversion /app/full \
     && cp -r gguf-py /app/full \
     && cp -r requirements /app/full \
     && cp requirements.txt /app/full \

diff --git a/.devops/cuda.Dockerfile b/.devops/cuda.Dockerfile
index 3805ea3a00966922f03a9e20abbe7bc791d37f1c..621fe8b6a975ced8b961c94ca7a6c26eebd15910 100644 (file)
--- a/.devops/cuda.Dockerfile
+++ b/.devops/cuda.Dockerfile
@@ -36,6 +36,7 @@ RUN mkdir -p /app/lib && \
 RUN mkdir -p /app/full \
     && cp build/bin/* /app/full \
     && cp *.py /app/full \
+    && cp -r conversion /app/full \
     && cp -r gguf-py /app/full \
     && cp -r requirements /app/full \
     && cp requirements.txt /app/full \

diff --git a/.devops/intel.Dockerfile b/.devops/intel.Dockerfile
index 218418b80b674313751f29cc191ff5b14ec1da3c..b127c5cec4644d30d16418966a4aac81b5a02501 100644 (file)
--- a/.devops/intel.Dockerfile
+++ b/.devops/intel.Dockerfile
@@ -36,6 +36,7 @@ RUN mkdir -p /app/lib && \
 RUN mkdir -p /app/full \
     && cp build/bin/* /app/full \
     && cp *.py /app/full \
+    && cp -r conversion /app/full \
     && cp -r gguf-py /app/full \
     && cp -r requirements /app/full \
     && cp requirements.txt /app/full \

diff --git a/.devops/musa.Dockerfile b/.devops/musa.Dockerfile
index a7f70b5f0df63349f0c26a3cbca202db1b3263cb..3194294b36d73c1fa36bbb1ed015441901744614 100644 (file)
--- a/.devops/musa.Dockerfile
+++ b/.devops/musa.Dockerfile
@@ -41,6 +41,7 @@ RUN mkdir -p /app/lib && \
 RUN mkdir -p /app/full \
     && cp build/bin/* /app/full \
     && cp *.py /app/full \
+    && cp -r conversion /app/full \
     && cp -r gguf-py /app/full \
     && cp -r requirements /app/full \
     && cp requirements.txt /app/full \

diff --git a/.devops/openvino.Dockerfile b/.devops/openvino.Dockerfile
index 1266713f3788b090c44c724a10d2172adaa30f33..6dabdb323cac786709e39c77fd80828fc786c2e0 100644 (file)
--- a/.devops/openvino.Dockerfile
+++ b/.devops/openvino.Dockerfile
@@ -81,6 +81,7 @@ RUN mkdir -p /app/lib && \
 RUN mkdir -p /app/full \
     && cp build/ReleaseOV/bin/* /app/full/ \
     && cp *.py /app/full \
+    && cp -r conversion /app/full \
     && cp -r gguf-py /app/full \
     && cp -r requirements /app/full \
     && cp requirements.txt /app/full \

diff --git a/.devops/rocm.Dockerfile b/.devops/rocm.Dockerfile
index 2da15975d13f6b65d18ba2d1149037cacce6ee57..3fdf7a8e487f44158f17a1d8cefedcf7cca7e819 100644 (file)
--- a/.devops/rocm.Dockerfile
+++ b/.devops/rocm.Dockerfile
@@ -53,6 +53,7 @@ RUN mkdir -p /app/lib \
 RUN mkdir -p /app/full \
     && cp build/bin/* /app/full \
     && cp *.py /app/full \
+    && cp -r conversion /app/full \
     && cp -r gguf-py /app/full \
     && cp -r requirements /app/full \
     && cp requirements.txt /app/full \

diff --git a/.devops/s390x.Dockerfile b/.devops/s390x.Dockerfile
index d36f5f3ccc5dc256895968d497989dc4dcacc2cf..31c2fa902d4afeeb56d1630fbcdc6b2831b08fae 100644 (file)
--- a/.devops/s390x.Dockerfile
+++ b/.devops/s390x.Dockerfile
@@ -37,6 +37,7 @@ RUN --mount=type=cache,target=/root/.ccache \
 
 COPY *.py             /opt/llama.cpp/bin
 COPY .devops/tools.sh /opt/llama.cpp/bin
+COPY conversion       /opt/llama.cpp/conversion
 
 COPY gguf-py          /opt/llama.cpp/gguf-py
 COPY requirements.txt /opt/llama.cpp/gguf-py
@@ -47,9 +48,10 @@ COPY requirements     /opt/llama.cpp/gguf-py/requirements
 FROM scratch AS collector
 
 # Copy llama.cpp binaries and libraries
-COPY --from=build /opt/llama.cpp/bin     /llama.cpp/bin
-COPY --from=build /opt/llama.cpp/lib     /llama.cpp/lib
-COPY --from=build /opt/llama.cpp/gguf-py /llama.cpp/gguf-py
+COPY --from=build /opt/llama.cpp/bin        /llama.cpp/bin
+COPY --from=build /opt/llama.cpp/lib        /llama.cpp/lib
+COPY --from=build /opt/llama.cpp/gguf-py    /llama.cpp/gguf-py
+COPY --from=build /opt/llama.cpp/conversion /llama.cpp/conversion
 
 
 ### Base image
@@ -107,6 +109,7 @@ RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
 
 COPY --from=collector /llama.cpp/bin /app
 COPY --from=collector /llama.cpp/gguf-py /app/gguf-py
+COPY --from=collector /llama.cpp/conversion /app/conversion
 
 RUN pip install --no-cache-dir --break-system-packages \
         -r /app/gguf-py/requirements.txt

diff --git a/.devops/vulkan.Dockerfile b/.devops/vulkan.Dockerfile
index 464ccfef1ce401a278cecca8da68a82f09959b9f..138a50d7da5383436501cbcf36947abee9be0520 100644 (file)
--- a/.devops/vulkan.Dockerfile
+++ b/.devops/vulkan.Dockerfile
@@ -26,6 +26,7 @@ RUN mkdir -p /app/lib && \
 RUN mkdir -p /app/full \
     && cp build/bin/* /app/full \
     && cp *.py /app/full \
+    && cp -r conversion /app/full \
     && cp -r gguf-py /app/full \
     && cp -r requirements /app/full \
     && cp requirements.txt /app/full \