Skip to content

Commit

Permalink
feat: implemented the launcher-side changes for the cuda preprocessin…
Browse files Browse the repository at this point in the history
…g and transport layer

Signed-off-by: Kenzo Lobos-Tsunekawa <[email protected]>
  • Loading branch information
knzo25 committed Nov 25, 2024
1 parent 470e1e0 commit 453c3ff
Show file tree
Hide file tree
Showing 13 changed files with 286 additions and 152 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**:
ros__parameters:
use_cuda: false
debug_mode: false
has_static_tf_only: false
rosbag_replay: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**:
ros__parameters:
use_cuda: false
debug_mode: false
has_static_tf_only: false
rosbag_replay: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**:
ros__parameters:
use_cuda: false
debug_mode: false
has_static_tf_only: false
rosbag_replay: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/**:
ros__parameters:
use_cuda: true
debug_mode: false
has_static_tf_only: false
rosbag_replay: false
rosbag_replay: true
rosbag_length: 20.0
maximum_queue_size: 5
timeout_sec: 0.2
Expand Down
14 changes: 14 additions & 0 deletions aip_xx1_launch/launch/lidar.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<arg name ="vehicle_id" default="$(env VEHICLE_ID default)"/>
<arg name="vehicle_mirror_param_file"/>
<arg name="pointcloud_container_name" default="pointcloud_container"/>
<arg name="use_pointcloud_container" default="true"/>
<arg name="use_cuda_preprocessor" default="true"/>
<arg name="enable_blockage_diag" default="true"/>

<group>
Expand All @@ -23,6 +25,9 @@
<arg name="launch_driver" value="$(var launch_driver)"/>
<arg name="vehicle_mirror_param_file" value="$(var vehicle_mirror_param_file)"/>
<arg name="container_name" value="pointcloud_container"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="use_cuda_preprocessor" value="$(var use_cuda_preprocessor)"/>
<arg name="vertical_bins" value="128"/>
<arg name="horizontal_ring_id" value="64"/>
<arg name="is_channel_order_top2down" value="false"/>
Expand All @@ -45,6 +50,9 @@
<arg name="launch_driver" value="$(var launch_driver)"/>
<arg name="vehicle_mirror_param_file" value="$(var vehicle_mirror_param_file)"/>
<arg name="container_name" value="pointcloud_container"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="use_cuda_preprocessor" value="$(var use_cuda_preprocessor)"/>
<arg name="vertical_bins" value="16"/>
<arg name="horizontal_ring_id" value="0"/>
<arg name="is_channel_order_top2down" value="false"/>
Expand All @@ -67,6 +75,9 @@
<arg name="launch_driver" value="$(var launch_driver)"/>
<arg name="vehicle_mirror_param_file" value="$(var vehicle_mirror_param_file)"/>
<arg name="container_name" value="pointcloud_container"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="use_cuda_preprocessor" value="$(var use_cuda_preprocessor)"/>
<arg name="vertical_bins" value="16"/>
<arg name="horizontal_ring_id" value="0"/>
<arg name="is_channel_order_top2down" value="false"/>
Expand All @@ -89,6 +100,9 @@
<arg name="launch_driver" value="$(var launch_driver)"/>
<arg name="vehicle_mirror_param_file" value="$(var vehicle_mirror_param_file)"/>
<arg name="container_name" value="pointcloud_container"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="use_cuda_preprocessor" value="$(var use_cuda_preprocessor)"/>
<arg name="vertical_bins" value="16"/>
<arg name="horizontal_ring_id" value="0"/>
<arg name="is_channel_order_top2down" value="false"/>
Expand Down
4 changes: 3 additions & 1 deletion aip_xx1_launch/launch/pointcloud_preprocessor.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,11 @@ def launch_setup(context, *args, **kwargs):
remappings=[
("~/input/twist", "/sensing/vehicle_velocity_converter/twist_with_covariance"),
("output", "concatenated/pointcloud"),
("output/cuda", "concatenated/pointcloud/cuda"),
],
parameters=[concatenate_and_time_sync_node_param],
extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
# NOTE(knzo25): when using the cuda blackboard, this setting can not be made global

Check warning on line 50 in aip_xx1_launch/launch/pointcloud_preprocessor.launch.py

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (knzo)
# extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
)

# load concat or passthrough filter
Expand Down
1 change: 1 addition & 0 deletions aip_xx1_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<exec_depend>autoware_cuda_pointcloud_preprocessor</exec_depend>
<exec_depend>autoware_gnss_poser</exec_depend>
<exec_depend>autoware_imu_corrector</exec_depend>
<exec_depend>autoware_pointcloud_preprocessor</exec_depend>
Expand Down
6 changes: 6 additions & 0 deletions common_sensor_launch/launch/hesai_OT128.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<arg name="dual_return_distance_threshold" default="0.1"/>
<arg name="vehicle_mirror_param_file"/>
<arg name="container_name" default="hesai_node_container"/>
<arg name="pointcloud_container_name" default="pointcloud_container"/>
<arg name="use_pointcloud_container" default="false"/>
<arg name="use_cuda_preprocessor" default="false"/>

<include file="$(find-pkg-share common_sensor_launch)/launch/nebula_node_container.launch.py">
<arg name="launch_driver" value="$(var launch_driver)"/>
Expand All @@ -36,6 +39,9 @@
<arg name="use_intra_process" value="true"/>
<arg name="use_multithread" value="true"/>
<arg name="container_name" value="$(var container_name)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="use_cuda_preprocessor" value="$(var use_cuda_preprocessor)"/>
<arg name="ptp_profile" value="automotive"/>
<arg name="ptp_transport_type" value="L2"/>
<arg name="ptp_switch_type" value="NON_TSN"/>
Expand Down
6 changes: 6 additions & 0 deletions common_sensor_launch/launch/hesai_XT32.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<arg name="dual_return_distance_threshold" default="0.1"/>
<arg name="vehicle_mirror_param_file"/>
<arg name="container_name" default="hesai_node_container"/>
<arg name="pointcloud_container_name" default="pointcloud_container"/>
<arg name="use_pointcloud_container" default="false"/>
<arg name="use_cuda_preprocessor" default="false"/>

<include file="$(find-pkg-share common_sensor_launch)/launch/nebula_node_container.launch.py">
<arg name="launch_driver" value="$(var launch_driver)"/>
Expand All @@ -42,5 +45,8 @@
<arg name="setup_sensor" value="true"/>
<arg name="retry_hw" value="true"/>
<arg name="container_name" value="$(var container_name)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="use_cuda_preprocessor" value="$(var use_cuda_preprocessor)"/>
</include>
</launch>
Loading

0 comments on commit 453c3ff

Please sign in to comment.