From 6c09a9f00682d7ed404257bba9f485dc0c4041ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Leszko?= Date: Thu, 21 Mar 2024 10:36:41 +0100 Subject: [PATCH] Update CUDA build version from 11.7.1 to 12.0.0 (#2978) --- .github/workflows/build.yaml | 4 ++-- .github/workflows/docker.yaml | 4 ++-- docker/Dockerfile | 6 +++--- docker/Dockerfile.cuda-base | 10 +++------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9950fdc0fa..cb2d590e43 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -39,13 +39,13 @@ jobs: - GOOS: linux GOARCH: amd64 runner: ubuntu-20.04 - container: livepeerci/cuda:11.7.1-cudnn8-devel-ubuntu20.04 + container: livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04 type: gpu - GOOS: linux GOARCH: arm64 runner: ubuntu-20.04 - container: livepeerci/cuda:11.7.1-cudnn8-devel-ubuntu20.04 + container: livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04 type: gpu - GOOS: windows diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index d83a5c2497..6661c9dc03 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -19,7 +19,7 @@ jobs: permissions: packages: write contents: read - runs-on: ubuntu-20.04 + runs-on: oxford steps: - name: Check out code uses: actions/checkout@v4.1.1 @@ -34,7 +34,7 @@ jobs: sudo apt purge -yqq dotnet-* mono-* llvm-* libllvm* powershell* openjdk-* \ temurin-* mongodb-* firefox mysql-* \ hhvm google-chrome-stable \ - libgl1-mesa-dri microsoft-edge-stable azure-cli + libgl1-mesa-dri microsoft-edge-stable azure-cli || true sudo apt autoremove -y sudo rm -rf /usr/share/dotnet /usr/local/lib/android diff --git a/docker/Dockerfile b/docker/Dockerfile index 8749ae2bc1..5e12c11c91 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM livepeerci/cuda:11.7.1-cudnn8-devel-ubuntu20.04 as build +FROM --platform=$BUILDPLATFORM livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04 as build ARG TARGETARCH ARG BUILDARCH @@ -55,9 +55,9 @@ COPY . . RUN make livepeer livepeer_cli livepeer_bench livepeer_router -FROM --platform=$TARGETPLATFORM nvidia/cuda:11.7.1-cudnn8-runtime-ubuntu20.04 AS livepeer-amd64-base +FROM --platform=$TARGETPLATFORM nvidia/cuda:12.0.0-cudnn8-runtime-ubuntu20.04 AS livepeer-amd64-base -FROM --platform=$TARGETPLATFORM nvidia/cuda:11.7.1-cudnn8-runtime-ubuntu20.04 AS livepeer-arm64-base +FROM --platform=$TARGETPLATFORM nvidia/cuda:12.0.0-cudnn8-runtime-ubuntu20.04 AS livepeer-arm64-base FROM livepeer-${TARGETARCH}-base diff --git a/docker/Dockerfile.cuda-base b/docker/Dockerfile.cuda-base index b98f1a36b7..4eab9e3673 100644 --- a/docker/Dockerfile.cuda-base +++ b/docker/Dockerfile.cuda-base @@ -1,15 +1,11 @@ -# livepeer/cuda-base:11.7.1-cudnn8-devel-ubuntu20.04 +# livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04 # -# Base CUDA Develop image which contains CUDA SDK libs for the following architectures: linux amd64, linux arm64, windows amd64 +# Base CUDA Develop image which contains CUDA SDK libs for the following architectures: linux amd64, linux arm64 # # To build this image you need the following steps: # 1. Download NVIDIA CUDA SDK for ARM64, extract, and copy into cuda/arm64/usr/local/cuda/ -# 2. Download NVIDIA CUDA SDK for Windows AMD64, extract, and copy npp libs into npp_win/ -FROM nvidia/cuda:11.7.1-cudnn8-devel-ubuntu20.04 - -COPY npp_win/lib/x64/* /usr/local/cuda/lib64/ -COPY npp_win/include/* /usr/local/cuda/include/ +FROM nvidia/cuda:12.0.0-cudnn8-devel-ubuntu20.04 RUN mkdir -p /usr/local/cuda_arm64/lib64/ COPY cuda/arm64/usr/local/cuda/lib64/libnp* /usr/local/cuda_arm64/lib64/