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.

Sign up for GitHub

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

build: proper eigen deps and include #3615

Merged
merged 2 commits into from
May 3, 2023
Merged

build: proper eigen deps and include #3615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
168b15a
build: proper eigen deps and include
VRichardJP May 3, 2023
ed3745e
style(pre-commit): autofix
pre-commit-ci[bot] May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/kalman_filter/include/kalman_filter/kalman_filter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#ifndef KALMAN_FILTER__KALMAN_FILTER_HPP_
#define KALMAN_FILTER__KALMAN_FILTER_HPP_

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/LU>
#include <Eigen/Core>
#include <Eigen/LU>

/**
* @file kalman_filter.h
Expand Down
4 changes: 2 additions & 2 deletions common/kalman_filter/include/kalman_filter/time_delay_kalman_filter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include "kalman_filter/kalman_filter.hpp"

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/LU>
#include <Eigen/Core>
#include <Eigen/LU>

#include <iostream>

Expand Down
3 changes: 2 additions & 1 deletion common/osqp_interface/include/osqp_interface/csc_matrix_conv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
#ifndef OSQP_INTERFACE__CSC_MATRIX_CONV_HPP_
#define OSQP_INTERFACE__CSC_MATRIX_CONV_HPP_

#include "eigen3/Eigen/Core"
#include "osqp/glob_opts.h" // for 'c_int' type ('long' or 'long long')
#include "osqp_interface/visibility_control.hpp"

#include <Eigen/Core>

#include <vector>

namespace autoware
Expand Down
2 changes: 1 addition & 1 deletion common/osqp_interface/include/osqp_interface/osqp_interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
#ifndef OSQP_INTERFACE__OSQP_INTERFACE_HPP_
#define OSQP_INTERFACE__OSQP_INTERFACE_HPP_

#include "eigen3/Eigen/Core"
#include "osqp/osqp.h"
#include "osqp_interface/csc_matrix_conv.hpp"
#include "osqp_interface/visibility_control.hpp"

#include <Eigen/Core>
#include <rclcpp/rclcpp.hpp>

#include <limits>
Expand Down
4 changes: 2 additions & 2 deletions common/osqp_interface/src/csc_matrix_conv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include "osqp_interface/csc_matrix_conv.hpp"

#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/SparseCore"
#include <Eigen/Core>
#include <Eigen/SparseCore>

#include <exception>
#include <iostream>
Expand Down
3 changes: 2 additions & 1 deletion common/osqp_interface/test/test_csc_matrix_conv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "eigen3/Eigen/Core"
#include "gtest/gtest.h"
#include "osqp_interface/csc_matrix_conv.hpp"

#include <Eigen/Core>

#include <string>
#include <tuple>
#include <vector>
Expand Down
3 changes: 2 additions & 1 deletion common/osqp_interface/test/test_osqp_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "eigen3/Eigen/Core"
#include "gtest/gtest.h"
#include "osqp_interface/osqp_interface.hpp"

#include <Eigen/Core>

#include <tuple>
#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions common/tier4_debug_tools/include/tier4_debug_tools/lateral_error_publisher.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#define EIGEN_MPL2_ONLY

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/Geometry>
#include <Eigen/Core>
#include <Eigen/Geometry>
#include <motion_utils/trajectory/trajectory.hpp>
#include <rclcpp/rclcpp.hpp>

Expand Down
4 changes: 2 additions & 2 deletions common/tier4_localization_rviz_plugin/src/pose_history_footprint/display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <rviz_rendering/objects/billboard_line.hpp>

#define EIGEN_MPL2_ONLY
#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/Geometry>
#include <Eigen/Core>
#include <Eigen/Geometry>

#include <OgreBillboardSet.h>
#include <OgreManualObject.h>
Expand Down
4 changes: 2 additions & 2 deletions common/tier4_planning_rviz_plugin/include/path/display_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
#include <vector>

#define EIGEN_MPL2_ONLY
#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/Geometry>
#include <Eigen/Core>
#include <Eigen/Geometry>
#include <utils.hpp>

namespace
Expand Down
2 changes: 1 addition & 1 deletion ...mance_analysis/include/control_performance_analysis/control_performance_analysis_core.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "control_performance_analysis/msg/float_stamped.hpp"
#include "motion_utils/trajectory/trajectory.hpp"

#include <eigen3/Eigen/Core>
#include <Eigen/Core>
#include <rclcpp/time.hpp>

#include <autoware_auto_control_msgs/msg/ackermann_control_command.hpp>
Expand Down
4 changes: 2 additions & 2 deletions ...ance_analysis/include/control_performance_analysis/control_performance_analysis_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#ifndef CONTROL_PERFORMANCE_ANALYSIS__CONTROL_PERFORMANCE_ANALYSIS_UTILS_HPP_
#define CONTROL_PERFORMANCE_ANALYSIS__CONTROL_PERFORMANCE_ANALYSIS_UTILS_HPP_

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/Geometry>
#include <Eigen/Core>
#include <Eigen/Geometry>
#include <rclcpp/rclcpp.hpp>

#include <geometry_msgs/msg/quaternion.hpp>
Expand Down
3 changes: 2 additions & 1 deletion control/mpc_lateral_controller/include/mpc_lateral_controller/mpc_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
#ifndef MPC_LATERAL_CONTROLLER__MPC_UTILS_HPP_
#define MPC_LATERAL_CONTROLLER__MPC_UTILS_HPP_

#include "eigen3/Eigen/Core"
#include "interpolation/linear_interpolation.hpp"
#include "interpolation/spline_interpolation.hpp"
#include "rclcpp/rclcpp.hpp"
#include "tf2/utils.h"

#include <Eigen/Core>

#ifdef ROS_DISTRO_GALACTIC
#include "tf2_geometry_msgs/tf2_geometry_msgs.h"
#else
Expand Down
6 changes: 3 additions & 3 deletions ...l/mpc_lateral_controller/include/mpc_lateral_controller/qp_solver/qp_solver_interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#ifndef MPC_LATERAL_CONTROLLER__QP_SOLVER__QP_SOLVER_INTERFACE_HPP_
#define MPC_LATERAL_CONTROLLER__QP_SOLVER__QP_SOLVER_INTERFACE_HPP_

#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/Dense"
#include "eigen3/Eigen/LU"
#include <Eigen/Core>
#include <Eigen/Dense>
#include <Eigen/LU>

namespace autoware::motion::control::mpc_lateral_controller
{
Expand Down
3 changes: 2 additions & 1 deletion control/mpc_lateral_controller/include/mpc_lateral_controller/qp_solver/qp_solver_osqp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
#ifndef MPC_LATERAL_CONTROLLER__QP_SOLVER__QP_SOLVER_OSQP_HPP_
#define MPC_LATERAL_CONTROLLER__QP_SOLVER__QP_SOLVER_OSQP_HPP_

#include "eigen3/Eigen/Dense"
#include "mpc_lateral_controller/qp_solver/qp_solver_interface.hpp"
#include "osqp_interface/osqp_interface.hpp"
#include "rclcpp/rclcpp.hpp"

#include <Eigen/Dense>

namespace autoware::motion::control::mpc_lateral_controller
{

Expand Down
7 changes: 4 additions & 3 deletions ...c_lateral_controller/include/mpc_lateral_controller/qp_solver/qp_solver_unconstr_fast.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
#ifndef MPC_LATERAL_CONTROLLER__QP_SOLVER__QP_SOLVER_UNCONSTR_FAST_HPP_
#define MPC_LATERAL_CONTROLLER__QP_SOLVER__QP_SOLVER_UNCONSTR_FAST_HPP_

#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/Dense"
#include "eigen3/Eigen/LU"
#include "mpc_lateral_controller/qp_solver/qp_solver_interface.hpp"

#include <Eigen/Core>
#include <Eigen/Dense>
#include <Eigen/LU>

#include <cmath>

namespace autoware::motion::control::mpc_lateral_controller
Expand Down
5 changes: 3 additions & 2 deletions ...ontroller/include/mpc_lateral_controller/vehicle_model/vehicle_model_bicycle_dynamics.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@
#ifndef MPC_LATERAL_CONTROLLER__VEHICLE_MODEL__VEHICLE_MODEL_BICYCLE_DYNAMICS_HPP_
#define MPC_LATERAL_CONTROLLER__VEHICLE_MODEL__VEHICLE_MODEL_BICYCLE_DYNAMICS_HPP_

#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/LU"
#include "mpc_lateral_controller/vehicle_model/vehicle_model_interface.hpp"

#include <Eigen/Core>
#include <Eigen/LU>

namespace autoware::motion::control::mpc_lateral_controller
{

Expand Down
5 changes: 3 additions & 2 deletions ...troller/include/mpc_lateral_controller/vehicle_model/vehicle_model_bicycle_kinematics.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@
#ifndef MPC_LATERAL_CONTROLLER__VEHICLE_MODEL__VEHICLE_MODEL_BICYCLE_KINEMATICS_HPP_
#define MPC_LATERAL_CONTROLLER__VEHICLE_MODEL__VEHICLE_MODEL_BICYCLE_KINEMATICS_HPP_

#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/LU"
#include "mpc_lateral_controller/vehicle_model/vehicle_model_interface.hpp"

#include <Eigen/Core>
#include <Eigen/LU>

namespace autoware::motion::control::mpc_lateral_controller
{

Expand Down
5 changes: 3 additions & 2 deletions ...nclude/mpc_lateral_controller/vehicle_model/vehicle_model_bicycle_kinematics_no_delay.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@
#ifndef MPC_LATERAL_CONTROLLER__VEHICLE_MODEL__VEHICLE_MODEL_BICYCLE_KINEMATICS_NO_DELAY_HPP_
#define MPC_LATERAL_CONTROLLER__VEHICLE_MODEL__VEHICLE_MODEL_BICYCLE_KINEMATICS_NO_DELAY_HPP_

#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/LU"
#include "mpc_lateral_controller/vehicle_model/vehicle_model_interface.hpp"

#include <Eigen/Core>
#include <Eigen/LU>

namespace autoware::motion::control::mpc_lateral_controller
{

Expand Down
2 changes: 1 addition & 1 deletion ...teral_controller/include/mpc_lateral_controller/vehicle_model/vehicle_model_interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef MPC_LATERAL_CONTROLLER__VEHICLE_MODEL__VEHICLE_MODEL_INTERFACE_HPP_
#define MPC_LATERAL_CONTROLLER__VEHICLE_MODEL__VEHICLE_MODEL_INTERFACE_HPP_

#include "eigen3/Eigen/Core"
#include <Eigen/Core>

namespace autoware::motion::control::mpc_lateral_controller
{
Expand Down
4 changes: 2 additions & 2 deletions ...itudinal_controller/include/pid_longitudinal_controller/longitudinal_controller_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
#ifndef PID_LONGITUDINAL_CONTROLLER__LONGITUDINAL_CONTROLLER_UTILS_HPP_
#define PID_LONGITUDINAL_CONTROLLER__LONGITUDINAL_CONTROLLER_UTILS_HPP_

#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/Geometry"
#include "interpolation/linear_interpolation.hpp"
#include "motion_utils/trajectory/trajectory.hpp"
#include "tf2/utils.h"

#include <Eigen/Core>
#include <Eigen/Geometry>
#include <experimental/optional> // NOLINT

#include "autoware_auto_planning_msgs/msg/trajectory.hpp"
Expand Down
5 changes: 3 additions & 2 deletions ...ngitudinal_controller/include/pid_longitudinal_controller/pid_longitudinal_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#define PID_LONGITUDINAL_CONTROLLER__PID_LONGITUDINAL_CONTROLLER_HPP_

#include "diagnostic_updater/diagnostic_updater.hpp"
#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/Geometry"
#include "pid_longitudinal_controller/debug_values.hpp"
#include "pid_longitudinal_controller/longitudinal_controller_utils.hpp"
#include "pid_longitudinal_controller/lowpass_filter.hpp"
Expand All @@ -30,6 +28,9 @@
#include "trajectory_follower_base/longitudinal_controller_base.hpp"
#include "vehicle_info_util/vehicle_info_util.hpp"

#include <Eigen/Core>
#include <Eigen/Geometry>

#include "autoware_adapi_v1_msgs/msg/operation_mode_state.hpp"
#include "autoware_auto_control_msgs/msg/longitudinal_command.hpp"
#include "autoware_auto_planning_msgs/msg/trajectory.hpp"
Expand Down
5 changes: 3 additions & 2 deletions control/trajectory_follower_node/include/trajectory_follower_node/controller_node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#ifndef TRAJECTORY_FOLLOWER_NODE__CONTROLLER_NODE_HPP_
#define TRAJECTORY_FOLLOWER_NODE__CONTROLLER_NODE_HPP_

#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/Geometry"
#include "rclcpp/rclcpp.hpp"
#include "tf2/utils.h"
#include "tf2_ros/buffer.h"
Expand All @@ -26,6 +24,9 @@
#include "trajectory_follower_node/visibility_control.hpp"
#include "vehicle_info_util/vehicle_info_util.hpp"

#include <Eigen/Core>
#include <Eigen/Geometry>

#include "autoware_auto_control_msgs/msg/ackermann_control_command.hpp"
#include "autoware_auto_control_msgs/msg/longitudinal_command.hpp"
#include "autoware_auto_planning_msgs/msg/trajectory.hpp"
Expand Down
3 changes: 2 additions & 1 deletion evaluator/planning_evaluator/src/metrics/obstacle_metrics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@

#include "planning_evaluator/metrics/obstacle_metrics.hpp"

#include "eigen3/Eigen/Core"
#include "tier4_autoware_utils/tier4_autoware_utils.hpp"

#include <Eigen/Core>

#include "autoware_auto_planning_msgs/msg/trajectory_point.hpp"

#include <algorithm>
Expand Down
3 changes: 2 additions & 1 deletion evaluator/planning_evaluator/src/metrics/stability_metrics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@

#include "planning_evaluator/metrics/stability_metrics.hpp"

#include "eigen3/Eigen/Core"
#include "motion_utils/trajectory/trajectory.hpp"
#include "tier4_autoware_utils/tier4_autoware_utils.hpp"

#include <Eigen/Core>

#include "autoware_auto_planning_msgs/msg/trajectory_point.hpp"

#include <algorithm>
Expand Down
4 changes: 2 additions & 2 deletions localization/ekf_localizer/test/src/test_ekf_localizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include "ekf_localizer/ekf_localizer.hpp"

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/LU>
#include <Eigen/Core>
#include <Eigen/LU>
#include <rclcpp/rclcpp.hpp>

#include <geometry_msgs/msg/transform_stamped.hpp>
Expand Down
2 changes: 1 addition & 1 deletion localization/ndt_scan_matcher/include/ndt_scan_matcher/matrix_type.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef NDT_SCAN_MATCHER__MATRIX_TYPE_HPP_
#define NDT_SCAN_MATCHER__MATRIX_TYPE_HPP_

#include <eigen3/Eigen/Core>
#include <Eigen/Core>

using Matrix6d = Eigen::Matrix<double, 6, 6>;
using RowMatrixXd = Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>;
Expand Down
1 change: 1 addition & 0 deletions perception/bytetrack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ target_include_directories(bytetrack_lib
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/include>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(bytetrack_lib Eigen3::Eigen)

#
# ROS node
Expand Down
4 changes: 2 additions & 2 deletions perception/bytetrack/lib/include/data_type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@

#pragma once

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/Dense>
#include <Eigen/Core>
#include <Eigen/Dense>

#include <cstddef>
#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion perception/bytetrack/lib/src/kalman_filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

#include "kalman_filter.h"

#include <eigen3/Eigen/Cholesky>
#include <Eigen/Cholesky>

namespace byte_kalman
{
Expand Down
4 changes: 2 additions & 2 deletions ...tic_occupancy_grid_map/include/updater/occupancy_grid_map_binary_bayes_filter_updater.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include "updater/occupancy_grid_map_updater_interface.hpp"

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/Geometry>
#include <Eigen/Core>
#include <Eigen/Geometry>

namespace costmap_2d
{
Expand Down
3 changes: 2 additions & 1 deletion planning/motion_velocity_smoother/src/smoother/jerk_filtered_smoother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@

#include "motion_velocity_smoother/smoother/jerk_filtered_smoother.hpp"

#include "eigen3/Eigen/Core"
#include "motion_velocity_smoother/trajectory_utils.hpp"

#include <Eigen/Core>

#include <algorithm>
#include <chrono>
#include <cmath>
Expand Down
Loading