From d47ea2640d1ae8c71d8a03c56e9758b2b660b44c Mon Sep 17 00:00:00 2001 From: Vladislav Date: Tue, 11 Jun 2024 21:46:35 -0700 Subject: [PATCH 1/3] Bump CUDA to 12.5 --- .github/container/Dockerfile.base | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/container/Dockerfile.base b/.github/container/Dockerfile.base index adadc2773..39c1fd134 100644 --- a/.github/container/Dockerfile.base +++ b/.github/container/Dockerfile.base @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1-labs -ARG BASE_IMAGE=nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04 +ARG BASE_IMAGE=nvidia/cuda:12.5.0-devel-ubuntu22.04 ARG GIT_USER_NAME="JAX Toolbox" ARG GIT_USER_EMAIL=jax@nvidia.com ARG CLANG_VERSION=17 @@ -146,6 +146,7 @@ RUN install-nsight.sh ############################################################################### ADD install-cudnn.sh /usr/local/bin +RUN install-cudnn.sh ############################################################################### ## Install NCCL From fc9ea56520c0a41a839a617c6b4722b0308533e7 Mon Sep 17 00:00:00 2001 From: Vladislav Date: Wed, 12 Jun 2024 12:12:53 -0700 Subject: [PATCH 2/3] Refactor install-cudnn.sh for cuDNN-9 [skip ci] --- .github/container/install-cudnn.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/container/install-cudnn.sh b/.github/container/install-cudnn.sh index fab18edea..54bf804f4 100755 --- a/.github/container/install-cudnn.sh +++ b/.github/container/install-cudnn.sh @@ -20,8 +20,17 @@ cuda_major_version=$(nvcc --version | sed -n 's/^.*release \([0-9]*\.[0-9]*\).*$ # version of CUDA and cuDNN are compatible. # For example, CUDA 12.3 + cuDNN 8.9.6 (libcudnn8 version: 8.9.6.50-1+cuda12.2) is # considered to be compatible. -libcudnn_version=$(apt-cache show libcudnn${CUDNN_MAJOR_VERSION} | sed -n "s/^Version: \(.*+cuda${cuda_major_version}\.[0-9]*\)$/\1/p" | head -n 1) -libcudnn_dev_version=$(apt-cache show libcudnn${CUDNN_MAJOR_VERSION}-dev | sed -n "s/^Version: \(.*+cuda${cuda_major_version}\.[0-9]\)$/\1/p" | head -n 1) +if [[ ${CUDNN_MAJOR_VERSION} -le 8 ]]; then + libcudnn_name=libcudnn${CUDNN_MAJOR_VERSION} + libcudnn_dev_name=libcudnn${CUDNN_MAJOR_VERSION}-dev + version_pattern="s/^Version: \(.*+cuda${cuda_major_version}\.[0-9]*\)$/\1/p" +elif [[ ${CUDNN_MAJOR_VERSION} -eq 9 ]]; then + libcudnn_name=libcudnn${CUDNN_MAJOR_VERSION}-cuda-${cuda_major_version} + libcudnn_dev_name=libcudnn${CUDNN_MAJOR_VERSION}-dev-cuda-${cuda_major_version} + version_pattern="s/^Version: \(${CUDNN_MAJOR_VERSION}\.[0-9.-]*\)$/\1/p" +fi +libcudnn_version=$(apt-cache show $libcudnn_name | sed -n "$version_pattern" | head -n 1) +libcudnn_dev_version=$(apt-cache show $libcudnn_dev_name | sed -n "$version_pattern" | head -n 1) if [[ -z "${libcudnn_version}" || -z "${libcudnn_dev_version}" ]]; then echo "Could not find compatible cuDNN version for CUDA ${cuda_version}" exit 1 @@ -29,8 +38,8 @@ fi apt-get update apt-get install -y \ - libcudnn${CUDNN_MAJOR_VERSION}=${libcudnn_version} \ - libcudnn${CUDNN_MAJOR_VERSION}-dev=${libcudnn_dev_version} + ${libcudnn_name}=${libcudnn_version} \ + ${libcudnn_dev_name}=${libcudnn_dev_version} apt-get clean rm -rf /var/lib/apt/lists/* From a253287829c1fc3240a074e40e0add3f8699e516 Mon Sep 17 00:00:00 2001 From: Vladislav Date: Wed, 12 Jun 2024 22:46:14 -0700 Subject: [PATCH 3/3] Upstream-pax: build with bazel-7.1.2 --- .github/container/Dockerfile.pax.arm64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/container/Dockerfile.pax.arm64 b/.github/container/Dockerfile.pax.arm64 index 630941c29..8e45f0064 100644 --- a/.github/container/Dockerfile.pax.arm64 +++ b/.github/container/Dockerfile.pax.arm64 @@ -59,6 +59,8 @@ RUN <<"EOF" bash -exu -o pipefail git-clone.sh ${URLREF_LINGVO} ${SRC_PATH_LINGVO} EOF +ENV USE_BAZEL_VERSION=7.1.2 + # build lingvo RUN <<"EOF" bash -exu -o pipefail pushd ${SRC_PATH_LINGVO}