diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a923e54..ed544e2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -286,7 +286,8 @@ jobs: activate-environment: true - name: Install requirements run: | - uv pip install -e . pytest-cov nvidia-ml-py "torch<2.11" # TODO: remove torch pin after GPU runner driver update to CUDA 13.0 + # Install TensorRT into the job venv so uv can reuse the runner image cache. + uv pip install -e . pytest-cov nvidia-ml-py "torch<2.11" "tensorrt-cu12>=7.0.0,!=10.2.0" # TODO: remove torch pin after GPU runner driver update to CUDA 13.0 env: PIP_BREAK_SYSTEM_PACKAGES: 1 - name: Check environment diff --git a/docker/Dockerfile-runner b/docker/Dockerfile-runner index 30c5c0e4..e17418f3 100644 --- a/docker/Dockerfile-runner +++ b/docker/Dockerfile-runner @@ -7,7 +7,7 @@ FROM ultralytics/ultralytics:latest # Set additional environment variables for runner (no "v" on the version) -ARG RUNNER_VERSION=2.333.0 +ARG RUNNER_VERSION=2.334.0 ENV RUNNER_ALLOW_RUNASROOT=1 \ DEBIAN_FRONTEND=noninteractive @@ -20,7 +20,7 @@ RUN FILENAME=actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz && \ tar xzf "$FILENAME" && \ rm "$FILENAME" && \ # Install runner dependencies \ - uv pip install --system pytest-cov && \ + uv pip install --system pytest-cov "tensorrt-cu12>=7.0.0,!=10.2.0" && \ ./bin/installdependencies.sh && \ apt-get update && \ apt-get install -y --no-install-recommends libicu-dev sudo nodejs npm && \ diff --git a/docker/Dockerfile-runner-cpu b/docker/Dockerfile-runner-cpu index eac7744e..fe2675a0 100644 --- a/docker/Dockerfile-runner-cpu +++ b/docker/Dockerfile-runner-cpu @@ -7,7 +7,7 @@ FROM ultralytics/ultralytics:latest-cpu # Set additional environment variables for runner (no "v" on the version) -ARG RUNNER_VERSION=2.333.0 +ARG RUNNER_VERSION=2.334.0 ENV RUNNER_ALLOW_RUNASROOT=1 \ DEBIAN_FRONTEND=noninteractive diff --git a/ultralytics/data/base.py b/ultralytics/data/base.py index a435f6cc..88b509fb 100644 --- a/ultralytics/data/base.py +++ b/ultralytics/data/base.py @@ -170,8 +170,8 @@ class BaseDataset(Dataset): with open(p, encoding="utf-8") as t: t = t.read().strip().splitlines() parent = str(p.parent) + os.sep - f += [x.replace("./", parent, 1) if x.startswith("./") else x for x in t] # local to global path - # F += [p.parent / x.lstrip(os.sep) for x in t] # local to global path (pathlib) + f += [x.replace("./", parent, 1) if x.startswith("./") else x for x in t] # local to global + # F += [p.parent / x.lstrip(os.sep) for x in t] # local to global (pathlib) else: raise FileNotFoundError(f"{self.prefix}{p} does not exist") im_files = sorted(x.replace("/", os.sep) for x in f if x.rpartition(".")[-1].lower() in IMG_FORMATS)