From b97dee14726798d8a49095960ca5c5150fe7cde4 Mon Sep 17 00:00:00 2001 From: Benjamin Gilby Date: Sun, 22 Oct 2023 23:17:56 -0400 Subject: [PATCH 1/5] fix: add dependencies for anvil --- autoware.repos | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/autoware.repos b/autoware.repos index 950dd09..de00da8 100644 --- a/autoware.repos +++ b/autoware.repos @@ -48,7 +48,7 @@ repositories: image_transport_plugins: type: git url: https://github.com/ros-perception/image_transport_plugins.git - version: foxy-devel + version: humble # build dependencies cudnn_cmake_module: type: git @@ -58,3 +58,15 @@ repositories: type: git url: https://github.com/tier4/tensorrt_cmake_module.git version: main + perception_pcl: + type: git + url: https://github.com/ros-perception/perception_pcl.git + version: ros2 + pcl_msgs: + type: git + url: https://github.com/ros-perception/pcl_msgs.git + version: ros2 + logging_demo: + type: git + url: https://github.com/ros2/demos.git + version: humble From b6fb787ee2ec9cc07307ac556f15b4738d99810d Mon Sep 17 00:00:00 2001 From: Benjamin Gilby Date: Wed, 25 Oct 2023 11:47:31 +0900 Subject: [PATCH 2/5] change python version from 3.6 to 3.8 for anvil --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index d1222ab..773c83c 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/bash colcon build \ --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release \ - -DPython3_EXECUTABLE=$(which python3.6) -DCMAKE_CUDA_STANDARD=14 \ + -DPython3_EXECUTABLE=$(which python3.8) -DCMAKE_CUDA_STANDARD=14 \ --packages-up-to edge_auto_jetson_launch From 3a7fde2fd06b7d958a61c2886a5fd8764fe7f377 Mon Sep 17 00:00:00 2001 From: nvidia Date: Thu, 2 Nov 2023 13:10:11 +0900 Subject: [PATCH 3/5] add depedencies and fix build command --- autoware.repos | 172 +++++++++++++++++++++++++++++++++++++++++-------- build.sh | 2 +- 2 files changed, 147 insertions(+), 27 deletions(-) diff --git a/autoware.repos b/autoware.repos index de00da8..74668f7 100644 --- a/autoware.repos +++ b/autoware.repos @@ -1,55 +1,89 @@ repositories: - # perception stack - launcher: + autoware.universe: type: git - url: https://github.com/tier4/edge_auto_jetson_launch.git + url: https://github.com/autowarefoundation/autoware.universe.git version: main - individual_params: + autoware_common: type: git - url: https://github.com/tier4/edge_auto_individual_params.git + url: https://github.com/autowarefoundation/autoware_common.git version: main - sensor_trigger: + autoware_msgs: type: git - url: https://github.com/tier4/sensor_trigger.git - version: galactic - ros2_v4l2_camera: + url: https://github.com/autowarefoundation/autoware_msgs.git + version: main + autoware_adapi_msgs: type: git - url: https://github.com/tier4/ros2_v4l2_camera.git - version: galactic - autoware.universe: + url: https://github.com/autowarefoundation/autoware_adapi_msgs.git + version: main + autoware_auto_msgs: type: git - url: https://github.com/autowarefoundation/autoware.universe.git + url: https://github.com/tier4/autoware_auto_msgs.git + version: tier4/main + tier4_autoware_msgs: + type: git + url: https://github.com/tier4/tier4_autoware_msgs.git + version: tier4/universe + launcher: + type: git + url: https://github.com/tier4/edge_auto_launch.git + version: main + individual_params: + type: git + url: https://github.com/tier4/edge_auto_individual_params.git version: main calibration_tools: type: git url: https://github.com/tier4/CalibrationTools.git version: tier4/universe - # package dependencies - autoware_common_msgs: + nebula: type: git - url: https://github.com/autowarefoundation/autoware_msgs.git + url: https://github.com/tier4/nebula.git version: main - autoware_common: + transport_drivers: type: git - url: https://github.com/autowarefoundation/autoware_common.git - version: main - tier4_autoware_msgs: + url: https://github.com/MapIV/transport_drivers.git + version: boost + lidartag: type: git - url: https://github.com/tier4/tier4_autoware_msgs.git + url: https://github.com/tier4/LiDARTag.git + version: humble + lidartag_msgs: + type: git + url: https://github.com/tier4/LiDARTag_msgs.git version: tier4/universe - autoware_auto_msgs: + apriltag_msgs: type: git - url: https://github.com/tier4/autoware_auto_msgs.git - version: tier4/main + url: https://github.com/christianrauch/apriltag_msgs.git + version: 2.0.0 + apriltag_ros: + type: git + url: https://github.com/christianrauch/apriltag_ros.git + version: e814e9e5d5f1bfb60a4aa685d30977c632bbc540 + ros2_numpy: + type: git + url: https://github.com/Box-Robotics/ros2_numpy.git + version: humble image_pipeline: type: git url: https://github.com/tier4/image_pipeline.git - version: tier4/main + version: 47964112293eb19f9f57254b2e6b68706954cc63 + # edge-auto-jetson + camera_perception_launcher: + type: git + url: https://github.com/tier4/edge_auto_jetson_launch.git + version: main + sensor_trigger: + type: git + url: https://github.com/tier4/sensor_trigger.git + version: galactic + ros2_v4l2_camera: + type: git + url: https://github.com/tier4/ros2_v4l2_camera.git + version: galactic image_transport_plugins: type: git url: https://github.com/ros-perception/image_transport_plugins.git version: humble - # build dependencies cudnn_cmake_module: type: git url: https://github.com/tier4/cudnn_cmake_module.git @@ -70,3 +104,89 @@ repositories: type: git url: https://github.com/ros2/demos.git version: humble + # from nebula + udp_msgs: + type: git + url: https://github.com/flynneva/udp_msgs.git + version: main + angles: + type: git + url: https://github.com/ros/angles.git + version: humble-devel + diagnostics: + type: git + url: https://github.com/ros/diagnostics.git + version: ros2 + # other build dependencies + tf_transformations: + type: git + url: https://github.com/DLu/tf_transformations.git + version: main + point_cloud_msg_wrapper: + type: git + url: https://gitlab.com/ApexAI/point_cloud_msg_wrapper + version: rolling + lanelet2_validation: + type: git + url: https://github.com/fzi-forschungszentrum-informatik/lanelet2.git + version: master + usb_cam: + type: git + url: https://github.com/ros-drivers/usb_cam.git + version: ros2 + apriltag: + type: git + url: https://github.com/AprilRobotics/apriltag.git + version: master + mrt_cmake_modules: + type: git + url: https://github.com/KIT-MRT/mrt_cmake_modules.git + version: master + gtest_vendor: + type: git + url: https://github.com/ament/googletest.git + version: humble + grid_map: + type: git + url: https://github.com/ANYbotics/grid_map.git + version: humble + filters: + type: git + url: https://github.com/ros/filters.git + version: ros2 + nav2_msgs: + type: git + url: https://github.com/ros-planning/navigation2.git + version: humble +# rviz2: +# type: git +# url: https://github.com/ros2/rviz.git +# version: humble +# resource_retriever: +# type: git +# url: https://github.com/ros/resource_retriever.git +# version: humble + tf2-eigen: + type: git + url: https://github.com/ros2/geometry2.git + version: humble +# eigenpy: +# type: git +# url: https://github.com/stack-of-tasks/eigenpy.git +# version: devel + quaternion_operation: + type: git + url: https://github.com/OUXT-Polaris/quaternion_operation.git + version: ros2 + ouxt_lint_common: + type: git + url: https://github.com/OUXT-Polaris/ouxt_common.git + version: master + ament_cmake_clang_format: + type: git + url: https://github.com/ament/ament_lint.git + version: humble + tensorrt_cmake_module: + type: git + url: https://github.com/tier4/tensorrt_cmake_module.git + version: main diff --git a/build.sh b/build.sh index 773c83c..c40a3fe 100755 --- a/build.sh +++ b/build.sh @@ -2,4 +2,4 @@ colcon build \ --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release \ -DPython3_EXECUTABLE=$(which python3.8) -DCMAKE_CUDA_STANDARD=14 \ - --packages-up-to edge_auto_jetson_launch + --packages-up-to edge_auto_launch From 4ef2e416783dae414c40fd7d7c8a44718f2b2d97 Mon Sep 17 00:00:00 2001 From: nvidia Date: Thu, 16 Mar 2023 03:04:26 +0900 Subject: [PATCH 4/5] remove calibration and general ros2 packages from autoware.repos --- autoware.repos | 109 ------------------------------------------------- 1 file changed, 109 deletions(-) diff --git a/autoware.repos b/autoware.repos index 74668f7..815e123 100644 --- a/autoware.repos +++ b/autoware.repos @@ -31,10 +31,6 @@ repositories: type: git url: https://github.com/tier4/edge_auto_individual_params.git version: main - calibration_tools: - type: git - url: https://github.com/tier4/CalibrationTools.git - version: tier4/universe nebula: type: git url: https://github.com/tier4/nebula.git @@ -43,22 +39,6 @@ repositories: type: git url: https://github.com/MapIV/transport_drivers.git version: boost - lidartag: - type: git - url: https://github.com/tier4/LiDARTag.git - version: humble - lidartag_msgs: - type: git - url: https://github.com/tier4/LiDARTag_msgs.git - version: tier4/universe - apriltag_msgs: - type: git - url: https://github.com/christianrauch/apriltag_msgs.git - version: 2.0.0 - apriltag_ros: - type: git - url: https://github.com/christianrauch/apriltag_ros.git - version: e814e9e5d5f1bfb60a4aa685d30977c632bbc540 ros2_numpy: type: git url: https://github.com/Box-Robotics/ros2_numpy.git @@ -92,36 +72,7 @@ repositories: type: git url: https://github.com/tier4/tensorrt_cmake_module.git version: main - perception_pcl: - type: git - url: https://github.com/ros-perception/perception_pcl.git - version: ros2 - pcl_msgs: - type: git - url: https://github.com/ros-perception/pcl_msgs.git - version: ros2 - logging_demo: - type: git - url: https://github.com/ros2/demos.git - version: humble - # from nebula - udp_msgs: - type: git - url: https://github.com/flynneva/udp_msgs.git - version: main - angles: - type: git - url: https://github.com/ros/angles.git - version: humble-devel - diagnostics: - type: git - url: https://github.com/ros/diagnostics.git - version: ros2 # other build dependencies - tf_transformations: - type: git - url: https://github.com/DLu/tf_transformations.git - version: main point_cloud_msg_wrapper: type: git url: https://gitlab.com/ApexAI/point_cloud_msg_wrapper @@ -130,63 +81,3 @@ repositories: type: git url: https://github.com/fzi-forschungszentrum-informatik/lanelet2.git version: master - usb_cam: - type: git - url: https://github.com/ros-drivers/usb_cam.git - version: ros2 - apriltag: - type: git - url: https://github.com/AprilRobotics/apriltag.git - version: master - mrt_cmake_modules: - type: git - url: https://github.com/KIT-MRT/mrt_cmake_modules.git - version: master - gtest_vendor: - type: git - url: https://github.com/ament/googletest.git - version: humble - grid_map: - type: git - url: https://github.com/ANYbotics/grid_map.git - version: humble - filters: - type: git - url: https://github.com/ros/filters.git - version: ros2 - nav2_msgs: - type: git - url: https://github.com/ros-planning/navigation2.git - version: humble -# rviz2: -# type: git -# url: https://github.com/ros2/rviz.git -# version: humble -# resource_retriever: -# type: git -# url: https://github.com/ros/resource_retriever.git -# version: humble - tf2-eigen: - type: git - url: https://github.com/ros2/geometry2.git - version: humble -# eigenpy: -# type: git -# url: https://github.com/stack-of-tasks/eigenpy.git -# version: devel - quaternion_operation: - type: git - url: https://github.com/OUXT-Polaris/quaternion_operation.git - version: ros2 - ouxt_lint_common: - type: git - url: https://github.com/OUXT-Polaris/ouxt_common.git - version: master - ament_cmake_clang_format: - type: git - url: https://github.com/ament/ament_lint.git - version: humble - tensorrt_cmake_module: - type: git - url: https://github.com/tier4/tensorrt_cmake_module.git - version: main From a22c365ba30813c2375cef1be68ddb0cda00d206 Mon Sep 17 00:00:00 2001 From: Benjamin Gilby Date: Mon, 20 Nov 2023 16:39:31 +0900 Subject: [PATCH 5/5] use edge_auto_jetson_launch as launcher --- autoware.repos | 8 ++------ build.sh | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/autoware.repos b/autoware.repos index 815e123..a3a8800 100644 --- a/autoware.repos +++ b/autoware.repos @@ -25,7 +25,7 @@ repositories: version: tier4/universe launcher: type: git - url: https://github.com/tier4/edge_auto_launch.git + url: https://github.com/tier4/edge_auto_jetson_launch.git version: main individual_params: type: git @@ -47,11 +47,7 @@ repositories: type: git url: https://github.com/tier4/image_pipeline.git version: 47964112293eb19f9f57254b2e6b68706954cc63 - # edge-auto-jetson - camera_perception_launcher: - type: git - url: https://github.com/tier4/edge_auto_jetson_launch.git - version: main + # edge-auto-jetson deps sensor_trigger: type: git url: https://github.com/tier4/sensor_trigger.git diff --git a/build.sh b/build.sh index c40a3fe..773c83c 100755 --- a/build.sh +++ b/build.sh @@ -2,4 +2,4 @@ colcon build \ --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release \ -DPython3_EXECUTABLE=$(which python3.8) -DCMAKE_CUDA_STANDARD=14 \ - --packages-up-to edge_auto_launch + --packages-up-to edge_auto_jetson_launch