Skip to content

Commit bdcb89f

Browse files
authored
Drop clang installation (#1756)
XLA now takes care of downloading its own C++ toolchain.
1 parent 1c09cb5 commit bdcb89f

File tree

1 file changed

+0
-35
lines changed

1 file changed

+0
-35
lines changed

.github/container/Dockerfile.base

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
ARG BASE_IMAGE=nvcr.io/nvidia/cuda-dl-base:25.09-cuda13.0-devel-ubuntu24.04
33
ARG GIT_USER_NAME="JAX Toolbox"
44
5-
ARG CLANG_VERSION=18
65
ARG JAX_TOOLBOX_REF=main
76
ARG NSIGHT_SYSTEMS_VERSION_OVERRIDE
87

@@ -14,7 +13,6 @@ FROM ${BASE_IMAGE}
1413
ARG BASE_IMAGE
1514
ARG GIT_USER_EMAIL
1615
ARG GIT_USER_NAME
17-
ARG CLANG_VERSION
1816
ARG JAX_TOOLBOX_REF
1917
ARG NSIGHT_SYSTEMS_VERSION_OVERRIDE
2018
ENV CUDA_BASE_IMAGE=${BASE_IMAGE}
@@ -52,37 +50,6 @@ apt_packages=(
5250
software-properties-common
5351
)
5452
apt-get install -y ${apt_packages[@]}
55-
56-
# Install LLVM/Clang
57-
bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" -- ${CLANG_VERSION}
58-
59-
# Make sure that clang and clang++ point to the new version. This list is based
60-
# on the symlinks installed by the `clang` (as opposed to `clang-14`) and `lld`
61-
# (as opposed to `lld-14`) packages available in Ubuntu 22.04. 100 is an
62-
# arbitrary priority.
63-
update-alternatives --verbose \
64-
--install /usr/bin/clang clang /usr/lib/llvm-${CLANG_VERSION}/bin/clang 100 \
65-
--slave /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-${CLANG_VERSION} \
66-
--slave /usr/bin/clang++ clang++ /usr/lib/llvm-${CLANG_VERSION}/bin/clang++ \
67-
--slave /usr/bin/ld.lld ld.lld /usr/lib/llvm-${CLANG_VERSION}/bin/lld \
68-
--slave /usr/bin/lld lld /usr/lib/llvm-${CLANG_VERSION}/bin/lld \
69-
--slave /usr/bin/lld-link lld-link /usr/lib/llvm-${CLANG_VERSION}/bin/lld \
70-
--slave /usr/bin/wasm-ld wasm-ld /usr/lib/llvm-${CLANG_VERSION}/bin/lld
71-
72-
# Make sure that any later attempt to install `clang` or `lld` will fail.
73-
cat >/etc/apt/preferences.d/no-unversioned-clang-lld <<EOL
74-
# LLVM is installed from apt.llvm.org using versioned packages, whereas the
75-
# unversioned clang and lld packages come from Ubuntu and refer to older
76-
# versions of LLVM. Please use versioned packages in this container.
77-
Package: clang
78-
Pin: release *
79-
Pin-Priority: -1
80-
81-
Package: lld
82-
Pin: release *
83-
Pin-Priority: -1
84-
EOL
85-
8653
apt-get clean
8754
rm -rf /var/lib/apt/lists/*
8855

@@ -94,8 +61,6 @@ remove_packages=(
9461
python3-gi
9562
software-properties-common
9663
lsb-release
97-
python3-yaml
98-
python3-pygments
9964
)
10065

10166
apt-get remove -y ${remove_packages[@]}

0 commit comments

Comments
 (0)