Skip to content

Commit 34852f6

Browse files
keighrimkeighrim
authored
Merge pull request #281 from clamsproject/256-hf4-hf5-images
Add hf4/hf5 container images with hf as alias
2 parents fb98e0e + 25e6c00 commit 34852f6

10 files changed

Lines changed: 101 additions & 23 deletions

‎.github/workflows/containers.yml‎

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,15 @@ jobs:
116116
buildfilename: './container/opencv4.containerfile'
117117
version: ${{ needs.set-version.outputs.version }}
118118

119+
call-build-hf:
120+
name: "🤙 Call container workflow with `hf`"
121+
needs: ['set-version', 'call-build-hf5']
122+
uses: ./.github/workflows/container.yml
123+
secrets: inherit
124+
with:
125+
buildfilename: './container/hf.containerfile'
126+
version: ${{ needs.set-version.outputs.version }}
127+
119128
call-build-opencv4-tf2:
120129
name: "🤙 Call container workflow with `opencv4-tf2`"
121130
needs: ['set-version', 'call-build-opencv4']
@@ -134,29 +143,74 @@ jobs:
134143
buildfilename: './container/opencv4-torch2.containerfile'
135144
version: ${{ needs.set-version.outputs.version }}
136145

137-
call-build-hf:
138-
name: "🤙 Call container workflow with `hf`"
146+
call-build-hf4:
147+
name: "🤙 Call container workflow with `hf4`"
139148
needs: ['set-version', 'call-build-torch2']
140149
uses: ./.github/workflows/container.yml
141150
secrets: inherit
142151
with:
143-
buildfilename: './container/hf.containerfile'
152+
buildfilename: './container/hf4.containerfile'
153+
version: ${{ needs.set-version.outputs.version }}
154+
155+
call-build-hf5:
156+
name: "🤙 Call container workflow with `hf5`"
157+
needs: ['set-version', 'call-build-torch2']
158+
uses: ./.github/workflows/container.yml
159+
secrets: inherit
160+
with:
161+
buildfilename: './container/hf5.containerfile'
144162
version: ${{ needs.set-version.outputs.version }}
145163

146164
call-build-ffmpeg-hf:
147165
name: "🤙 Call container workflow with `ffmpeg-hf`"
148-
needs: ['set-version', 'call-build-ffmpeg-torch2']
166+
needs: ['set-version', 'call-build-ffmpeg-hf5']
149167
uses: ./.github/workflows/container.yml
150168
secrets: inherit
151169
with:
152170
buildfilename: './container/ffmpeg-hf.containerfile'
153171
version: ${{ needs.set-version.outputs.version }}
154172

173+
call-build-ffmpeg-hf4:
174+
name: "🤙 Call container workflow with `ffmpeg-hf4`"
175+
needs: ['set-version', 'call-build-ffmpeg-torch2']
176+
uses: ./.github/workflows/container.yml
177+
secrets: inherit
178+
with:
179+
buildfilename: './container/ffmpeg-hf4.containerfile'
180+
version: ${{ needs.set-version.outputs.version }}
181+
182+
call-build-ffmpeg-hf5:
183+
name: "🤙 Call container workflow with `ffmpeg-hf5`"
184+
needs: ['set-version', 'call-build-ffmpeg-torch2']
185+
uses: ./.github/workflows/container.yml
186+
secrets: inherit
187+
with:
188+
buildfilename: './container/ffmpeg-hf5.containerfile'
189+
version: ${{ needs.set-version.outputs.version }}
190+
155191
call-build-opencv4-hf:
156192
name: "🤙 Call container workflow with `opencv4-hf`"
157-
needs: ['set-version', 'call-build-opencv4-torch2']
193+
needs: ['set-version', 'call-build-opencv4-hf5']
158194
uses: ./.github/workflows/container.yml
159195
secrets: inherit
160196
with:
161197
buildfilename: './container/opencv4-hf.containerfile'
162198
version: ${{ needs.set-version.outputs.version }}
199+
200+
call-build-opencv4-hf4:
201+
name: "🤙 Call container workflow with `opencv4-hf4`"
202+
needs: ['set-version', 'call-build-opencv4-torch2']
203+
uses: ./.github/workflows/container.yml
204+
secrets: inherit
205+
with:
206+
buildfilename: './container/opencv4-hf4.containerfile'
207+
version: ${{ needs.set-version.outputs.version }}
208+
209+
call-build-opencv4-hf5:
210+
name: "🤙 Call container workflow with `opencv4-hf5`"
211+
needs: ['set-version', 'call-build-opencv4-torch2']
212+
uses: ./.github/workflows/container.yml
213+
secrets: inherit
214+
with:
215+
buildfilename: './container/opencv4-hf5.containerfile'
216+
version: ${{ needs.set-version.outputs.version }}

