Skip to content

Commit fdce9ec

Browse files
committed
feat(autoware_universe): merge main to autoware_msg branch
Signed-off-by: liu cui <cynthia.liu@autocore.ai>
2 parents da582cc + be5663c commit fdce9ec

File tree

1,088 files changed

+42777
-12939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,088 files changed

+42777
-12939
lines changed

.github/CODEOWNERS

+65-60
Large diffs are not rendered by default.

.github/workflows/build-and-test-differential.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ jobs:
3636
with:
3737
fetch-depth: 0
3838

39+
- name: Check disk space before build
40+
run: df -h
41+
3942
- name: Remove exec_depend
4043
uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1
4144

@@ -69,6 +72,9 @@ jobs:
6972
verbose: true
7073
flags: differential
7174

75+
- name: Check disk space after build
76+
run: df -h
77+
7278
clang-tidy-differential:
7379
runs-on: [self-hosted, linux, X64]
7480
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest-cuda

.github/workflows/spell-check-differential.yaml

-16
This file was deleted.

common/autoware_ad_api_specs/package.xml

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<version>0.0.0</version>
66
<description>The autoware_ad_api_specs package</description>
77
<maintainer email="isamu.takagi@tier4.jp">Takagi, Isamu</maintainer>
8-
<maintainer email="makoto.yabuta@tier4.jp">yabuta</maintainer>
9-
<maintainer email="kahhooi.tan@tier4.jp">Kah Hooi Tan</maintainer>
108
<maintainer email="ryohsuke.mitsudome@tier4.jp">Ryohsuke Mitsudome</maintainer>
119
<license>Apache License 2.0</license>
1210

common/autoware_auto_common/design/comparisons.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ The `exclusive_or` function will test whether two values cast to different boole
2222
## Example Usage
2323

