From dd0ade34db0d11bd33c5073bf7d2e7c6f1dea1cc Mon Sep 17 00:00:00 2001 From: Fabian Oboril Date: Mon, 13 Nov 2023 11:33:11 +0100 Subject: [PATCH] Enable Ubuntu 22.04 builds * Enable Ubuntu 22.04 builds * Added support for gcc-11 and clang-14 on 22.04 * Added support for clang-10 on 20.04 * Updated map --- .gitmodules | 6 ---- README.md | 31 ++++++++++--------- ad_rss/python/generate_python_lib.py.in | 3 +- .../tests/RssSceneCreationTest.hpp | 1 + colcon.meta | 4 +-- colcon_python.meta | 3 ++ dependencies/PROJ | 1 - dependencies/map | 2 +- dependencies/spdlog | 1 - 9 files changed, 26 insertions(+), 26 deletions(-) delete mode 160000 dependencies/PROJ delete mode 160000 dependencies/spdlog diff --git a/.gitmodules b/.gitmodules index 48ca4f7f59..a3c2c475be 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ -[submodule "dependencies/spdlog"] - path = dependencies/spdlog - url = https://github.com/gabime/spdlog.git [submodule "dependencies/map"] path = dependencies/map url = https://github.com/carla-simulator/map.git -[submodule "dependencies/PROJ"] - path = dependencies/PROJ - url = https://github.com/OSGeo/PROJ.git diff --git a/README.md b/README.md index a992f0274f..1ab8ece5dd 100644 --- a/README.md +++ b/README.md @@ -116,8 +116,8 @@ Note: The RSS module in this library does not initiate evasive manuevers. At the ## Getting started #### Installation of dependencies -Currently, the focused operating systems are Ubuntu 16.04 and Ubuntu 18.04. Nevertheless, the library should work in a similar way for any other Linux OS. -To install the basic dependencies for Ubuntu 16.04/18.04 execute the following command: +Currently, the focused operating systems are Ubuntu 18.04, Ubuntu 20.04 and Ubuntu 22.04. Nevertheless, the library should work in a similar way for any other Linux OS. +To install the basic dependencies for Ubuntu 18.04/20.04/22.04 execute the following command: ```bash user$> sudo apt-get install git build-essential cmake libboost-dev ``` @@ -135,20 +135,23 @@ To download the library, you may run: ``` #### Supported systems -Development systems are Ubuntu 16.04 and Ubuntu 18.04. -Following compiler combinations are [tested continously](https://github.com/intel/ad-rss-lib/blob/master/.travis.yml): +Development systems are Ubuntu 18.04, Ubuntu 20.04 and Ubuntu 22.04 +Following compiler and Python combinations are [tested continously](https://github.com/intel/ad-rss-lib/blob/master/.travis.yml): -| | Ubuntu 16.04 | Ubuntu 18.04 | Ubuntu 20.04 | +| | Ubuntu 18.04 | Ubuntu 20.04 | Ubuntu 22.04 | |:---------------:|:------------:|:------------:|:------------:| -| Clang 5.0 | x | | | -| Clang 6.0 | x | | | -| Clang 7 | | x | | -| Clang 8 | | x | | -| GCC 5 | x | | | -| GCC 6 | x | | | -| GCC 7 | | x | | -| GCC 8 | | x | | -| GCC 9 | | x | x | +| Clang 7 | x | | | +| Clang 8 | x | | | +| GCC 7 | x | | | +| GCC 8 | x | | | +| GCC 9 | | x | | +| Clang 10 | | x | | +| GCC 11 | | | x | +| Clang 14 | | | x | +| Python 2.7 | x | | | +| Python 3.6 | x | | | +| Python 3.8 | | x | | +| Python 3.10 | | | x | Important: cmake is required to be at least version 3.5! diff --git a/ad_rss/python/generate_python_lib.py.in b/ad_rss/python/generate_python_lib.py.in index 61c56f7113..7da8b82cb9 100644 --- a/ad_rss/python/generate_python_lib.py.in +++ b/ad_rss/python/generate_python_lib.py.in @@ -33,7 +33,8 @@ def main(): additional_replacements = { # RoadSegment: vector>, set name manually, tool doesn't understand correctly - ("\"vector_less__ad_scope_rss_scope_world_scope_LaneSegment__greater_\"", "\"RoadSegment\"") + ("\"vector_less__ad_scope_rss_scope_world_scope_LaneSegment__greater_\"", "\"RoadSegment\""), + ("\"vector_less_ad_scope_rss_scope_world_scope_LaneSegment_greater_\"", "\"RoadSegment\"") } for component in ["core", "situation", "state", "unstructured", "world"]: diff --git a/ad_rss_map_integration/tests/RssSceneCreationTest.hpp b/ad_rss_map_integration/tests/RssSceneCreationTest.hpp index 2286e882ba..aed597f030 100644 --- a/ad_rss_map_integration/tests/RssSceneCreationTest.hpp +++ b/ad_rss_map_integration/tests/RssSceneCreationTest.hpp @@ -19,6 +19,7 @@ #include #include +#include #include #include diff --git a/colcon.meta b/colcon.meta index 453b7e14f0..7a03c8ca51 100644 --- a/colcon.meta +++ b/colcon.meta @@ -7,10 +7,10 @@ "cmake-args": ["-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DSPDLOG_BUILD_TESTS=OFF", "-DSPDLOG_BUILD_EXAMPLE=Off"] }, "ad_map_opendrive_reader": { - "dependencies": ["PROJ4"] + "dependencies": ["odrSpiral", "PROJ4"] }, "ad_map_access_qgis": { "dependencies": ["ad_map_access"] - }, + } } } diff --git a/colcon_python.meta b/colcon_python.meta index 043f9730bd..591f082f6c 100644 --- a/colcon_python.meta +++ b/colcon_python.meta @@ -3,6 +3,9 @@ "ad_physics": { "cmake-args": ["-DBUILD_SHARED_LIBS=OFF", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DCMAKE_BUILD_TYPE=RelWithDebInfo", "-DBUILD_PYTHON_BINDING=ON"] }, + "ad_map_opendrive_reader": { + "dependencies": ["odrSpiral", "PROJ4"] + }, "ad_map_access": { "cmake-args": ["-DBUILD_SHARED_LIBS=OFF", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-DCMAKE_BUILD_TYPE=RelWithDebInfo", "-DBUILD_PYTHON_BINDING=ON"] }, diff --git a/dependencies/PROJ b/dependencies/PROJ deleted file mode 160000 index da2d678c38..0000000000 --- a/dependencies/PROJ +++ /dev/null @@ -1 +0,0 @@ -Subproject commit da2d678c387ba76704824360dc52771c29d94693 diff --git a/dependencies/map b/dependencies/map index cef6a17460..d30f796c2e 160000 --- a/dependencies/map +++ b/dependencies/map @@ -1 +1 @@ -Subproject commit cef6a174609108d61f6ce168b88dbc6aa3fee4f9 +Subproject commit d30f796c2ef28725396deb8e6fc60993b71c3615 diff --git a/dependencies/spdlog b/dependencies/spdlog deleted file mode 160000 index cf6f1dd01e..0000000000 --- a/dependencies/spdlog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf6f1dd01e660d5865d68bf5fa78f6376b89470a