Merge humble (#286)

Author: MishkaMN

.github/workflows/README.md

@@ -9,4 +9,4 @@ curl -X POST \
   -d '{
     "ref": "carma-develop"
   }'
-```
+```

.github/workflows/auto-merge-workflow.yml

@@ -8,4 +8,5 @@ jobs:
   docker:
     uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
     with:
-      context: .
+      tag_name_suffix: humble
+      context: .

.github/workflows/docker.yml

@@ -18,4 +18,6 @@ jobs:
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       GH_PAT: ${{ secrets.GH_PAT }}
     with:
-      context: .
+      tag_name_suffix: humble
+      remove_suffix: true
+      context: .

.github/workflows/dockerhub.yml

@@ -1,5 +1,5 @@
 ARG DOCKER_ORG=usdotfhwastoldev
-ARG DOCKER_TAG=develop
+ARG DOCKER_TAG=develop-humble
 FROM ${DOCKER_ORG}/carma-base:${DOCKER_TAG} as base_image
 
 FROM base_image AS build
@@ -11,7 +11,7 @@ ENV ROS2_PACKAGES=${ROS2_PACKAGES}
 
 COPY --chown=carma . /home/carma/autoware.ai
 RUN /home/carma/autoware.ai/docker/checkout.bash -b ${GIT_BRANCH}
-RUN ./home/carma/autoware.ai/docker/install.sh
+RUN /home/carma/autoware.ai/docker/install.sh
 
 FROM base_image
 
@@ -30,4 +30,3 @@ LABEL org.label-schema.vcs-ref=${VCS_REF}
 LABEL org.label-schema.build-date=${BUILD_DATE}
 
 COPY --chown=carma --from=build /opt/autoware.ai/ros/install /opt/autoware.ai/ros/install
-COPY --chown=carma --from=build /opt/autoware.ai/ros/install_ros2 /opt/autoware.ai/ros/install_ros2

Dockerfile

@@ -80,7 +80,7 @@ void lineString2Marker(const lanelet::ConstLineString3d ls, visualization_msgs::
  */
 void trafficLight2TriangleMarker(const lanelet::ConstLineString3d ls, visualization_msgs::msg::Marker* marker,
                                  const std::string ns, const std_msgs::msg::ColorRGBA cl,
-                                 const rclcpp::Duration duration = rclcpp::Duration(0.0), const double scale = 1.0);
+                                 const rclcpp::Duration duration = rclcpp::Duration::from_seconds(0.0), const double scale = 1.0);
 
 /**
  * [laneletsBoundaryAsMarkerArray create marker array to visualize shape of
@@ -135,7 +135,7 @@ visualization_msgs::msg::MarkerArray lineStringsAsMarkerArray(const std::vector<
  */
 visualization_msgs::msg::MarkerArray autowareTrafficLightsAsMarkerArray(
     const std::vector<lanelet::AutowareTrafficLightConstPtr> tl_reg_elems, const std_msgs::msg::ColorRGBA c,
-    const rclcpp::Duration duration = rclcpp::Duration(0.0), const double scale = 1.0);
+    const rclcpp::Duration duration = rclcpp::Duration::from_seconds(0.0), const double scale = 1.0);
 
 /**
  * [trafficLightsAsTriangleMarkerArray creates marker array to visualize shape
@@ -147,7 +147,7 @@ visualization_msgs::msg::MarkerArray autowareTrafficLightsAsMarkerArray(
  */
 visualization_msgs::msg::MarkerArray trafficLightsAsTriangleMarkerArray(
     const std::vector<lanelet::TrafficLightConstPtr> tl_reg_elems, const std_msgs::msg::ColorRGBA c,
-    const rclcpp::Duration duration = rclcpp::Duration(0.0), const double scale = 1.0);
+    const rclcpp::Duration duration = rclcpp::Duration::from_seconds(0.0), const double scale = 1.0);
 
 }  // namespace visualization
 }  // namespace lanelet

common/autoware_lanelet2_ros_interface/include/autoware_lanelet2_ros2_interface/visualization/visualization.hpp

