Skip to content

Commit baf972b

Browse files
authored
fix: Pytests (#684)
1 parent 9bfd582 commit baf972b

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

label_studio_ml/examples/grounding_dino/Dockerfile

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
1+
FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-devel
22
ARG DEBIAN_FRONTEND=noninteractive
33
ARG TEST_ENV
44

@@ -12,7 +12,7 @@ RUN --mount=type=cache,target="/var/cache/apt",sharing=locked \
1212
&& apt-get install -y git \
1313
&& apt-get install -y wget \
1414
&& apt-get install -y g++ freeglut3-dev build-essential libx11-dev \
15-
libxmu-dev libxi-dev libglu1-mesa libglu1-mesa-dev libfreeimage-dev \
15+
libxmu-dev libxi-dev libglu1-mesa libglu1-mesa-dev libfreeimage-dev ninja-build \
1616
&& apt-get -y install ffmpeg libsm6 libxext6 libffi-dev python3-dev python3-pip gcc
1717

1818
ENV PYTHONUNBUFFERED=1 \
@@ -23,10 +23,8 @@ ENV PYTHONUNBUFFERED=1 \
2323
THREADS=4 \
2424
CUDA_HOME=/usr/local/cuda \
2525
GROUNDINGDINO_REPO_PATH=/GroundingDINO
26-
27-
RUN conda install -c "nvidia/label/cuda-12.1.1" cuda -y
28-
ENV CUDA_HOME=/opt/conda \
29-
TORCH_CUDA_ARCH_LIST="6.0;6.1;7.0;7.5;8.0;8.6+PTX;8.9;9.0"
26+
ENV PATH="${CUDA_HOME}/bin:${PATH}"
27+
ENV TORCH_CUDA_ARCH_LIST="6.0;6.1;7.0;7.5;8.0;8.6+PTX;8.9;9.0"
3028

3129
COPY requirements.txt .
3230
RUN --mount=type=cache,target=${PIP_CACHE_DIR},sharing=locked \

label_studio_ml/examples/grounding_sam/Dockerfile

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
1+
FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-devel
22
ARG DEBIAN_FRONTEND=noninteractive
33
ARG TEST_ENV
44

@@ -12,7 +12,7 @@ RUN --mount=type=cache,target="/var/cache/apt",sharing=locked \
1212
&& apt-get install -y git \
1313
&& apt-get install -y wget \
1414
&& apt-get install -y g++ freeglut3-dev build-essential libx11-dev \
15-
libxmu-dev libxi-dev libglu1-mesa libglu1-mesa-dev libfreeimage-dev \
15+
libxmu-dev libxi-dev libglu1-mesa libglu1-mesa-dev libfreeimage-dev ninja-build \
1616
&& apt-get -y install ffmpeg libsm6 libxext6 libffi-dev python3-dev python3-pip gcc
1717

1818
ENV PYTHONUNBUFFERED=1 \
@@ -23,10 +23,8 @@ ENV PYTHONUNBUFFERED=1 \
2323
THREADS=4 \
2424
CUDA_HOME=/usr/local/cuda \
2525
GROUNDINGDINO_REPO_PATH=/GroundingDINO
26-
27-
RUN conda install -c "nvidia/label/cuda-12.1.1" cuda -y
28-
ENV CUDA_HOME=/opt/conda \
29-
TORCH_CUDA_ARCH_LIST="6.0;6.1;7.0;7.5;8.0;8.6+PTX;8.9;9.0"
26+
ENV PATH="${CUDA_HOME}/bin:${PATH}"
27+
ENV TORCH_CUDA_ARCH_LIST="6.0;6.1;7.0;7.5;8.0;8.6+PTX;8.9;9.0"
3028

3129
COPY requirements.txt .
3230
RUN --mount=type=cache,target=${PIP_CACHE_DIR},sharing=locked \

label_studio_ml/examples/segment_anything_model/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
ARG PYTHON_VERSION=3.8
2+
ARG PYTHON_VERSION=3.10
33

44
FROM python:${PYTHON_VERSION}-slim AS python-base
55
ARG TEST_ENV
@@ -33,6 +33,7 @@ RUN bash /app/download_models.sh
3333
# install base requirements
3434
COPY requirements-base.txt .
3535
RUN --mount=type=cache,target=${PIP_CACHE_DIR},sharing=locked \
36+
pip install --upgrade pip && \
3637
pip install -r requirements-base.txt
3738

3839
# install custom requirements

label_studio_ml/examples/yolo/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ ENV PYTHONUNBUFFERED=1 \
2323
THREADS=4 \
2424
CUDA_HOME=/usr/local/cuda
2525

26-
RUN conda install -c "nvidia/label/cuda-12.1.1" cuda -y
2726
ENV CUDA_HOME=/opt/conda \
2827
TORCH_CUDA_ARCH_LIST="6.0;6.1;7.0;7.5;8.0;8.6+PTX;8.9;9.0"
2928

0 commit comments

Comments
 (0)