Skip to content

Commit

Permalink
Enable Ubuntu 22.04 builds
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fabianoboril authored and berndgassmann committed Nov 16, 2023
1 parent d4c9ec7 commit dd0ade3
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 26 deletions.
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
31 changes: 17 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ Note: The RSS module in this library does not initiate evasive manuevers. At the
## Getting started <a name="started"></a>

#### 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
```
Expand All @@ -135,20 +135,23 @@ To download the library, you may run:
```

#### Supported systems <a name="systems"></a>
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!

Expand Down
3 changes: 2 additions & 1 deletion ad_rss/python/generate_python_lib.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ def main():

additional_replacements = {
# RoadSegment: vector<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"]:
Expand Down
1 change: 1 addition & 0 deletions ad_rss_map_integration/tests/RssSceneCreationTest.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <ad/rss/world/WorldModelValidInputRange.hpp>
#include <gtest/gtest.h>

#include <algorithm>
#include <fstream>
#include <streambuf>

Expand Down
4 changes: 2 additions & 2 deletions colcon.meta
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
},
}
}
}
3 changes: 3 additions & 0 deletions colcon_python.meta
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
},
Expand Down
1 change: 0 additions & 1 deletion dependencies/PROJ
Submodule PROJ deleted from da2d67
2 changes: 1 addition & 1 deletion dependencies/map
Submodule map updated 33 files
+5 −2 .gitmodules
+10 −11 README.md
+18 −0 ad_map_access/generated/CMakeLists.txt
+16 −0 ad_map_access/impl/include/ad/map/point/CoordinateTransform.hpp
+54 −28 ad_map_access/impl/src/match/AdMapMatching.cpp
+8 −5 ad_map_access/impl/src/opendrive/AdMapFactory.cpp
+112 −33 ad_map_access/impl/src/point/CoordinateTransform.cpp
+3 −1 ad_map_access/impl/tests/match/AdMapMatchingTests.cpp
+3 −3 ad_map_access/impl/tests/opendrive/OpenDriveAccessTests.cpp
+2 −1 ad_map_access/python/generate_python_lib.py.in
+28 −8 ad_map_opendrive_reader/CMakeLists.txt
+14 −1 ad_map_opendrive_reader/include/opendrive/geometry/Geometry.hpp
+2 −2 ad_map_opendrive_reader/include/opendrive/geometry/GeometryGenerator.hpp
+6 −2 ad_map_opendrive_reader/include/opendrive/types.hpp
+4 −4 ad_map_opendrive_reader/src/geometry/CenterLine.cpp
+45 −1 ad_map_opendrive_reader/src/geometry/Geometry.cpp
+13 −4 ad_map_opendrive_reader/src/geometry/GeometryGenerator.cpp
+203 −98 ad_map_opendrive_reader/src/geometry/LaneSectionSampling.cpp
+11 −4 ad_map_opendrive_reader/src/geometry/LaneUtils.cpp
+25 −4 ad_map_opendrive_reader/src/parser/LaneParser.cpp
+13 −2 ad_map_opendrive_reader/src/parser/OpenDriveParser.cpp
+25 −4 ad_map_opendrive_reader/src/parser/ProfilesParser.cpp
+3 −0 colcon.meta
+3 −0 colcon_python.meta
+0 −0 dependencies/PROJ4
+1 −0 dependencies/odrSpiral
+1 −1 dependencies/spdlog
+34 −0 doc/CHANGELOG.md
+6 −1 tools/map_maker/CMakeLists.txt
+1 −0 tools/map_maker/geometry/include/ad/map/maker/geometry/Polyline2d.hpp
+0 −1 tools/map_maker/map_data/include/ad/map/maker/map_data/Intersection.hpp
+0 −1 tools/map_maker/map_data/include/ad/map/maker/map_data/Road.hpp
+1 −1 tools/map_maker/map_data/src/BigIntersectionGenerator.cpp
1 change: 0 additions & 1 deletion dependencies/spdlog
Submodule spdlog deleted from cf6f1d

0 comments on commit dd0ade3

Please sign in to comment.