@@ -118,7 +118,7 @@ void lightAsMarker(lanelet::ConstPoint3d p, visualization_msgs::msg::Marker* mar
     marker->color.g = 1.0f;
     marker->color.b = 1.0f;
   }
-  marker->lifetime = rclcpp::Duration(0.0);
+  marker->lifetime = rclcpp::Duration::from_seconds(0.0);
 }
 
 void laneletDirectionAsMarker(const lanelet::ConstLanelet ll, visualization_msgs::msg::Marker* marker, const int id,
@@ -152,7 +152,7 @@ void laneletDirectionAsMarker(const lanelet::ConstLanelet ll, visualization_msgs
   lanelet::ConstLineString3d center_ls = ll.centerline();
   float s = 1.0;
 
-  marker->lifetime = rclcpp::Duration(0.0);
+  marker->lifetime = rclcpp::Duration::from_seconds(0.0);
 
   marker->pose.position.x = 0.0;  // p.x();
   marker->pose.position.y = 0.0;  // p.y();
@@ -533,7 +533,7 @@ visualization_msgs::msg::MarkerArray visualization::laneletsAsTriangleMarkerArra
   marker.ns = ns;
   marker.id = 0;
   marker.type = visualization_msgs::msg::Marker::TRIANGLE_LIST;
-  marker.lifetime = rclcpp::Duration(0.0);
+  marker.lifetime = rclcpp::Duration::from_seconds(0.0);
   marker.pose.position.x = 0.0;  // p.x();
   marker.pose.position.y = 0.0;  // p.y();
   marker.pose.position.z = 0.0;  // p.z();

common/autoware_lanelet2_ros_interface/lib/autoware_lanelet2_ros2_interface/visualization.cpp

@@ -33,7 +33,7 @@ find_path(PUGIXML_INCLUDE_DIRS
   PATH_SUFFIXES pugixml
 )
 
-find_package(PROJ4 REQUIRED)
+find_package(PROJ REQUIRED)
 find_package(Boost REQUIRED)
 
 
@@ -132,7 +132,7 @@ if(${ROS_VERSION} EQUAL 2)
     include
     ${GeographicLib_INCLUDE_DIRS}
     ${PUGIXML_INCLUDE_DIRS}
-    ${PROJ4_INCLUDE_DIRS}
+    ${PROJ_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${${LOGGER_DEP}_INCLUDE_DIRS}
     ${hardcoded_params_INCLUDE_DIRS}
@@ -150,7 +150,7 @@ if(${ROS_VERSION} EQUAL 2)
 
   target_link_libraries(lanelet2_extension_lib
     ${GeographicLib_LIBRARIES}
-    ${PROJ4_LIBRARIES}
+    ${PROJ_LIBRARIES}
     ${Boost_LIBRARIES}
     ${${LOGGER_DEP}_LIBRARIES}
   )

common/lanelet2_extension/CMakeLists.txt

@@ -41,6 +41,7 @@
   <depend>lanelet2_extension</depend>
   <depend>carma_ros2_utils</depend>
   <depend>autoware_lanelet2_ros_interface</depend>  
+  <depend>pcl_conversions</depend>
 
 
   <test_depend>ament_lint_auto</test_depend>

common/map_file_ros2/package.xml

@@ -32,6 +32,8 @@
 #include <tf2/LinearMath/Quaternion.h>
 #include <tf2_ros/transform_listener.h>
 #include <tf2_ros/transform_broadcaster.h>
+#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
+#include <tf2_ros/buffer.h>
 
 #include "amathutils_lib_ros2/kalman_filter.hpp"
 #include "amathutils_lib_ros2/time_delay_kalman_filter.hpp"
@@ -235,4 +237,4 @@ class EKFLocalizer: public carma_ros2_utils::CarmaLifecycleNode
     carma_ros2_utils::CallbackReturn handle_on_configure(const rclcpp_lifecycle::State &);
 };
 
-} //namespace ekf_localizer
+} //namespace ekf_localizer

core_perception/ekf_localizer/include/ekf_localizer/ekf_localizer.hpp

@@ -72,4 +72,4 @@ ${PCL_LIBRARIES}
 
 ament_auto_package(
   INSTALL_TO_SHARE launch
-)
+)

core_perception/lidar_localizer_ros2/CMakeLists.txt

