Skip to content

Commit ebbf210

Browse files
committed
Revert "Update CUDA build version from 11.7.1 to 12.0.0 (#2978)"
This reverts commit 6c09a9f.
1 parent 81bc19a commit ebbf210

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ jobs:
3939
- GOOS: linux
4040
GOARCH: amd64
4141
runner: ubuntu-20.04
42-
container: livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04
42+
container: livepeerci/cuda:11.7.1-cudnn8-devel-ubuntu20.04
4343
type: gpu
4444

4545
- GOOS: linux
4646
GOARCH: arm64
4747
runner: ubuntu-20.04
48-
container: livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04
48+
container: livepeerci/cuda:11.7.1-cudnn8-devel-ubuntu20.04
4949
type: gpu
5050

5151
- GOOS: windows

.github/workflows/docker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
permissions:
2020
packages: write
2121
contents: read
22-
runs-on: oxford
22+
runs-on: ubuntu-20.04
2323
steps:
2424
- name: Check out code
2525
uses: actions/checkout@v4.1.1
@@ -34,7 +34,7 @@ jobs:
3434
sudo apt purge -yqq dotnet-* mono-* llvm-* libllvm* powershell* openjdk-* \
3535
temurin-* mongodb-* firefox mysql-* \
3636
hhvm google-chrome-stable \
37-
libgl1-mesa-dri microsoft-edge-stable azure-cli || true
37+
libgl1-mesa-dri microsoft-edge-stable azure-cli
3838
sudo apt autoremove -y
3939
sudo rm -rf /usr/share/dotnet /usr/local/lib/android
4040

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04 as build
1+
FROM --platform=$BUILDPLATFORM livepeerci/cuda:11.7.1-cudnn8-devel-ubuntu20.04 as build
22

33
ARG TARGETARCH
44
ARG BUILDARCH
@@ -55,9 +55,9 @@ COPY . .
5555

5656
RUN make livepeer livepeer_cli livepeer_bench livepeer_router
5757

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

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

6262
FROM livepeer-${TARGETARCH}-base
6363

docker/Dockerfile.cuda-base

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
# livepeerci/cuda:12.0.0-cudnn8-devel-ubuntu20.04
1+
# livepeer/cuda-base:11.7.1-cudnn8-devel-ubuntu20.04
22
#
3-
# Base CUDA Develop image which contains CUDA SDK libs for the following architectures: linux amd64, linux arm64
3+
# Base CUDA Develop image which contains CUDA SDK libs for the following architectures: linux amd64, linux arm64, windows amd64
44
#
55
# To build this image you need the following steps:
66
# 1. Download NVIDIA CUDA SDK for ARM64, extract, and copy into cuda/arm64/usr/local/cuda/
7+
# 2. Download NVIDIA CUDA SDK for Windows AMD64, extract, and copy npp libs into npp_win/
78

8-
FROM nvidia/cuda:12.0.0-cudnn8-devel-ubuntu20.04
9+
FROM nvidia/cuda:11.7.1-cudnn8-devel-ubuntu20.04
10+
11+
COPY npp_win/lib/x64/* /usr/local/cuda/lib64/
12+
COPY npp_win/include/* /usr/local/cuda/include/
913

1014
RUN mkdir -p /usr/local/cuda_arm64/lib64/
1115
COPY cuda/arm64/usr/local/cuda/lib64/libnp* /usr/local/cuda_arm64/lib64/

0 commit comments

Comments
 (0)