diff --git a/amd64.env b/amd64.env index afa17255034..89c7098ca2b 100644 --- a/amd64.env +++ b/amd64.env @@ -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 diff --git a/ansible/playbooks/docker.yaml b/ansible/playbooks/docker.yaml index 434d800c106..399087a588b 100644 --- a/ansible/playbooks/docker.yaml +++ b/ansible/playbooks/docker.yaml @@ -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 diff --git a/ansible/roles/cuda/README.md b/ansible/roles/cuda/README.md index 858031d5782..4bda2b28a4e 100644 --- a/ansible/roles/cuda/README.md +++ b/ansible/roles/cuda/README.md @@ -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 diff --git a/ansible/roles/cuda/tasks/main.yaml b/ansible/roles/cuda/tasks/main.yaml index 30e19d41d00..f510aebf113 100644 --- a/ansible/roles/cuda/tasks/main.yaml +++ b/ansible/roles/cuda/tasks/main.yaml @@ -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: @@ -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