Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(CUDA): upgrade CUDA versions #3084

Closed
wants to merge 3 commits into from
Closed

build(CUDA): upgrade CUDA versions #3084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a368fe
Revert "tmp: use ubuntu:22.04 for cuda_base_image"
Nov 30, 2022
63bd970
Revert "tmp: add liburcu6 repository for CUDA 20.04 repository"
Nov 30, 2022
bb0bd20
update cuda versions
Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions amd64.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
rosdistro=humble
rmw_implementation=rmw_cyclonedds_cpp
base_image=ubuntu:22.04
cuda_base_image=ubuntu:22.04
cuda_base_image=nvidia/cuda:12.0.0-devel-ubuntu22.04
prebuilt_base_image=ubuntu:22.04
cuda_version=11.6
cudnn_version=8.4.1.50-1+cuda11.6
tensorrt_version=8.4.2-1+cuda11.6
cuda_version=12.0
cudnn_version=8.8.1.3-1+cuda12.0
tensorrt_version=8.6.0.12-1+cuda12.0
9 changes: 0 additions & 9 deletions ansible/roles/cuda/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@ wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/auto

# Modified from: https://developer.nvidia.com/cuda-downloads?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu&target_version=22.04&target_type=deb_network

# A temporary workaround for Ubuntu 22.04 with the ubuntu2004 repository
if [[ "$(uname -m)" == "x86_64" ]]; then
liburcu6_url=http://archive.ubuntu.com/ubuntu
else
liburcu6_url=http://ports.ubuntu.com/ubuntu-ports
fi
sudo echo "deb $liburcu6_url focal main restricted" > /etc/apt/sources.list.d/focal.list

# TODO: Use 22.04 in https://github.com/autowarefoundation/autoware/pull/3084. Currently, 20.04 is intentionally used.
os=ubuntu2004
wget https://developer.download.nvidia.com/compute/cuda/repos/$os/$(uname -m)/cuda-keyring_1.0-1_all.deb
sudo dpkg -i cuda-keyring_1.0-1_all.deb
Expand Down
16 changes: 0 additions & 16 deletions ansible/roles/cuda/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,6 @@
register: cuda_architecture
changed_when: false

- name: (tmp for Ubuntu 22.04) Add liburcu6 repository into sources.list for amd64
become: true
ansible.builtin.apt_repository:
repo: deb http://archive.ubuntu.com/ubuntu focal main restricted
filename: focal
state: present
when: cuda_architecture.stdout == "x86_64"

- name: (tmp for Ubuntu 22.04) Add liburcu6 repository into sources.list for arm64
become: true
ansible.builtin.apt_repository:
repo: deb http://ports.ubuntu.com/ubuntu-ports focal main restricted
filename: focal
state: present
when: cuda_architecture.stdout == "aarch64"

kenji-miyake marked this conversation as resolved.
Show resolved Hide resolved
- name: Remove old /etc/apt/sources.list.d/cuda.list
become: true
ansible.builtin.file:
Expand Down