Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 11c67d1

Browse files
mudlermudler
authored
chore(ci): strip 'core' in the image suffix, identify python-based images with 'extras' (mudler#5353)
Signed-off-by: Ettore Di Giacinto <[email protected]>
1 parent 63f7c86 commit 11c67d1

1 file changed

Lines changed: 25 additions & 34 deletions

File tree

‎.github/workflows/image.yml‎

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,27 @@ jobs:
4545
- build-type: 'hipblas'
4646
platforms: 'linux/amd64'
4747
tag-latest: 'auto'
48-
tag-suffix: '-hipblas'
48+
tag-suffix: '-hipblas-extras'
4949
ffmpeg: 'true'
5050
image-type: 'extras'
5151
aio: "-aio-gpu-hipblas"
5252
base-image: "rocm/dev-ubuntu-22.04:6.1"
5353
grpc-base-image: "ubuntu:22.04"
54-
latest-image: 'latest-gpu-hipblas'
54+
latest-image: 'latest-gpu-hipblas-extras'
5555
latest-image-aio: 'latest-aio-gpu-hipblas'
5656
runs-on: 'arc-runner-set'
5757
makeflags: "--jobs=3 --output-sync=target"
5858
- build-type: 'hipblas'
5959
platforms: 'linux/amd64'
6060
tag-latest: 'false'
61-
tag-suffix: '-hipblas-core'
61+
tag-suffix: '-hipblas'
6262
ffmpeg: 'true'
6363
image-type: 'core'
6464
base-image: "rocm/dev-ubuntu-22.04:6.1"
6565
grpc-base-image: "ubuntu:22.04"
6666
runs-on: 'arc-runner-set'
6767
makeflags: "--jobs=3 --output-sync=target"
68-
latest-image: 'latest-gpu-hipblas-core'
68+
latest-image: 'latest-gpu-hipblas'
6969
self-hosted-jobs:
7070
uses: ./.github/workflows/image_build.yml
7171
with:
@@ -95,67 +95,58 @@ jobs:
9595
max-parallel: ${{ github.event_name != 'pull_request' && 5 || 8 }}
9696
matrix:
9797
include:
98-
- build-type: ''
99-
platforms: 'linux/amd64'
100-
tag-latest: 'auto'
101-
tag-suffix: ''
102-
ffmpeg: 'true'
103-
image-type: 'extras'
104-
runs-on: 'arc-runner-set'
105-
base-image: "ubuntu:22.04"
106-
makeflags: "--jobs=3 --output-sync=target"
10798
- build-type: 'cublas'
10899
cuda-major-version: "11"
109100
cuda-minor-version: "7"
110101
platforms: 'linux/amd64'
111102
tag-latest: 'auto'
112-
tag-suffix: '-cublas-cuda11'
103+
tag-suffix: '-cublas-cuda11-extras'
113104
ffmpeg: 'true'
114105
image-type: 'extras'
115106
runs-on: 'arc-runner-set'
116107
base-image: "ubuntu:22.04"
117108
aio: "-aio-gpu-nvidia-cuda-11"
118-
latest-image: 'latest-gpu-nvidia-cuda-11'
109+
latest-image: 'latest-gpu-nvidia-cuda-11-extras'
119110
latest-image-aio: 'latest-aio-gpu-nvidia-cuda-11'
120111
makeflags: "--jobs=3 --output-sync=target"
121112
- build-type: 'cublas'
122113
cuda-major-version: "12"
123114
cuda-minor-version: "0"
124115
platforms: 'linux/amd64'
125116
tag-latest: 'auto'
126-
tag-suffix: '-cublas-cuda12'
117+
tag-suffix: '-cublas-cuda12-extras'
127118
ffmpeg: 'true'
128119
image-type: 'extras'
129120
runs-on: 'arc-runner-set'
130121
base-image: "ubuntu:22.04"
131122
aio: "-aio-gpu-nvidia-cuda-12"
132-
latest-image: 'latest-gpu-nvidia-cuda-12'
123+
latest-image: 'latest-gpu-nvidia-cuda-12-extras'
133124
latest-image-aio: 'latest-aio-gpu-nvidia-cuda-12'
134125
makeflags: "--jobs=3 --output-sync=target"
135126
- build-type: 'sycl_f16'
136127
platforms: 'linux/amd64'
137128
tag-latest: 'auto'
138129
base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
139130
grpc-base-image: "ubuntu:22.04"
140-
tag-suffix: '-sycl-f16'
131+
tag-suffix: '-sycl-f16-extras'
141132
ffmpeg: 'true'
142133
image-type: 'extras'
143134
runs-on: 'arc-runner-set'
144135
aio: "-aio-gpu-intel-f16"
145-
latest-image: 'latest-gpu-intel-f16'
136+
latest-image: 'latest-gpu-intel-f16-extras'
146137
latest-image-aio: 'latest-aio-gpu-intel-f16'
147138
makeflags: "--jobs=3 --output-sync=target"
148139
- build-type: 'sycl_f32'
149140
platforms: 'linux/amd64'
150141
tag-latest: 'auto'
151142
base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
152143
grpc-base-image: "ubuntu:22.04"
153-
tag-suffix: '-sycl-f32'
144+
tag-suffix: '-sycl-f32-extras'
154145
ffmpeg: 'true'
155146
image-type: 'extras'
156147
runs-on: 'arc-runner-set'
157148
aio: "-aio-gpu-intel-f32"
158-
latest-image: 'latest-gpu-intel-f32'
149+
latest-image: 'latest-gpu-intel-f32-extras'
159150
latest-image-aio: 'latest-aio-gpu-intel-f32'
160151
makeflags: "--jobs=3 --output-sync=target"
161152
# Core images
@@ -164,23 +155,23 @@ jobs:
164155
tag-latest: 'false'
165156
base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
166157
grpc-base-image: "ubuntu:22.04"
167-
tag-suffix: '-sycl-f16-core'
158+
tag-suffix: '-sycl-f16'
168159
ffmpeg: 'true'
169160
image-type: 'core'
170161
runs-on: 'arc-runner-set'
171162
makeflags: "--jobs=3 --output-sync=target"
172-
latest-image: 'latest-gpu-intel-f16-core'
163+
latest-image: 'latest-gpu-intel-f16'
173164
- build-type: 'sycl_f32'
174165
platforms: 'linux/amd64'
175166
tag-latest: 'false'
176167
base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
177168
grpc-base-image: "ubuntu:22.04"
178-
tag-suffix: '-sycl-f32-core'
169+
tag-suffix: '-sycl-f32'
179170
ffmpeg: 'true'
180171
image-type: 'core'
181172
runs-on: 'arc-runner-set'
182173
makeflags: "--jobs=3 --output-sync=target"
183-
latest-image: 'latest-gpu-intel-f32-core'
174+
latest-image: 'latest-gpu-intel-f32'
184175

185176
core-image-build:
186177
uses: ./.github/workflows/image_build.yml
@@ -213,7 +204,7 @@ jobs:
213204
- build-type: ''
214205
platforms: 'linux/amd64,linux/arm64'
215206
tag-latest: 'auto'
216-
tag-suffix: '-core'
207+
tag-suffix: ''
217208
ffmpeg: 'true'
218209
image-type: 'core'
219210
base-image: "ubuntu:22.04"
@@ -228,38 +219,38 @@ jobs:
228219
cuda-minor-version: "7"
229220
platforms: 'linux/amd64'
230221
tag-latest: 'false'
231-
tag-suffix: '-cublas-cuda11-core'
222+
tag-suffix: '-cublas-cuda11'
232223
ffmpeg: 'true'
233224
image-type: 'core'
234225
runs-on: 'arc-runner-set'
235226
base-image: "ubuntu:22.04"
236227
makeflags: "--jobs=4 --output-sync=target"
237228
skip-drivers: 'false'
238-
latest-image: 'latest-gpu-nvidia-cuda-12-core'
229+
latest-image: 'latest-gpu-nvidia-cuda-12'
239230
- build-type: 'cublas'
240231
cuda-major-version: "12"
241232
cuda-minor-version: "0"
242233
platforms: 'linux/amd64'
243234
tag-latest: 'false'
244-
tag-suffix: '-cublas-cuda12-core'
235+
tag-suffix: '-cublas-cuda12'
245236
ffmpeg: 'true'
246237
image-type: 'core'
247238
runs-on: 'arc-runner-set'
248239
base-image: "ubuntu:22.04"
249240
skip-drivers: 'false'
250241
makeflags: "--jobs=4 --output-sync=target"
251-
latest-image: 'latest-gpu-nvidia-cuda-12-core'
242+
latest-image: 'latest-gpu-nvidia-cuda-12'
252243
- build-type: 'vulkan'
253244
platforms: 'linux/amd64'
254245
tag-latest: 'false'
255-
tag-suffix: '-vulkan-core'
246+
tag-suffix: '-vulkan'
256247
ffmpeg: 'true'
257248
image-type: 'core'
258249
runs-on: 'arc-runner-set'
259250
base-image: "ubuntu:22.04"
260251
skip-drivers: 'false'
261252
makeflags: "--jobs=4 --output-sync=target"
262-
latest-image: 'latest-gpu-vulkan-core'
253+
latest-image: 'latest-gpu-vulkan'
263254
gh-runner:
264255
uses: ./.github/workflows/image_build.yml
265256
with:
@@ -292,8 +283,8 @@ jobs:
292283
cuda-minor-version: "0"
293284
platforms: 'linux/arm64'
294285
tag-latest: 'false'
295-
tag-suffix: '-nvidia-l4t-arm64-core'
296-
latest-image: 'latest-nvidia-l4t-arm64-core'
286+
tag-suffix: '-nvidia-l4t-arm64'
287+
latest-image: 'latest-nvidia-l4t-arm64'
297288
ffmpeg: 'true'
298289
image-type: 'core'
299290
base-image: "nvcr.io/nvidia/l4t-jetpack:r36.4.0"

0 commit comments

Comments
 (0)