‎container/ffmpeg-hf.containerfile‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
ARG clams_version
2-
FROM ghcr.io/clamsproject/clams-python-ffmpeg-torch2:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-ffmpeg-hf image is shipped with clams-python, ffmpeg, and vairous huggingface libraries (PyTorch backend)"
4-
5-
RUN pip install --no-cache-dir transformers[torch,tokenizers]==5.*
6-
RUN pip install --no-cache-dir datasets
7-
2+
FROM ghcr.io/clamsproject/clams-python-ffmpeg-hf5:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-ffmpeg-hf image is an alias for clams-python-ffmpeg-hf5 (latest HuggingFace/transformers)"

‎container/ffmpeg-hf4.containerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-ffmpeg-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-ffmpeg-hf4 image is shipped with clams-python, ffmpeg, and HuggingFace libraries with transformers 4.x (PyTorch backend)"
4+
5+
RUN pip install --no-cache-dir transformers[torch,tokenizers]==4.*
6+
RUN pip install --no-cache-dir datasets

‎container/ffmpeg-hf5.containerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-ffmpeg-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-ffmpeg-hf5 image is shipped with clams-python, ffmpeg, and HuggingFace libraries with transformers 5.x (PyTorch backend)"
4+
5+
RUN pip install --no-cache-dir transformers[torch,tokenizers]==5.*
6+
RUN pip install --no-cache-dir datasets

‎container/hf.containerfile‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
ARG clams_version
2-
FROM ghcr.io/clamsproject/clams-python-torch2:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-hf image is shipped with clams-python and vairous huggingface libraries (PyTorch backend)"
4-
5-
RUN pip install --no-cache-dir transformers[torch,tokenizers]==5.*
6-
RUN pip install --no-cache-dir datasets
7-
2+
FROM ghcr.io/clamsproject/clams-python-hf5:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-hf image is an alias for clams-python-hf5 (latest HuggingFace/transformers)"

‎container/hf4.containerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-hf4 image is shipped with clams-python and HuggingFace libraries with transformers 4.x (PyTorch backend)"
4+
5+
RUN pip install --no-cache-dir transformers[torch,tokenizers]==4.*
6+
RUN pip install --no-cache-dir datasets

‎container/hf5.containerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-hf5 image is shipped with clams-python and HuggingFace libraries with transformers 5.x (PyTorch backend)"
4+
5+
RUN pip install --no-cache-dir transformers[torch,tokenizers]==5.*
6+
RUN pip install --no-cache-dir datasets

‎container/opencv4-hf.containerfile‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
ARG clams_version
2-
FROM ghcr.io/clamsproject/clams-python-opencv4-torch2:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-opencv4-hf image is shipped with clams-python, opencv4 (ffmpeg backend), and vairous huggingface libraries (PyTorch backend)"
4-
5-
RUN pip install --no-cache-dir transformers[torch,tokenizers]==5.*
6-
RUN pip install --no-cache-dir datasets
7-
2+
FROM ghcr.io/clamsproject/clams-python-opencv4-hf5:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-opencv4-hf image is an alias for clams-python-opencv4-hf5 (latest HuggingFace/transformers)"

‎container/opencv4-hf4.containerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-opencv4-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-opencv4-hf4 image is shipped with clams-python, opencv4 (ffmpeg backend), and HuggingFace libraries with transformers 4.x (PyTorch backend)"
4+
5+
RUN pip install --no-cache-dir transformers[torch,tokenizers]==4.*
6+
RUN pip install --no-cache-dir datasets

‎container/opencv4-hf5.containerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-opencv4-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-opencv4-hf5 image is shipped with clams-python, opencv4 (ffmpeg backend), and HuggingFace libraries with transformers 5.x (PyTorch backend)"
4+
5+
RUN pip install --no-cache-dir transformers[torch,tokenizers]==5.*
6+
RUN pip install --no-cache-dir datasets

0 commit comments

Comments
 (0)