Skip to content

Commit 951b1df

Browse files
authored
fix(autoware_tensorrt_yolox): modify tensorrt_yolox_node name (#9156)
Signed-off-by: liu cui <cynthia.liu@autocore.ai>
1 parent 5f88055 commit 951b1df

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

perception/autoware_tensorrt_yolox/launch/multiple_yolox.launch.xml

+16
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,50 @@
1111
<arg name="output_topic" default="rois"/>
1212

1313
<include if="$(eval &quot;'$(var image_number)'>='1'&quot;)" file="$(find-pkg-share autoware_tensorrt_yolox)/launch/yolox.launch.xml">
14+
<arg name="yolox_node_name" value="tensorrt_yolox0"/>
15+
<arg name="image_transport_decompressor_node_name" value="image_transport_decompressor_node0"/>
1416
<arg name="input/image" value="$(var image_raw0)"/>
1517
<arg name="output/objects" value="rois0"/>
1618
</include>
1719
<include if="$(eval &quot;'$(var image_number)'>='2'&quot;)" file="$(find-pkg-share autoware_tensorrt_yolox)/launch/yolox.launch.xml">
20+
<arg name="yolox_node_name" value="tensorrt_yolox1"/>
21+
<arg name="image_transport_decompressor_node_name" value="image_transport_decompressor_node1"/>
1822
<arg name="input/image" value="$(var image_raw1)"/>
1923
<arg name="output/objects" value="rois1"/>
2024
</include>
2125
<include if="$(eval &quot;'$(var image_number)'>='3'&quot;)" file="$(find-pkg-share autoware_tensorrt_yolox)/launch/yolox.launch.xml">
26+
<arg name="yolox_node_name" value="tensorrt_yolox2"/>
27+
<arg name="image_transport_decompressor_node_name" value="image_transport_decompressor_node2"/>
2228
<arg name="input/image" value="$(var image_raw2)"/>
2329
<arg name="output/objects" value="rois2"/>
2430
</include>
2531
<include if="$(eval &quot;'$(var image_number)'>='4'&quot;)" file="$(find-pkg-share autoware_tensorrt_yolox)/launch/yolox.launch.xml">
32+
<arg name="yolox_node_name" value="tensorrt_yolox3"/>
33+
<arg name="image_transport_decompressor_node_name" value="image_transport_decompressor_node3"/>
2634
<arg name="input/image" value="$(var image_raw3)"/>
2735
<arg name="output/objects" value="rois3"/>
2836
</include>
2937
<include if="$(eval &quot;'$(var image_number)'>='5'&quot;)" file="$(find-pkg-share autoware_tensorrt_yolox)/launch/yolox.launch.xml">
38+
<arg name="yolox_node_name" value="tensorrt_yolox4"/>
39+
<arg name="image_transport_decompressor_node_name" value="image_transport_decompressor_node4"/>
3040
<arg name="input/image" value="$(var image_raw4)"/>
3141
<arg name="output/objects" value="rois4"/>
3242
</include>
3343
<include if="$(eval &quot;'$(var image_number)'>='6'&quot;)" file="$(find-pkg-share autoware_tensorrt_yolox)/launch/yolox.launch.xml">
44+
<arg name="yolox_node_name" value="tensorrt_yolox5"/>
45+
<arg name="image_transport_decompressor_node_name" value="image_transport_decompressor_node5"/>
3446
<arg name="input/image" value="$(var image_raw5)"/>
3547
<arg name="output/objects" value="rois5"/>
3648
</include>
3749
<include if="$(eval &quot;'$(var image_number)'>='7'&quot;)" file="$(find-pkg-share autoware_tensorrt_yolox)/launch/yolox.launch.xml">
50+
<arg name="yolox_node_name" value="tensorrt_yolox6"/>
51+
<arg name="image_transport_decompressor_node_name" value="image_transport_decompressor_node6"/>
3852
<arg name="input/image" value="$(var image_raw6)"/>
3953
<arg name="output/objects" value="rois6"/>
4054
</include>
4155
<include if="$(eval &quot;'$(var image_number)'>='8'&quot;)" file="$(find-pkg-share autoware_tensorrt_yolox)/launch/yolox.launch.xml">
56+
<arg name="yolox_node_name" value="tensorrt_yolox7"/>
57+
<arg name="image_transport_decompressor_node_name" value="image_transport_decompressor_node7"/>
4258
<arg name="input/image" value="$(var image_raw7)"/>
4359
<arg name="output/objects" value="rois7"/>
4460
</include>

perception/autoware_tensorrt_yolox/launch/yolox_s_plus_opt.launch.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0"?>
22
<launch>
33
<!-- cspell: ignore semseg, finetune -->
4+
<arg name="yolox_node_name" default="tensorrt_yolox"/>
5+
<arg name="image_transport_decompressor_node_name" default="image_transport_decompressor_node"/>
46
<arg name="input/image" default="/sensing/camera/camera0/image_rect_color"/>
57
<arg name="output/objects" default="/perception/object_recognition/detection/rois0"/>
68
<arg name="output/mask" default="/perception/object_recognition/detection/mask0"/>
@@ -15,13 +17,13 @@
1517
<arg name="build_only" default="false" description="exit after trt engine is built"/>
1618

1719
<arg name="param_file" default="$(find-pkg-share autoware_image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
18-
<node pkg="autoware_image_transport_decompressor" exec="image_transport_decompressor_node" name="image_transport_decompressor_node" if="$(var use_decompress)">
20+
<node pkg="autoware_image_transport_decompressor" exec="image_transport_decompressor_node" name="$(var image_transport_decompressor_node_name)" if="$(var use_decompress)">
1921
<remap from="~/input/compressed_image" to="$(var input/image)/compressed"/>
2022
<remap from="~/output/raw_image" to="$(var input/image)"/>
2123
<param from="$(var param_file)"/>
2224
</node>
2325

24-
<node pkg="autoware_tensorrt_yolox" exec="autoware_tensorrt_yolox_node_exe" name="tensorrt_yolox" output="screen">
26+
<node pkg="autoware_tensorrt_yolox" exec="autoware_tensorrt_yolox_node_exe" name="$(var yolox_node_name)" output="screen">
2527
<remap from="~/in/image" to="$(var input/image)"/>
2628
<remap from="~/out/objects" to="$(var output/objects)"/>
2729
<remap from="~/out/mask" to="$(var output/mask)"/>

0 commit comments

Comments
 (0)