Skip to content

Commit 977e35c

Browse files
ngxsonngxson
committed
Merge branch 'master' into xsn/jinja_dump_prog
2 parents cc25c9c + ebd048f commit 977e35c

104 files changed

Lines changed: 8908 additions & 981 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/cann.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ ENTRYPOINT ["/app/tools.sh"]
145145
# ==============================================================================
146146
FROM base AS light
147147

148-
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
148+
COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
149149

150150
ENTRYPOINT [ "/app/llama-cli" ]
151151

@@ -156,7 +156,7 @@ FROM base AS server
156156

157157
ENV LLAMA_ARG_HOST=0.0.0.0
158158

159-
COPY --from=build /app/full/llama-server /app
159+
COPY --from=build /app/full/llama /app/full/llama-server /app
160160

161161
HEALTHCHECK --interval=5m CMD [ "curl", "-f", "http://localhost:8080/health" ]
162162

‎.devops/cpu.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ ENTRYPOINT ["/app/tools.sh"]
104104
### Light, CLI only
105105
FROM base AS light
106106

107-
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
107+
COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
108108

109109
WORKDIR /app
110110

@@ -115,7 +115,7 @@ FROM base AS server
115115

116116
ENV LLAMA_ARG_HOST=0.0.0.0
117117

118-
COPY --from=build /app/full/llama-server /app
118+
COPY --from=build /app/full/llama /app/full/llama-server /app
119119

120120
WORKDIR /app
121121

‎.devops/cuda.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ ENTRYPOINT ["/app/tools.sh"]
113113
### Light, CLI only
114114
FROM base AS light
115115

116-
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
116+
COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
117117

118118
WORKDIR /app
119119

@@ -124,7 +124,7 @@ FROM base AS server
124124

125125
ENV LLAMA_ARG_HOST=0.0.0.0
126126

127-
COPY --from=build /app/full/llama-server /app
127+
COPY --from=build /app/full/llama /app/full/llama-server /app
128128

129129
WORKDIR /app
130130

‎.devops/intel.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ ENTRYPOINT ["/app/tools.sh"]
141141
FROM base AS light
142142

143143
COPY --from=build /app/lib/ /app
144-
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
144+
COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
145145

146146
WORKDIR /app
147147

@@ -153,7 +153,7 @@ FROM base AS server
153153
ENV LLAMA_ARG_HOST=0.0.0.0
154154

155155
COPY --from=build /app/lib/ /app
156-
COPY --from=build /app/full/llama-server /app
156+
COPY --from=build /app/full/llama /app/full/llama-server /app
157157

158158
WORKDIR /app
159159

‎.devops/musa.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ ENTRYPOINT ["/app/tools.sh"]
115115
### Light, CLI only
116116
FROM base AS light
117117

118-
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
118+
COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
119119

120120
WORKDIR /app
121121

@@ -126,7 +126,7 @@ FROM base AS server
126126

127127
ENV LLAMA_ARG_HOST=0.0.0.0
128128

129-
COPY --from=build /app/full/llama-server /app
129+
COPY --from=build /app/full/llama /app/full/llama-server /app
130130

131131
WORKDIR /app
132132

‎.devops/openvino.Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
ARG OPENVINO_VERSION_MAJOR=2026.2
2-
ARG OPENVINO_VERSION_FULL=2026.2.0.21903.52ddc073857
1+
ARG OPENVINO_VERSION_MAJOR=2026.2.1
2+
ARG OPENVINO_VERSION_FULL=2026.2.1.21919.ede283a88e3
33
ARG UBUNTU_VERSION=24.04
44

55
# Intel GPU driver versions. https://github.com/intel/compute-runtime/releases
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
6+
ARG IGC_VERSION=v2.36.3
7+
ARG IGC_VERSION_FULL=2_2.36.3+21719
8+
ARG COMPUTE_RUNTIME_VERSION=26.22.38646.4
9+
ARG COMPUTE_RUNTIME_VERSION_FULL=26.22.38646.4-0
1010
ARG IGDGMM_VERSION=22.10.0
1111

1212
# Intel NPU driver versions. https://github.com/intel/linux-npu-driver/releases
@@ -214,7 +214,7 @@ ENTRYPOINT ["/app/tools.sh"]
214214
### Light, CLI only
215215
FROM base AS light
216216

217-
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app/
217+
COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
218218

219219
WORKDIR /app
220220

@@ -225,7 +225,7 @@ FROM base AS server
225225

226226
ENV LLAMA_ARG_HOST=0.0.0.0
227227

228-
COPY --from=build /app/full/llama-server /app/
228+
COPY --from=build /app/full/llama /app/full/llama-server /app/
229229

230230
WORKDIR /app
231231

‎.devops/rocm.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ ENTRYPOINT ["/app/tools.sh"]
127127
### Light, CLI only
128128
FROM base AS light
129129

130-
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
130+
COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
131131

132132
WORKDIR /app
133133

@@ -138,7 +138,7 @@ FROM base AS server
138138

139139
ENV LLAMA_ARG_HOST=0.0.0.0
140140

141-
COPY --from=build /app/full/llama-server /app
141+
COPY --from=build /app/full/llama /app/full/llama-server /app
142142

143143
WORKDIR /app
144144

‎.devops/s390x.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ WORKDIR /llama.cpp/bin
124124

125125
# Copy llama.cpp binaries and libraries
126126
COPY --from=collector /llama.cpp/bin/*.so /llama.cpp/bin
127-
COPY --from=collector /llama.cpp/bin/llama-cli /llama.cpp/bin/llama-completion /llama.cpp/bin
127+
COPY --from=collector /llama.cpp/bin/llama /llama.cpp/bin/llama-cli /llama.cpp/bin/llama-completion /llama.cpp/bin
128128

129129
ENTRYPOINT [ "/llama.cpp/bin/llama-cli" ]
130130

@@ -138,7 +138,7 @@ WORKDIR /llama.cpp/bin
138138

139139
# Copy llama.cpp binaries and libraries
140140
COPY --from=collector /llama.cpp/bin/*.so /llama.cpp/bin
141-
COPY --from=collector /llama.cpp/bin/llama-server /llama.cpp/bin
141+
COPY --from=collector /llama.cpp/bin/llama /llama.cpp/bin/llama-server /llama.cpp/bin
142142

143143
EXPOSE 8080
144144

‎.devops/vulkan.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ ENTRYPOINT ["/app/tools.sh"]
107107
### Light, CLI only
108108
FROM base AS light
109109

110-
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
110+
COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
111111

112112
WORKDIR /app
113113

@@ -118,7 +118,7 @@ FROM base AS server
118118

119119
ENV LLAMA_ARG_HOST=0.0.0.0
120120

121-
COPY --from=build /app/full/llama-server /app
121+
COPY --from=build /app/full/llama /app/full/llama-server /app
122122

123123
WORKDIR /app
124124

‎.devops/zendnn.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ ENTRYPOINT ["/app/tools.sh"]
9797
### Light, CLI only
9898
FROM base AS light
9999

100-
COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
100+
COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
101101

102102
WORKDIR /app
103103

@@ -108,7 +108,7 @@ FROM base AS server
108108

109109
ENV LLAMA_ARG_HOST=0.0.0.0
110110

111-
COPY --from=build /app/full/llama-server /app
111+
COPY --from=build /app/full/llama /app/full/llama-server /app
112112

113113
WORKDIR /app
114114

0 commit comments

Comments
 (0)