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

fix: update edge_auto_launcher tasks #57

Merged
merged 12 commits into from
Sep 5, 2024

Conversation

tokuda99
Copy link
Contributor

@tokuda99 tokuda99 commented Jun 10, 2024

  • Added a task to check if the GitHub API return is valid
  • Added a task to ensure driver_deb_download_url is defined
  • Added tasks to extract and fix the driver tar.gz file
  • Added a task to run the installation script
  • Removed the task to install the driver from deb file
  • Removed the task to install the SDK from deb file
  • Updated the task to setup camera driver and SDK
  • Added an ansible task to download install missing object detection model
  • Updates the object detection launcher to use the models downloaded in the previous step.

Verified using the following command, after a successful installation with ansible and a restart to allow the camera driver to load.
ros2 launch edge_auto_jetson_launch edge_auto_jetson.launch.xml

- Added a task to check if the GitHub API return is valid
- Added a task to ensure driver_deb_download_url is defined
- Added tasks to extract and fix the driver tar.gz file
- Added a task to run the installation script
- Removed the task to install the driver from deb file
- Removed the task to install the SDK from deb file
- Updated the task to setup camera driver and SDK
@tokuda99 tokuda99 closed this Jun 10, 2024
@amc-nu amc-nu reopened this Jun 12, 2024
@amc-nu amc-nu requested a review from manato June 12, 2024 06:32
@manato
Copy link
Collaborator

manato commented Jun 12, 2024

@tokuda99 @amc-nu
Thank you very much for handling this issue, and we are sorry to make things complicated.
Because tar.gz file this PR refers to is dedicated to the CTI Anvil platform, I guess it probably does not work on RQX-58G. Hence, could you please use v1.4.3 camera driver for RQX-58G platform? This is the latest version that RQX-58G is supported.

@amc-nu amc-nu closed this Jun 13, 2024
@amc-nu amc-nu reopened this Jun 13, 2024
@amc-nu
Copy link

amc-nu commented Jun 13, 2024

@manato, we fixed the issue in the repository. The problem relied on using the latest tag, causing it to point to another release than the specific one for the rescue.
We used the corresponding ID for the v1.4.3.
We also confirmed the roscube builds successfully.

@amc-nu amc-nu changed the title fix: update tier4_hdr_camera_driver tasks fix: update edge_auto_launcher tasks Jun 19, 2024
@amc-nu
Copy link

amc-nu commented Jul 30, 2024

@manato @drwnz
The new Autoware TensorRT YoloX node uses nested namespaces (autoware::tensorrt_yolox), which is incompatible with the CUDA compiler in the ROSCUBE. The following change in the code is required.

diff --git a/perception/autoware_tensorrt_yolox/include/autoware/tensorrt_yolox/tensorrt_yolox_node.hpp b/perception/autoware_tensorrt_yolox/include/autoware/tensorrt_yolox/tensorrt_yolox_node.hpp
index 7f622b2dc8..cf7b051b9e 100644
--- a/perception/autoware_tensorrt_yolox/include/autoware/tensorrt_yolox/tensorrt_yolox_node.hpp
+++ b/perception/autoware_tensorrt_yolox/include/autoware/tensorrt_yolox/tensorrt_yolox_node.hpp
@@ -42,8 +42,8 @@
 #include <string>
 #include <vector>
 
-namespace autoware::tensorrt_yolox
-{
+namespace autoware {
+namespace tensorrt_yolox {
 // cspell: ignore Semseg
 using LabelMap = std::map<int, std::string>;
 using Label = tier4_perception_msgs::msg::Semantic;
@@ -110,6 +110,6 @@ private:
   std::unique_ptr<autoware::universe_utils::DebugPublisher> debug_publisher_;
 };
 
-}  // namespace autoware::tensorrt_yolox
-
+}  // namespace tensorrt_yolox
+}  // namespace autoware
 #endif  // AUTOWARE__TENSORRT_YOLOX__TENSORRT_YOLOX_NODE_HPP_
diff --git a/perception/autoware_tensorrt_yolox/src/tensorrt_yolox_node.cpp b/perception/autoware_tensorrt_yolox/src/tensorrt_yolox_node.cpp
index f3c7b2552e..ed57c598be 100644
--- a/perception/autoware_tensorrt_yolox/src/tensorrt_yolox_node.cpp
+++ b/perception/autoware_tensorrt_yolox/src/tensorrt_yolox_node.cpp
@@ -24,8 +24,8 @@
 #include <utility>
 #include <vector>
 
-namespace autoware::tensorrt_yolox
-{
+namespace autoware {
+namespace tensorrt_yolox {
 TrtYoloXNode::TrtYoloXNode(const rclcpp::NodeOptions & node_options)
 : Node("tensorrt_yolox", node_options)
 {
@@ -281,7 +281,8 @@ void TrtYoloXNode::overlapSegmentByRoi(
                        .rowRange(roi_y_offset, roi_y_offset + roi_height));
 }
 
-}  // namespace autoware::tensorrt_yolox
+}  // namespace tensorrt_yolox
+}  // namespace autoware
 
 #include "rclcpp_components/register_node_macro.hpp"
 RCLCPP_COMPONENTS_REGISTER_NODE(autoware::tensorrt_yolox::TrtYoloXNode)

Copy link
Collaborator

@manato manato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@amc-nu @tokuda99 @urasakikeisuke
I appreciate your support! Similar to tier4/edge-auto#19, I approve this PR as a first step for updating.

@manato
Copy link
Collaborator

manato commented Sep 4, 2024

@amc-nu @tokuda99 @urasakikeisuke
Before merging this PR, would you mind fixing pre-commit.ci error since it is required to proceed merging process?

@amc-nu
Copy link

amc-nu commented Sep 5, 2024

@manato fixed the remaining issues. Ansible linting is still failing, but the files are unrelated to this PR.

@manato
Copy link
Collaborator

manato commented Sep 5, 2024

@amc-nu
Thanks for your prompt handling!

@manato manato merged commit 53c50af into tier4:main Sep 5, 2024
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants