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.

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): update CUDA repo OS, and use nvidia/cuda image as a cuda_base_image #3684

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.1.6-1+cuda12.0
4 changes: 2 additions & 2 deletions ansible/playbooks/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
[Warning] Skipping installation of NVIDIA libraries. Please manually install them if you plan to use any dependent components.
when: prompt_install_nvidia != 'y'
roles:
- role: autoware.dev_env.cuda
when: prompt_install_nvidia == 'y' and install_devel == 'true'
# - role: autoware.dev_env.cuda
# when: prompt_install_nvidia == 'y' and install_devel == 'true'
- role: autoware.dev_env.docker_engine
- role: autoware.dev_env.nvidia_docker
- role: autoware.dev_env.rocker
11 changes: 1 addition & 10 deletions ansible/roles/cuda/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,7 @@ 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
os=ubuntu2204
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
sudo apt-get update
Expand Down
18 changes: 1 addition & 17 deletions ansible/roles/cuda/tasks/main.yaml
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"

- name: Remove old /etc/apt/sources.list.d/cuda.list
become: true
ansible.builtin.file:
Expand All @@ -33,7 +17,7 @@
- name: Install CUDA keyring
become: true
ansible.builtin.apt:
deb: https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/{{ cuda_architecture.stdout }}/cuda-keyring_1.0-1_all.deb
deb: https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/{{ cuda_architecture.stdout }}/cuda-keyring_1.0-1_all.deb
update_cache: true

- name: Get dash-case name of cuda_version
Expand Down
Loading