@@ -30,17 +30,16 @@
 #include <std_msgs/msg/bool.hpp>
 #include <std_msgs/msg/float32.hpp>
 #include <std_msgs/msg/string.hpp>
-#include <velodyne_pointcloud/rawdata.hpp>
 
 #include <tf2_ros/static_transform_broadcaster.h>
 #include "tf2_ros/transform_broadcaster.h"
 #include <tf2_ros/transform_listener.h>
 #include <tf2_ros/buffer.h>
-#include "tf2_geometry_msgs/tf2_geometry_msgs.h"
+#include "tf2_geometry_msgs/tf2_geometry_msgs.hpp"
 
 #include <geometry_msgs/msg/pose_stamped.hpp>
 #include <geometry_msgs/msg/vector3_stamped.hpp>
-#include <pcl/io/io.h>
+#include <pcl/common/io.h>
 #include <pcl/io/pcd_io.h>
 #include <pcl/point_types.h>
 #include <pcl_conversions/pcl_conversions.h>

core_perception/lidar_localizer_ros2/include/ndt_matching.hpp

@@ -42,7 +42,7 @@
   <depend>tf2</depend>
   <depend>tf2_ros</depend>
   <depend>pcl</depend>
-  <depend>velodyne_pointcloud</depend>
+  <depend>tf2_geometry_msgs</depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_cmake_gtest</test_depend>

core_perception/lidar_localizer_ros2/package.xml

@@ -6,7 +6,6 @@ find_package(ros_environment REQUIRED)
 set(ROS_VERSION $ENV{ROS_VERSION})
 
 find_package(PCL COMPONENTS REQUIRED)
-find_package(catkin REQUIRED)
 find_package(Eigen3 QUIET)
 
 if(NOT EIGEN3_FOUND)
@@ -21,7 +20,7 @@ else()
 endif()
 
 if(${ROS_VERSION} EQUAL 1)
