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

feat(ansible): set default value for install_dev variable #4607

Merged
merged 4 commits into from
Apr 19, 2024
Merged

feat(ansible): set default value for install_dev variable #4607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d542d16
feat(ansible): set default value for install_dev variable
mitsudome-r Apr 1, 2024
932a9b1
fix: change true to 'y' for prompting install_devel
mitsudome-r Apr 15, 2024
d5ed396
style(pre-commit): autofix
pre-commit-ci[bot] Apr 15, 2024
f8fa172
fix: fix pre-commit error
mitsudome-r Apr 15, 2024
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
2 changes: 1 addition & 1 deletion ansible/playbooks/openadk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
when: module == 'base'
- role: autoware.dev_env.gdown
when: module == 'base'
- role: autoware.dev_env.kisak_mesa

Check warning on line 25 in ansible/playbooks/openadk.yaml

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (kisak)
when: module == 'base'
- role: autoware.dev_env.build_tools
when: module == 'all' and install_devel=='true'
when: module == 'all' and install_devel=='y'

# Module specific dependencies
- role: autoware.dev_env.geographiclib
Expand Down
7 changes: 6 additions & 1 deletion ansible/playbooks/universe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
[Warning] Should the ONNX model files and other artifacts be downloaded alongside setting up the development environment.
Download artifacts? [y/N]
private: false
- name: install_devel
prompt: |-
[Warning] Do you want to install recommended development tools for Autoware? [y/N]
private: false
default: y
pre_tasks:
- name: Verify OS
ansible.builtin.fail:
Expand Down Expand Up @@ -52,7 +57,7 @@

# Autoware devel dependencies
- role: autoware.dev_env.dev_tools
when: install_devel == 'true'
when: install_devel == 'y'

# ONNX files and other artifacts
- role: autoware.dev_env.artifacts
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/cuda/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
- cuda-minimal-build-{{ cuda__dash_case_cuda_version.stdout }}
- libcusparse-dev-{{ cuda__dash_case_cuda_version.stdout }}
- libcublas-dev-{{ cuda__dash_case_cuda_version.stdout }}
- libcurand-dev-{{ cuda__dash_case_cuda_version.stdout }}

Check warning on line 36 in ansible/roles/cuda/tasks/main.yaml

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (libcurand)
update_cache: true
when: install_devel == 'true'
when: install_devel == 'y'

- name: Install CUDA libraries except for cuda-drivers
become: true
Expand All @@ -44,9 +44,9 @@
- cuda-minimal-build-{{ cuda__dash_case_cuda_version.stdout }}
- libcusparse-{{ cuda__dash_case_cuda_version.stdout }}
- libcublas-{{ cuda__dash_case_cuda_version.stdout }}
- libcurand-{{ cuda__dash_case_cuda_version.stdout }}

Check warning on line 47 in ansible/roles/cuda/tasks/main.yaml

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (libcurand)
update_cache: true
when: install_devel == 'false'
when: install_devel == 'N'

- name: Install extra CUDA libraries for x86_64
become: true
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/tensorrt/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
allow_change_held_packages: true
allow_downgrade: true
update_cache: true
when: install_devel == 'true'
when: install_devel == 'y'

# apt-mark hold
- name: Prevent CUDA-related packages from upgrading
Expand Down Expand Up @@ -53,4 +53,4 @@
- libnvinfer-headers-plugin-dev
- libnvparsers-dev
- libnvonnxparsers-dev
when: install_devel == 'true'
when: install_devel == 'y'
4 changes: 2 additions & 2 deletions setup-dev-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ fi
# Check installation of dev package
if [ "$option_runtime" = "true" ]; then
ansible_args+=("--extra-vars" "ros2_installation_type=ros-base") # ROS installation type, default "desktop"
ansible_args+=("--extra-vars" "install_devel=false")
ansible_args+=("--extra-vars" "install_devel=N")
else
ansible_args+=("--extra-vars" "install_devel=true")
ansible_args+=("--extra-vars" "install_devel=y")
fi

# Check downloading artifacts
Expand Down
Loading