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

feat: upstream to origin #84

Merged
merged 10 commits into from
Jul 30, 2024
Merged
47 changes: 0 additions & 47 deletions .github/workflows/vcs-import.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions ansible/roles/artifacts/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,11 @@
mode: "644"
checksum: sha256:28cd6524d4bcdb2809592a225d28330433e58dc02c92169ea555b44c1a51a584

- name: Download tensorrt_yolox/semseg_color_map.csv

Check warning on line 264 in ansible/roles/artifacts/tasks/main.yaml

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (semseg)
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/object_detection_semseg_yolox_s/v1/semseg_color_map.csv
dest: "{{ data_dir }}/tensorrt_yolox/semseg_color_map.csv"

Check warning on line 268 in ansible/roles/artifacts/tasks/main.yaml

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (semseg)
mode: "644"
checksum: sha256:3d93ca05f31b63424d7d7246a01a2365953705a0ed3323ba5b6fddd744a4bfea

Expand Down Expand Up @@ -428,29 +428,3 @@
ansible.builtin.unarchive:
src: "{{ data_dir }}/tvm_utility/yolo_v2_tiny-x86_64-llvm-3.0.0-20221221.tar.gz"
dest: "{{ data_dir }}/tvm_utility/models/yolo_v2_tiny"

# lidar_apollo_segmentation_tvm
- name: Create lidar_apollo_segmentation_tvm/models directory inside {{ data_dir }}
ansible.builtin.file:
path: "{{ data_dir }}/lidar_apollo_segmentation_tvm/models"
mode: "755"
state: directory

- name: Download baidu_cnn-x86_64-llvm-3.0.0-20221221.tar.gz
become: true
ansible.builtin.get_url:
url: https://autoware-modelzoo.s3.us-east-2.amazonaws.com/models/3.0.0-20221221/baidu_cnn-x86_64-llvm-3.0.0-20221221.tar.gz
dest: "{{ data_dir }}/lidar_apollo_segmentation_tvm/baidu_cnn-x86_64-llvm-3.0.0-20221221.tar.gz"
mode: "644"
checksum: sha256:4293e6196ec937d2cd5ec658e5ce70933647d2d38633a1805febb36cafd684e3

- name: Create baidu_cnn folder in lidar_apollo_segmentation_tvm/models of {{ data_dir }}
ansible.builtin.file:
path: "{{ data_dir }}/lidar_apollo_segmentation_tvm/models/baidu_cnn"
mode: "755"
state: directory

- name: Extract baidu_cnn-x86_64-llvm-3.0.0-20221221.tar.gz
ansible.builtin.unarchive:
src: "{{ data_dir }}/lidar_apollo_segmentation_tvm/baidu_cnn-x86_64-llvm-3.0.0-20221221.tar.gz"
dest: "{{ data_dir }}/lidar_apollo_segmentation_tvm/models/baidu_cnn"
12 changes: 9 additions & 3 deletions autoware.repos
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,16 @@ repositories:
type: git
url: https://github.com/tier4/nebula.git
version: main
sensor_component/external/transport_drivers:
# Fork of transport_drivers that enables reduction of copy operations
sensor_component/transport_drivers:
type: git
url: https://github.com/MapIV/transport_drivers.git
version: boost
url: https://github.com/autowarefoundation/transport_drivers
version: mutable-buffer-in-udp-callback
# Continental compatible version of ROS 2 socket CAN
sensor_component/ros2_socketcan:
type: git
url: https://github.com/autowarefoundation/ros2_socketcan
version: feat/continental_fd
# sensor_kit
sensor_kit/sample_sensor_kit_launch:
type: git
Expand Down
14 changes: 5 additions & 9 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
&& cat /tmp/rosdep-core-depend-packages.txt | xargs apt-get install -y --no-install-recommends \
&& apt-get autoremove -y && rm -rf "$HOME"/.cache

COPY src/core /autoware/src/core
RUN --mount=type=cache,target=${CCACHE_DIR} \
RUN --mount=type=bind,from=rosdep-depend,source=/autoware/src/core,target=/autoware/src/core \
--mount=type=cache,target=${CCACHE_DIR} \
source /opt/ros/"$ROS_DISTRO"/setup.bash \
&& du -sh ${CCACHE_DIR} && ccache -s \
&& colcon build --cmake-args \
Expand All @@ -125,13 +125,8 @@ RUN --mount=type=ssh \
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache

# Build Autoware
COPY src/launcher /autoware/src/launcher
COPY src/param /autoware/src/param
COPY src/sensor_component /autoware/src/sensor_component
COPY src/sensor_kit /autoware/src/sensor_kit
COPY src/universe /autoware/src/universe
COPY src/vehicle /autoware/src/vehicle
RUN --mount=type=cache,target=${CCACHE_DIR} \
RUN --mount=type=bind,from=rosdep-depend,source=/autoware/src,target=/autoware/src \
--mount=type=cache,target=${CCACHE_DIR} \
source /opt/ros/"$ROS_DISTRO"/setup.bash \
&& du -sh ${CCACHE_DIR} && ccache -s \
&& colcon build --cmake-args \
Expand All @@ -152,6 +147,7 @@ RUN --mount=type=ssh \
&& pip uninstall -y ansible ansible-core \
&& apt-get autoremove -y && rm -rf "$HOME"/.cache

COPY src /autoware/src
# Create entrypoint
COPY docker/etc/ros_entrypoint.sh /ros_entrypoint.sh
RUN chmod +x /ros_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ build_images() {
--set "*.args.LIB_DIR=$lib_dir" \
--set "base.tags=ghcr.io/autowarefoundation/autoware:latest-base" \
--set "devel.tags=ghcr.io/autowarefoundation/autoware:latest-devel$image_name_suffix" \
--set "prebuilt.tags=ghcr.io/autowarefoundation/autoware:latest-prebuilt$image_name_suffix" \
--set "runtime.tags=ghcr.io/autowarefoundation/autoware:latest-runtime$image_name_suffix" \
"${targets[@]}"
set +x
Expand Down
Loading