Skip to content

Commit 60b46c1

Browse files
committed
Fix dependencies
Signed-off-by: Beat Buesser <[email protected]>
1 parent 96a2556 commit 60b46c1

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed

.github/actions/deepspeech-v3/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get base image
2-
FROM python:3.10.13-slim-bookworm
2+
FROM python:3.10.17-slim-bookworm
33

44
# Set to install things in non-interactive mode
55
ENV DEBIAN_FRONTEND noninteractive
@@ -25,10 +25,12 @@ RUN apt-get update \
2525
&& rm -r /var/lib/apt/lists/*
2626

2727
# Install necessary libraries for deepspeech v3
28-
RUN pip install --ignore-installed PyYAML torch==2.1.1 tensorflow==2.14.1 torchaudio==2.1.1 pytorch-lightning==2.1.2 scikit-learn==1.3.2
28+
RUN pip install --ignore-installed torch==2.1.2 torchaudio==2.1.2 --index-url https://download.pytorch.org/whl/cpu
29+
RUN pip install --ignore-installed --no-deps pytorch-lightning==2.1.2
30+
RUN pip install --ignore-installed PyYAML tensorflow==2.14.1 scikit-learn==1.3.2
2931
RUN pip install --no-build-isolation fairscale==0.4.13
3032

31-
RUN git clone https://github.com/SeanNaren/deepspeech.pytorch.git && cd deepspeech.pytorch && sed -i '/^sklearn/d' requirements.txt && pip install -r requirements.txt && pip install -e .
33+
RUN git clone https://github.com/SeanNaren/deepspeech.pytorch.git && cd deepspeech.pytorch && sed -i '/^sklearn/d;/^torch/d;/^torchaudio/d' requirements.txt && pip install -r requirements.txt && pip install -e .
3234

3335
RUN pip install numba==0.56.4 pytest-cov==4.1.0 pydub==0.25.1
3436

.github/actions/espresso/Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get base image
2-
FROM python:3.7.17-slim-bookworm
2+
FROM python:3.10.17-slim-bookworm
33

44
# Set to install things in non-interactive mode
55
ENV DEBIAN_FRONTEND noninteractive
@@ -8,6 +8,10 @@ ENV DEBIAN_FRONTEND noninteractive
88
RUN apt-get update \
99
&& apt-get install -y \
1010
build-essential \
11+
gfortran \
12+
libblas-dev \
13+
liblapack-dev \
14+
libatlas-base-dev \
1115
libgl1-mesa-glx \
1216
libx11-xcb1 \
1317
git \
@@ -24,7 +28,10 @@ RUN apt-get update \
2428
&& rm -r /var/lib/apt/lists/*
2529

2630
# Install necessary libraries for espresso
27-
RUN pip install torch==1.6.0 torchaudio==0.6.0 pytest-cov~=4.1.0 scipy==1.2 scikit-learn==0.24 protobuf==3.20 kaldiio==2.18.0 tensorflow==2.9
31+
RUN pip install --upgrade pip setuptools wheel
32+
RUN pip install --ignore-installed torch==1.11.0 torchaudio==0.11.0 --index-url https://download.pytorch.org/whl/cpu
33+
RUN pip install numpy==1.21.6 scipy==1.9.3
34+
RUN pip install pytest-cov~=4.1.0 scikit-learn==1.6.1 protobuf==3.20 kaldiio==2.18.0 tensorflow==2.9
2835
RUN pip install --no-build-isolation fairscale==0.3.6
2936

3037
RUN git clone https://github.com/beat-buesser/espresso

.github/actions/goturn/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get base image
2-
FROM python:3.8.19-slim-bookworm
2+
FROM python:3.10.17-slim-bookworm
33

44
ENV MONO_TLS_PROVIDER=legacy
55

@@ -26,12 +26,14 @@ RUN apt-get update \
2626
&& rm -r /var/lib/apt/lists/*
2727

2828
# Install necessary libraries for goturn
29-
RUN pip install torch==1.9.1 torchvision==0.10.1 tensorflow==2.9 scikit-learn==0.24 pytest~=6.2.5 pytest-cov~=4.1.0
29+
RUN pip install --ignore-installed torch==1.11.0 torchaudio==0.11.0 torchvision==0.12.0 --index-url https://download.pytorch.org/whl/cpu
30+
RUN pip install --ignore-installed --no-deps pytorch_lightning==0.7.1 torch_lr_finder==0.2.1 torchsummary==1.5.1
31+
RUN pip install tensorflow==2.9 scikit-learn==1.6.1 pytest~=6.2.5 pytest-cov~=4.1.0
3032

3133
RUN git clone https://github.com/nrupatunga/goturn-pytorch.git /tmp/goturn-pytorch
3234
#RUN cd /tmp/goturn-pytorch && pip install -r requirements.txt
33-
RUN pip install loguru==0.5.3 torchsummary==1.5.1 tqdm==4.62.3 pytorch_lightning==0.7.1 imutils==0.5.3 torch_lr_finder==0.2.1 numpy==1.21.6 Pillow==8.0.1 visdom==0.1.8.9 gdown==5.1.0
34-
RUN pip3 install opencv_python==4.9.0.80 --no-build-isolation
35+
RUN pip install loguru==0.5.3 tqdm==4.62.3 imutils==0.5.3 numpy==1.21.6 Pillow==8.0.1 visdom==0.1.8.9 gdown==5.1.0
36+
RUN pip install opencv_python==4.9.0.80 --no-build-isolation
3537

3638
ENV PYTHONPATH "${PYTHONPATH}:/tmp/goturn-pytorch/src"
3739
ENV PYTHONPATH "${PYTHONPATH}:/tmp/goturn-pytorch/src/scripts"

.github/actions/yolo/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get base image
2-
FROM python:3.9.19-slim
2+
FROM python:3.10.17-slim-bookworm
33

44
# Install system wide software
55
RUN apt-get update \
@@ -20,7 +20,8 @@ RUN apt-get update \
2020
&& apt-get clean all \
2121
&& rm -r /var/lib/apt/lists/*
2222

23-
RUN pip install pytorchyolo==1.8.0 tensorflow==2.14.1 scikit-learn==1.4.2 pytest-cov~=4.1.0 torch==1.12.1
23+
RUN pip install --ignore-installed torch==1.12.1 --index-url https://download.pytorch.org/whl/cpu
24+
RUN pip install pytorchyolo==1.8.0 tensorflow==2.14.1 scikit-learn==1.4.2 pytest-cov~=4.1.0
2425

2526
RUN cd /tmp/ && git clone https://github.com/eriklindernoren/PyTorch-YOLOv3.git && cd ./PyTorch-YOLOv3/weights && ./download_weights.sh
2627

0 commit comments

Comments
 (0)