Skip to content

Commit

Permalink
Add gcc 11. (#59)
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice authored Jan 24, 2022
1 parent 2cba8ea commit c0b1db9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions dockerfiles/rapids.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN echo 'Acquire::HTTP::Proxy "http://172.17.0.1:3142";' >> /etc/apt/apt.conf.d
&& apt install --no-install-recommends -y \
pkg-config apt-utils apt-transport-https software-properties-common ca-certificates \
&& add-apt-repository -y ppa:git-core/ppa \
# Needed to install compatible gcc 9/10 toolchains
# Needed to install compatible gcc toolchains
&& add-apt-repository -y ppa:ubuntu-toolchain-r/test \
# CUDA toolkit version usable to install `cuda-nsight-compute` and `cuda-nsight-systems` packages
&& NSIGHT_CUDA_VERSION=$(nvcc --version | head -n4 | tail -n1 | cut -d' ' -f5 | cut -d',' -f1 | sed "s/\./-/g") \
Expand All @@ -35,6 +35,7 @@ fi' \
graphviz \
gcc-9 g++-9 \
gcc-10 g++-10 \
gcc-11 g++-11 \
ninja-build \
build-essential \
python3 python3-pip \
Expand Down Expand Up @@ -85,7 +86,7 @@ RUN update-alternatives --remove-all cc >/dev/null 2>&1 || true \
&& update-alternatives --remove-all g++ >/dev/null 2>&1 || true \
&& update-alternatives --remove-all gcov >/dev/null 2>&1 || true \
# Install alternatives for gcc/g++/cc/c++/gcov
&& for x in 9 10; do \
&& for x in 9 10 11; do \
update-alternatives \
--install /usr/bin/gcc gcc /usr/bin/gcc-${x} ${x}0 \
--slave /usr/bin/cc cc /usr/bin/gcc-${x} \
Expand Down
6 changes: 3 additions & 3 deletions etc/bash-utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1138,11 +1138,11 @@ export -f lint-python;

set-gcc-version() {
V="${1:-}";
if [[ $V != "9" && $V != "10" ]]; then
if [[ "$V" != "9" && "$V" != "10" && "$V" != "11" ]]; then
while true; do
read -p "Please select GCC version 9 or 10: " V </dev/tty
read -p "Please select GCC version 9, 10, or 11: " V </dev/tty
if [[ $V != "9" && $V != "10" ]]; then
>&2 echo "Invalid GCC version, please select 9 or 10";
>&2 echo "Invalid GCC version, please select 9, 10, or 11";
else
break;
fi
Expand Down

0 comments on commit c0b1db9

Please sign in to comment.