2424
```c++
25-
#include "common/bool_comparisons.hpp"
26-
#include "common/float_comparisons.hpp"
25+
#include "autoware_auto_common/common/bool_comparisons.hpp"
26+
#include "autoware_auto_common/common/float_comparisons.hpp"
2727

2828
#include <iostream>
2929

common/autoware_auto_common/include/common/type_traits.hpp common/autoware_auto_common/include/autoware_auto_common/common/type_traits.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
//
1515
// Developed by Apex.AI, Inc.
1616

17-
#include <common/types.hpp>
18-
#include <common/visibility_control.hpp>
17+
#include "autoware_auto_common/common/types.hpp"
18+
#include "autoware_auto_common/common/visibility_control.hpp"
1919

2020
#include <cstdint>
2121
#include <tuple>
2222
#include <type_traits>
2323

24-
#ifndef COMMON__TYPE_TRAITS_HPP_
25-
#define COMMON__TYPE_TRAITS_HPP_
24+
#ifndef AUTOWARE_AUTO_COMMON__COMMON__TYPE_TRAITS_HPP_
25+
#define AUTOWARE_AUTO_COMMON__COMMON__TYPE_TRAITS_HPP_
2626

2727
namespace autoware
2828
{
@@ -219,4 +219,4 @@ struct intersect
219219
} // namespace common
220220
} // namespace autoware
221221

222-
#endif // COMMON__TYPE_TRAITS_HPP_
222+
#endif // AUTOWARE_AUTO_COMMON__COMMON__TYPE_TRAITS_HPP_

common/autoware_auto_common/include/common/types.hpp common/autoware_auto_common/include/autoware_auto_common/common/types.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
/// \file
1717
/// \brief This file includes common type definition
1818

19-
#ifndef COMMON__TYPES_HPP_
20-
#define COMMON__TYPES_HPP_
19+
#ifndef AUTOWARE_AUTO_COMMON__COMMON__TYPES_HPP_
20+
#define AUTOWARE_AUTO_COMMON__COMMON__TYPES_HPP_
2121

22-
#include "common/visibility_control.hpp"
23-
#include "helper_functions/float_comparisons.hpp"
22+
#include "autoware_auto_common/common/visibility_control.hpp"
23+
#include "autoware_auto_common/helper_functions/float_comparisons.hpp"
2424

2525
#include <cstdint>
2626
#include <limits>
@@ -122,4 +122,4 @@ using void_t = void;
122122
} // namespace common
123123
} // namespace autoware
124124

125-
#endif // COMMON__TYPES_HPP_
125+
#endif // AUTOWARE_AUTO_COMMON__COMMON__TYPES_HPP_

common/autoware_auto_common/include/common/visibility_control.hpp common/autoware_auto_common/include/autoware_auto_common/common/visibility_control.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#ifndef COMMON__VISIBILITY_CONTROL_HPP_
18-
#define COMMON__VISIBILITY_CONTROL_HPP_
17+
#ifndef AUTOWARE_AUTO_COMMON__COMMON__VISIBILITY_CONTROL_HPP_
18+
#define AUTOWARE_AUTO_COMMON__COMMON__VISIBILITY_CONTROL_HPP_
1919

2020
#if defined(_MSC_VER) && defined(_WIN64)
2121
#if defined(COMMON_BUILDING_DLL) || defined(COMMON_EXPORTS)
@@ -35,4 +35,4 @@
3535
#error "Unsupported Build Configuration"
3636
#endif // _MSC_VER
3737

38-
#endif // COMMON__VISIBILITY_CONTROL_HPP_
38+
#endif // AUTOWARE_AUTO_COMMON__COMMON__VISIBILITY_CONTROL_HPP_

common/autoware_auto_common/include/helper_functions/angle_utils.hpp common/autoware_auto_common/include/autoware_auto_common/helper_functions/angle_utils.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#ifndef HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
18-
#define HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
17+
#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
18+
#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
1919

2020
#include <cmath>
2121
#include <type_traits>
@@ -63,4 +63,4 @@ constexpr T wrap_angle(T angle) noexcept
6363
} // namespace common
6464
} // namespace autoware
6565

66-
#endif // HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
66+
#endif // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__ANGLE_UTILS_HPP_

common/autoware_auto_common/include/helper_functions/bool_comparisons.hpp common/autoware_auto_common/include/autoware_auto_common/helper_functions/bool_comparisons.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1919
// IN THE SOFTWARE.
2020

21-
#ifndef HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
22-
#define HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
21+
#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
22+
#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
2323

24-
#include "common/types.hpp"
24+
#include "autoware_auto_common/common/types.hpp"
2525

2626
namespace autoware
2727
{
@@ -47,4 +47,4 @@ types::bool8_t exclusive_or(const T & a, const T & b)
4747
} // namespace common
4848
} // namespace autoware
4949

50-
#endif // HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
50+
#endif // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_

common/autoware_auto_common/include/helper_functions/byte_reader.hpp common/autoware_auto_common/include/autoware_auto_common/helper_functions/byte_reader.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
/// \file
1717
/// \brief This file includes common helper functions
1818

19-
#ifndef HELPER_FUNCTIONS__BYTE_READER_HPP_
20-
#define HELPER_FUNCTIONS__BYTE_READER_HPP_
19+
#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BYTE_READER_HPP_
20+
#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BYTE_READER_HPP_
2121

2222
#include <cstdint>
2323
#include <cstring>
@@ -70,4 +70,4 @@ class ByteReader
7070
} // namespace common
7171
} // namespace autoware
7272

73-
#endif // HELPER_FUNCTIONS__BYTE_READER_HPP_
73+
#endif // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BYTE_READER_HPP_

common/autoware_auto_common/include/helper_functions/crtp.hpp common/autoware_auto_common/include/autoware_auto_common/helper_functions/crtp.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
/// \file
1717
/// \brief This file includes common helper functions
1818

19-
#ifndef HELPER_FUNCTIONS__CRTP_HPP_
20-
#define HELPER_FUNCTIONS__CRTP_HPP_
19+
#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__CRTP_HPP_
20+
#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__CRTP_HPP_
2121

2222
namespace autoware
2323
{
@@ -49,4 +49,4 @@ class crtp
4949
} // namespace common
5050
} // namespace autoware
5151

52-
#endif // HELPER_FUNCTIONS__CRTP_HPP_
52+
#endif // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__CRTP_HPP_

common/autoware_auto_common/include/helper_functions/float_comparisons.hpp common/autoware_auto_common/include/autoware_auto_common/helper_functions/float_comparisons.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1919
// IN THE SOFTWARE.
2020

21-
#ifndef HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
22-
#define HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
21+
#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
22+
#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
2323

2424
#include <algorithm>
2525
#include <cmath>
@@ -146,4 +146,4 @@ bool approx_eq(const T & a, const T & b, const T & abs_eps, const T & rel_eps)
146146
} // namespace common
147147
} // namespace autoware
148148

149-
#endif // HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
149+
#endif // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_

common/autoware_auto_common/include/helper_functions/mahalanobis_distance.hpp common/autoware_auto_common/include/autoware_auto_common/helper_functions/mahalanobis_distance.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#ifndef HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
18-
#define HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
17+
#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
18+
#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
1919

2020
#include <Eigen/Cholesky>
2121

@@ -69,4 +69,4 @@ types::float32_t calculate_mahalanobis_distance(
6969
} // namespace common
7070
} // namespace autoware
7171

72-
#endif // HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
72+
#endif // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_

common/autoware_auto_common/include/helper_functions/message_adapters.hpp common/autoware_auto_common/include/autoware_auto_common/helper_functions/message_adapters.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
/// \file
1717
/// \brief This file includes common helper functions
1818

19-
#ifndef HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
20-
#define HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
19+
#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
20+
#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
2121

2222
#include <builtin_interfaces/msg/time.hpp>
2323

@@ -112,4 +112,4 @@ TimeStamp get_stamp(const T & msg) noexcept
112112
} // namespace common
113113
} // namespace autoware
114114

115-
#endif // HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
115+
#endif // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_

common/autoware_auto_common/include/helper_functions/template_utils.hpp common/autoware_auto_common/include/autoware_auto_common/helper_functions/template_utils.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#ifndef HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
18-
#define HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
17+
#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
18+
#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
1919

20-
#include <common/types.hpp>
20+
#include "autoware_auto_common/common/types.hpp"
2121

2222
#include <type_traits>
2323

@@ -72,4 +72,4 @@ struct expression_valid_with_return<
7272
} // namespace helper_functions
7373
} // namespace common
7474
} // namespace autoware
75-
#endif // HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
75+
#endif // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_

common/autoware_auto_common/include/helper_functions/type_name.hpp common/autoware_auto_common/include/autoware_auto_common/helper_functions/type_name.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#ifndef HELPER_FUNCTIONS__TYPE_NAME_HPP_
18-
#define HELPER_FUNCTIONS__TYPE_NAME_HPP_
17+
#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TYPE_NAME_HPP_
18+
#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TYPE_NAME_HPP_
1919

20-
#include <common/visibility_control.hpp>
20+
#include "autoware_auto_common/common/visibility_control.hpp"
2121

2222
#include <string>
2323
#include <typeinfo>
@@ -53,4 +53,4 @@ COMMON_PUBLIC std::string get_type_name(const T &)
5353
} // namespace helper_functions
5454
} // namespace autoware
5555

56-
#endif // HELPER_FUNCTIONS__TYPE_NAME_HPP_
56+
#endif // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TYPE_NAME_HPP_

common/autoware_auto_common/test/test_angle_utils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Developed by Apex.AI, Inc.
1616

17-
#include <common/types.hpp>
18-
#include <helper_functions/angle_utils.hpp>
17+
#include "autoware_auto_common/common/types.hpp"
18+
#include "autoware_auto_common/helper_functions/angle_utils.hpp"
1919

2020
#include <gtest/gtest.h>
2121

common/autoware_auto_common/test/test_bool_comparisons.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1919
// IN THE SOFTWARE.
2020

21-
#include "helper_functions/bool_comparisons.hpp"
21+
#include "autoware_auto_common/helper_functions/bool_comparisons.hpp"
2222

2323
#include <gtest/gtest.h>
2424

common/autoware_auto_common/test/test_byte_reader.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#include "common/types.hpp"
18-
#include "gtest/gtest.h"
19-
#include "helper_functions/byte_reader.hpp"
17+
#include "autoware_auto_common/common/types.hpp"
18+
#include "autoware_auto_common/helper_functions/byte_reader.hpp"
19+
20+
#include <gtest/gtest.h>
2021

2122
#include <vector>
2223

common/autoware_auto_common/test/test_float_comparisons.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1919
// IN THE SOFTWARE.
2020

21-
#include "helper_functions/float_comparisons.hpp"
21+
#include "autoware_auto_common/helper_functions/float_comparisons.hpp"
2222

2323
#include <gtest/gtest.h>
2424

common/autoware_auto_common/test/test_mahalanobis_distance.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
// limitations under the License.
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
16-
#include <common/types.hpp>
17-
#include <helper_functions/mahalanobis_distance.hpp>
16+
#include "autoware_auto_common/common/types.hpp"
17+
#include "autoware_auto_common/helper_functions/mahalanobis_distance.hpp"
1818

1919
#include <gtest/gtest.h>
2020

common/autoware_auto_common/test/test_message_field_adapters.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#include <helper_functions/message_adapters.hpp>
17+
#include "autoware_auto_common/helper_functions/message_adapters.hpp"
1818

1919
#include <geometry_msgs/msg/transform_stamped.hpp>
2020

common/autoware_auto_common/test/test_template_utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#include <helper_functions/template_utils.hpp>
17+
#include "autoware_auto_common/helper_functions/template_utils.hpp"
1818

1919
#include <gtest/gtest.h>
2020

common/autoware_auto_common/test/test_type_name.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Developed by Apex.AI, Inc.
1616

17-
#include <common/types.hpp>
18-
#include <helper_functions/type_name.hpp>
17+
#include "autoware_auto_common/common/types.hpp"
18+
#include "autoware_auto_common/helper_functions/type_name.hpp"
1919

2020
#include <gtest/gtest.h>
2121

common/autoware_auto_common/test/test_type_traits.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Developed by Apex.AI, Inc.
1616

17-
#include <common/type_traits.hpp>
18-
#include <common/types.hpp>
17+
#include "autoware_auto_common/common/type_traits.hpp"
18+
#include "autoware_auto_common/common/types.hpp"
1919

2020
#include <gtest/gtest.h>
2121

common/autoware_auto_geometry/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ find_package(autoware_cmake REQUIRED)
55
autoware_package()
66

77
ament_auto_add_library(${PROJECT_NAME} SHARED
8-
include/geometry/spatial_hash.hpp
9-
include/geometry/intersection.hpp
10-
include/geometry/spatial_hash_config.hpp
8+
include/autoware_auto_geometry/spatial_hash.hpp
9+
include/autoware_auto_geometry/intersection.hpp
10+
include/autoware_auto_geometry/spatial_hash_config.hpp
1111
src/spatial_hash.cpp
1212
src/bounding_box.cpp
1313
)

common/autoware_auto_geometry/design/interval.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ See 'Example Usage' below.
3939
## Example Usage
4040

4141
```c++
42-
#include "geometry/interval.hpp"
42+
#include "autoware_auto_geometry/interval.hpp"
4343

4444
#include <iostream>
4545

0 commit comments

Comments
 (0)