-
+  find_package(catkin REQUIRED)
   catkin_package(
     INCLUDE_DIRS include
     LIBRARIES ndt_cpu                   #The exported libraries from the project
@@ -135,4 +134,4 @@ else() #ROS2
 
   ament_auto_package()
 
-endif()
+endif()

core_perception/ndt_cpu/CMakeLists.txt

@@ -43,6 +43,3 @@ cd "${dir}"/autoware.ai
 git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch "$BRANCH"
 git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch "$BRANCH"
 git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch "$BRANCH"
-# TODO(CAR-6023): Should this external dependencies be moved into install.sh
-# Required to build pacmod_msgs
-git clone https://github.com/astuff/astuff_sensor_msgs.git "${dir}"/src/astuff_sensor_msgs -b 3.0.1

docker/checkout.bash

@@ -14,11 +14,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-###
-# ROS 1 Build
-###
-# Source environment variables
 if [[ ! -z "$ROS1_PACKAGES$ROS2_PACKAGES" ]]; then
     echo "Sourcing previous build for incremental build start point..."
     source /opt/autoware.ai/ros/install/setup.bash
@@ -30,57 +25,21 @@ fi
 # Enter source directory
 cd /home/carma/autoware.ai
 
-# Build with CUDA
-echo "ROS 1 Build with CUDA"
 sudo mkdir /opt/autoware.ai # Create install directory
 sudo chown carma /opt/autoware.ai # Set owner to expose permissions for build
 sudo chgrp carma /opt/autoware.ai # Set group to expose permissions for build
 
-if [[ ! -z "$ROS1_PACKAGES$ROS2_PACKAGES" ]]; then
-    if [[ ! -z "$ROS1_PACKAGES" ]]; then
-        echo "Incrementally building ROS1 packages: $ROS1_PACKAGES"
-        AUTOWARE_COMPILE_WITH_CUDA=1 colcon build --build-base build_ros1 --install-base /opt/autoware.ai/ros/install --cmake-args -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=/usr/local/cuda/lib64/stubs -DCMAKE_CXX_FLAGS=-Wall -DCMAKE_C_FLAGS=-Wall --packages-above $ROS1_PACKAGES --allow-overriding $ROS1_PACKAGES
-    else
-        echo "Build type is incremental but no ROS1 packages specified, skipping ROS1 build..."
-    fi
-else
-    echo "Building all ROS1 Autoware.AI Components"
-    AUTOWARE_COMPILE_WITH_CUDA=1 colcon build --build-base build_ros1 --install-base /opt/autoware.ai/ros/install --cmake-args -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=/usr/local/cuda/lib64/stubs -DCMAKE_CXX_FLAGS=-Wall -DCMAKE_C_FLAGS=-Wall
-fi
-
-# Get the exit code from the ROS1 build so we can skip the ROS2 build if the ROS1 build failed
-status=$?
-
-if [[ $status -ne 0 ]]; then
-    echo "Autoware.ai build failed."
-    exit $status
-fi
-echo "Build of ROS1 Autoware.AI Components Complete"
-
-
-###
-# ROS 2 Build
-###
-source /opt/ros/foxy/setup.bash
-if [[ ! -z "$ROS1_PACKAGES$ROS2_PACKAGES" ]]; then
-    echo "Sourcing previous build for incremental build start point..."
-    source /opt/autoware.ai/ros/install_ros2/setup.bash
-else
-    echo "Sourcing base image for full build..."
-    source /home/carma/catkin/setup.bash
-fi
-
 echo "ROS 2 Build"
 if [[ ! -z "$ROS1_PACKAGES$ROS2_PACKAGES" ]]; then
     if [[ ! -z "$ROS2_PACKAGES" ]]; then
         echo "Incrementally building ROS2 packages: $ROS1_PACKAGES"
         # Build with CUDA compile option 
-        AUTOWARE_COMPILE_WITH_CUDA=1 colcon build --install-base /opt/autoware.ai/ros/install_ros2 --build-base build_ros2 --cmake-args -DCMAKE_BUILD_TYPE=Release --packages-above $ROS2_PACKAGES --allow-overriding $ROS2_PACKAGES
+        AUTOWARE_COMPILE_WITH_CUDA=1 colcon build --install-base /opt/autoware.ai/ros/install --build-base build --cmake-args -DCMAKE_BUILD_TYPE=Release --packages-above $ROS2_PACKAGES --allow-overriding $ROS2_PACKAGES --packages-ignore parking_planner parking_planner_nodes
     else
         echo "Build type is incremental but no ROS2 packages specified, skipping ROS2 build..."
     fi
 else
     echo "Building all ROS2 Autoware.AI Components"
     # Build with CUDA compile option
-    AUTOWARE_COMPILE_WITH_CUDA=1 colcon build --install-base /opt/autoware.ai/ros/install_ros2 --build-base build_ros2 --cmake-args -DCMAKE_BUILD_TYPE=Release
+    AUTOWARE_COMPILE_WITH_CUDA=1 colcon build --install-base /opt/autoware.ai/ros/install --build-base build --cmake-args -DCMAKE_BUILD_TYPE=Release --packages-ignore parking_planner parking_planner_nodes
 fi

docker/install.sh

@@ -26,7 +26,7 @@
 # if it is a local installation.
 find_package( PythonInterp )
 if( PYTHONINTERP_FOUND )
-  get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
+  get_filename_component( _python_path ${Python3_EXECUTABLE} PATH )
   find_program( CYTHON_EXECUTABLE
     NAMES cython cython.bat cython3
     HINTS ${_python_path}

jsk_recognition/jsk_recognition_utils/cmake/FindCython.cmake

@@ -7,7 +7,7 @@ conan_define_targets()
 target_link_libraries(${PROJECT_NAME}::auto_deps_export INTERFACE ${CONAN_TARGETS})
 if(CONAN_USER_PYTHON_DEV_CONFIG_python_exec)
     set(PYTHON_VERSION ${CONAN_USER_PYTHON_DEV_CONFIG_python_version})
-    set(PYTHON_EXECUTABLE ${CONAN_USER_PYTHON_DEV_CONFIG_python_exec})
+    set(Python3_EXECUTABLE ${CONAN_USER_PYTHON_DEV_CONFIG_python_exec})
 endif()
 
 set(CATKIN_DEVEL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})

mrt_cmake_modules/cmake/Modules/CatkinMockForConan.cmake

@@ -5,8 +5,8 @@
 #  BoostPython_INCLUDE_DIRS - the include directory for boost+python
 #  BoostPython_LIBRARIES - the needed libs for boost+python
 
-if(PYTHON_VERSION)
-    set(_python_version ${PYTHON_VERSION})
+if(Python3_VERSION)
+    set(_python_version ${Python3_VERSION})
 else()
     set(_python_version 2.7)
 endif()

mrt_cmake_modules/cmake/Modules/FindBoostPython.cmake

@@ -12,7 +12,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/package.xml"
 #variable set. This is used, because the python script is calling some ros tools to distinguish
 #between catkin and non catkin packages.
 set(_gather_cmd
-    ${MRT_CMAKE_ENV} ${PYTHON_EXECUTABLE} ${MRT_CMAKE_MODULES_ROOT_PATH}/scripts/generate_cmake_dependency_file.py
+    ${MRT_CMAKE_ENV} ${Python3_EXECUTABLE} ${MRT_CMAKE_MODULES_ROOT_PATH}/scripts/generate_cmake_dependency_file.py
     "${CMAKE_CURRENT_SOURCE_DIR}/package.xml" "${MRT_CMAKE_MODULES_ROOT_PATH}/yaml/cmake.yaml"
     "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/auto_dep_vars.cmake")
 execute_process(

mrt_cmake_modules/cmake/Modules/GatherDeps.cmake

@@ -45,7 +45,7 @@ function(mrt_init_testing)
     endif()
     if(NOT TARGET init_tests)
         set(pre_test_cmd
-            ${PYTHON_EXECUTABLE}
+            ${Python3_EXECUTABLE}
             ${MRT_CMAKE_MODULES_ROOT_PATH}/scripts/init_coverage.py
             ${PROJECT_NAME}
             ${CMAKE_BINARY_DIR}
@@ -61,7 +61,7 @@ function(mrt_init_testing)
             set(show_result "--show")
         endif()
         set(post_test_cmd
-            ${PYTHON_EXECUTABLE}
+            ${Python3_EXECUTABLE}
             ${MRT_CMAKE_MODULES_ROOT_PATH}/scripts/eval_coverage.py
             ${CMAKE_SOURCE_DIR}
             ${CMAKE_BINARY_DIR}
@@ -115,7 +115,7 @@ function(_mrt_run_test target_name working_dir result_xml_path)
 
     set(run_test_cmd
         ${CATKIN_ENV}
-        ${PYTHON_EXECUTABLE}
+        ${Python3_EXECUTABLE}
         ${MRT_CMAKE_MODULES_ROOT_PATH}/scripts/run_test.py
         ${result_xml_path}
         ${working_dir_arg}
@@ -205,7 +205,7 @@ function(mrt_add_rostest target launch_file)
         message(FATAL_ERROR "rostest not found! Aborting...")
     endif()
     set(cmd
-        "${PYTHON_EXECUTABLE} ${ROSTEST_EXE} --pkgdir=${PROJECT_SOURCE_DIR} --package=${PROJECT_NAME} --results-filename ${test_name}.xml --results-base-dir \"${MRT_TEST_RESULTS_DIR}\" ${CMAKE_CURRENT_LIST_DIR}/${launch_file}"
+        "${Python3_EXECUTABLE} ${ROSTEST_EXE} --pkgdir=${PROJECT_SOURCE_DIR} --package=${PROJECT_NAME} --results-filename ${test_name}.xml --results-base-dir \"${MRT_TEST_RESULTS_DIR}\" ${CMAKE_CURRENT_LIST_DIR}/${launch_file}"
     )
     if(MRT_ENABLE_COVERAGE)
         set(coverage_arg COVERAGE_DIR ${MRT_COVERAGE_DIR}/${target})

mrt_cmake_modules/cmake/Modules/MrtTesting.cmake

@@ -4,7 +4,7 @@ import os
 import sys
 import subprocess
 
-python_interpreter = "@PYTHON_EXECUTABLE@"
+python_interpreter = "@Python3_EXECUTABLE@"
 if not python_interpreter:
     python_interpreter = "python"