Skip to content

Commit

Permalink
Revert "Update CUDA build version from 11.7.1 to 12.0.0 (#2978)"
Browse files Browse the repository at this point in the history
This reverts commit 6c09a9f.
  • Loading branch information
victorges committed Apr 1, 2024
1 parent 81bc19a commit ebbf210
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ jobs:
- GOOS: linux
GOARCH: amd64
runner: ubuntu-20.04
container: livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04
container: livepeerci/cuda:11.7.1-cudnn8-devel-ubuntu20.04
type: gpu

- GOOS: linux
GOARCH: arm64
runner: ubuntu-20.04
container: livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04
container: livepeerci/cuda:11.7.1-cudnn8-devel-ubuntu20.04
type: gpu

- GOOS: windows
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
permissions:
packages: write
contents: read
runs-on: oxford
runs-on: ubuntu-20.04
steps:
- name: Check out code
uses: actions/checkout@v4.1.1
Expand All @@ -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 || true
libgl1-mesa-dri microsoft-edge-stable azure-cli
sudo apt autoremove -y
sudo rm -rf /usr/share/dotnet /usr/local/lib/android
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04 as build
FROM --platform=$BUILDPLATFORM livepeerci/cuda:11.7.1-cudnn8-devel-ubuntu20.04 as build

ARG TARGETARCH
ARG BUILDARCH
Expand Down Expand Up @@ -55,9 +55,9 @@ COPY . .

RUN make livepeer livepeer_cli livepeer_bench livepeer_router

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-amd64-base

FROM --platform=$TARGETPLATFORM nvidia/cuda:12.0.0-cudnn8-runtime-ubuntu20.04 AS livepeer-arm64-base
FROM --platform=$TARGETPLATFORM nvidia/cuda:11.7.1-cudnn8-runtime-ubuntu20.04 AS livepeer-arm64-base

FROM livepeer-${TARGETARCH}-base

Expand Down
10 changes: 7 additions & 3 deletions docker/Dockerfile.cuda-base
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04
# livepeer/cuda-base:11.7.1-cudnn8-devel-ubuntu20.04
#
# Base CUDA Develop image which contains CUDA SDK libs for the following architectures: linux amd64, linux arm64
# Base CUDA Develop image which contains CUDA SDK libs for the following architectures: linux amd64, linux arm64, windows amd64
#
# 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:12.0.0-cudnn8-devel-ubuntu20.04
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/

RUN mkdir -p /usr/local/cuda_arm64/lib64/
COPY cuda/arm64/usr/local/cuda/lib64/libnp* /usr/local/cuda_arm64/lib64/
Expand Down

0 comments on commit ebbf210

Please sign in to comment.