Skip to content

Commit

Permalink
Merge branch 'refactor/autoware-prefix' into refactor/autoware-prefix…
Browse files Browse the repository at this point in the history
…-bitetrack
  • Loading branch information
MasatoSaeki authored Jul 25, 2024
2 parents b9bf526 + acaee04 commit a3a5062
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions edge_auto_jetson_launch/launch/tensorrt_yolox.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<!-- output topic name to be published (bbox) -->
<arg name="output/objects" default="/perception/object_recognition/detection/rois0" />
<!-- path to the YOLOX model to be loaded -->
<arg name="model_path" default="$(find-pkg-share tensorrt_yolox)/data/yolox-tiny.onnx" />
<arg name="model_path" default="$(find-pkg-share autoware_tensorrt_yolox)/data/yolox-tiny.onnx" />
<!-- path to the label file to explain category ID and string -->
<arg name="label_path" default="$(find-pkg-share tensorrt_yolox)/data/label.txt" />
<arg name="label_path" default="$(find-pkg-share autoware_tensorrt_yolox)/data/label.txt" />
<!-- container naem that this ROS node to be loaded -->
<arg name="container_name" default="" />
<!-- flag to use ROS2 intra process -->
Expand Down Expand Up @@ -38,7 +38,7 @@
<!-- If container name is not specified,
execute function as an individual node -->
<group if="$(var empty_container_is_specified)">
<node pkg="tensorrt_yolox" exec="tensorrt_yolox_node_exe" name="tensorrt_yolox">
<node pkg="autoware_tensorrt_yolox" exec="autoware_tensorrt_yolox_node_exe" name="tensorrt_yolox">
<remap from="~/in/image" to="$(var input/image)" />
<remap from="~/out/objects" to="$(var output/objects)" />
<remap from="~/out/image" to="$(var output/objects)/debug/image" />
Expand All @@ -65,7 +65,7 @@
execute function as a composable node and load it into the container -->
<group unless="$(var empty_container_is_specified)">
<load_composable_node target="$(var container_name)">
<composable_node pkg="tensorrt_yolox" plugin="tensorrt_yolox::TrtYoloXNode" name="tensorrt_yolox">
<composable_node pkg="autoware_tensorrt_yolox" plugin="autoware::tensorrt_yolox::TrtYoloXNode" name="tensorrt_yolox">
<remap from="~/in/image" to="$(var input/image)" />
<remap from="~/out/objects" to="$(var output/objects)" />
<remap from="~/out/image" to="$(var output/objects)/debug/image" />
Expand Down
2 changes: 1 addition & 1 deletion edge_auto_jetson_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<exec_depend>image_view</exec_depend>
<exec_depend>image_transport_plugins</exec_depend>
<exec_depend>individual_params</exec_depend>
<exec_depend>tensorrt_yolox</exec_depend>
<exec_depend>autoware_bytetrack</exec_depend>
<exec_depend>autoware_tensorrt_yolox</exec_depend>
<exec_depend>intrinsic_camera_calibrator</exec_depend>
<exec_depend>image_transport_decompressor</exec_depend>

Expand Down

0 comments on commit a3a5062

Please sign in to comment.