Skip to content

Commit 9b203bb

Browse files
clemenshabedankHabedank Clemens
clemenshabedank
authored and
Habedank Clemens
committed
Merge branch 'master' into bugfix/sm/pylons
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
2 parents 06d9367 + 7cb894b commit 9b203bb

File tree

9 files changed

+215
-171
lines changed

9 files changed

+215
-171
lines changed

‎.github/workflows/protobuf.yml

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
name: ProtoBuf CI Builds
2+
3+
on:
4+
push:
5+
pull_request:
6+
branches: [ master ]
7+
8+
jobs:
9+
build-proto2-linux64:
10+
name: Build Proto2 Linux 64
11+
12+
runs-on: ubuntu-18.04
13+
14+
steps:
15+
- name: Checkout OSI
16+
uses: actions/checkout@v2
17+
with:
18+
submodules: true
19+
20+
- name: Setup Python
21+
uses: actions/setup-python@v2
22+
with:
23+
python-version: '3.7'
24+
25+
- name: Install Python Dependencies
26+
run: python -m pip install --upgrade pip setuptools wheel pyyaml
27+
28+
- name: Install Doxygen
29+
run: sudo apt-get install doxygen graphviz
30+
31+
- name: Cache Dependencies
32+
id: cache-depends
33+
uses: actions/cache@v2
34+
with:
35+
path: protobuf-3.15.8
36+
key: ${{ runner.os }}-v1-depends
37+
38+
- name: Download ProtoBuf
39+
if: steps.cache-depends.outputs.cache-hit != 'true'
40+
run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz && tar xzvf protobuf-all-3.15.8.tar.gz
41+
42+
- name: Build ProtoBuf
43+
if: steps.cache-depends.outputs.cache-hit != 'true'
44+
working-directory: protobuf-3.15.8
45+
run: ./configure DIST_LANG=cpp --prefix=/usr && make
46+
47+
- name: Install ProtoBuf
48+
working-directory: protobuf-3.15.8
49+
run: sudo make install && sudo ldconfig
50+
51+
- name: Install proto2cpp
52+
run: git clone --depth 1 https://github.com/OpenSimulationInterface/proto2cpp.git
53+
54+
- name: Prepare C++ Build
55+
run: mkdir build
56+
57+
- name: Prepare Documentation Bukd
58+
run: |
59+
sed -i 's/@VERSION_PATCH@/@VERSION_PATCH@_GitHub_MasterBranch/g' doxygen_config.cmake.in
60+
echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.15.8/* */proto2cpp/*" >> doxygen_config.cmake.in
61+
echo "GENERATE_TREEVIEW = YES" >> doxygen_config.cmake.in
62+
63+
- name: Configure C++ Build
64+
working-directory: build
65+
run: cmake -D FILTER_PROTO2CPP_PY_PATH=$GITHUB_WORKSPACE/proto2cpp ..
66+
67+
- name: Build C++
68+
working-directory: build
69+
run: cmake --build . --config Release -j 4
70+
71+
- name: Build Python
72+
run: python setup.py build && python setup.py sdist
73+
74+
- name: Install Python
75+
run: python -m pip install .
76+
77+
- name: Run Python Tests
78+
run: python -m unittest discover tests
79+
80+
- name: Archive Documentation
81+
if: ${{ github.event_name == 'pull_request' }}
82+
uses: actions/upload-artifact@v2
83+
with:
84+
name: linux64-doc
85+
path: doc/html
86+
if-no-files-found: error
87+
88+
- name: deploy to gh-pages if push to master branch
89+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
90+
uses: peaceiris/actions-gh-pages@v3
91+
with:
92+
github_token: ${{ secrets.GITHUB_TOKEN }}
93+
publish_dir: ./doc/html
94+
95+
build-proto3-linux64:
96+
name: Build Proto3 Linux 64
97+
98+
runs-on: ubuntu-18.04
99+
100+
steps:
101+
- name: Checkout OSI
102+
uses: actions/checkout@v2
103+
with:
104+
submodules: true
105+
106+
- name: Setup Python
107+
uses: actions/setup-python@v2
108+
with:
109+
python-version: '3.7'
110+
111+
- name: Install Python Dependencies
112+
run: python -m pip install --upgrade pip setuptools wheel pyyaml
113+
114+
- name: Cache Dependencies
115+
id: cache-depends
116+
uses: actions/cache@v2
117+
with:
118+
path: protobuf-3.15.8
119+
key: ${{ runner.os }}-v1-depends
120+
121+
- name: Download ProtoBuf
122+
if: steps.cache-depends.outputs.cache-hit != 'true'
123+
run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz && tar xzvf protobuf-all-3.15.8.tar.gz
124+
125+
- name: Build ProtoBuf
126+
if: steps.cache-depends.outputs.cache-hit != 'true'
127+
working-directory: protobuf-3.15.8
128+
run: ./configure DIST_LANG=cpp --prefix=/usr && make
129+
130+
- name: Install ProtoBuf
131+
working-directory: protobuf-3.15.8
132+
run: sudo make install && sudo ldconfig
133+
134+
- name: Prepare C++ Build
135+
run: mkdir build
136+
137+
- name: Switch to Proto3 Syntax
138+
run: |
139+
bash convert-to-proto3.sh
140+
rm *.pb2
141+
142+
- name: Configure C++ Build
143+
working-directory: build
144+
run: cmake ..
145+
146+
- name: Build C++
147+
working-directory: build
148+
run: cmake --build . --config Release -j 4
149+
150+
- name: Build Python
151+
run: python setup.py build && python setup.py sdist
152+
153+
- name: Install Python
154+
run: python -m pip install .
155+
156+
- name: Run Python Tests
157+
run: python -m unittest discover tests

‎.travis.yml

Lines changed: 0 additions & 161 deletions
This file was deleted.

‎README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
Open Simulation Interface (OSI)
22
===============================
33

4-
[![Travis Build Status](https://travis-ci.com/OpenSimulationInterface/open-simulation-interface.svg?branch=master)](https://travis-ci.com/OpenSimulationInterface/open-simulation-interface)
4+
[![ProtoBuf CI Builds](https://github.com/OpenSimulationInterface/open-simulation-interface/actions/workflows/protobuf.yml/badge.svg)](https://github.com/OpenSimulationInterface/open-simulation-interface/actions/workflows/protobuf.yml)
55

66
The Open Simulation Interface <sup>[[1]](https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/)</sup> (OSI) is a generic interface based on [Google's protocol buffers](https://developers.google.com/protocol-buffers/) for the environmental perception of automated driving functions in virtual scenarios.
77

88
As the complexity of automated driving functions rapidly increases, the requirements for test and development methods are growing. Testing in virtual environments offers the advantage of completely controlled and reproducible environment conditions.
99

10-
In this context, OSI defines generic interfaces to ensure modularity, integrability, and interchangeability of the individual components:
11-
![](doc/images/osicontextwiki.png)
12-
1310
For more information on OSI see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/) or the [official reference documentation](https://opensimulationinterface.github.io/open-simulation-interface/) for defined protobuf messages.
1411

1512
[1] Hanke, T., Hirsenkorn, N., van-Driesten, C., Garcia-Ramos, P., Schiementz, M., Schneider, S. & Biebl, E. (2017, February 03). *A generic interface for the environment perception of automated driving functions in virtual scenarios.* Retrieved January 25, 2020, from https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/

‎VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
VERSION_MAJOR = 3
2-
VERSION_MINOR = 2
3-
VERSION_PATCH = 0
2+
VERSION_MINOR = 3
3+
VERSION_PATCH = 1

‎doc/releases.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ Releases
1111
releases/v03.00
1212
releases/v03.01
1313
releases/v03.02
14+
releases/v03.03

‎doc/releases/v03.03.rst

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
`v3.3.0 - OSI "Fabulous Fangio" <https://github.com/OpenSimulationInterface/open-simulation-interface/releases/tag/v3.3.0>`_
2+
==============================
3+
4+
Stay p(OSI)tive!
5+
6+
Purpose:
7+
---------
8+
As a part of the increasing adoption of OSI in the industry, and its movement to ASAM as its home,
9+
several new use cases and extensions for OSI have been identified.
10+
This minor release highlights the work that has been done on several working packages including
11+
the introduction of brand new top level messages which extend OSI's scope beyond the specialized world of sensor modeling.
12+
13+
`Content/Changes <https://github.com/OpenSimulationInterface/open-simulation-interface/milestone/13?closed=1>`_:
14+
---------------------------------------------------------------------------------------------------------------------------------------------
15+
16+
- Introduced the TrafficCommand top-level message which enables event-based control of traffic participant models, e.g. with regard to a scenario specification.
17+
- Introduced the TrafficUpdate top-level message to send updated properties of traffic participant models.
18+
- Add new LogicalDetectionData message to SensorData, which provides detection data with respect to the reference frame of the logical/virtual sensor.
19+
- Added a new submessage to further specify wheel data.
20+
- Added a new field to support future trajectories of moving objects.
21+
- Added a new subtype message to osi_lane to better align with OpenDrive's lane type information and enable traffic participant models to identify lanes on which they are supposed to move.
22+
- Extended traffic lights and signs messages to include the model_references attribute that can be used to point out to a 3D-model.
23+
- Add global model reference to ground truth that can be used to specify the 3D model representing the environment.
24+
- Extended the camera sensor view configuration to better support the configuration of the simulation environment.
25+
- Added a new field to describe the position of the steering wheel.
26+
- Added a message MovingObjectClassification for classify-able attributes that are shared between different moving object types. Introduced the assigned lane id and the assigned lane percentage of a moving object there.
27+
28+
- Updated to checklist for pull requests to provide clearer orientation for all users.
29+
- Updated the documentation of centerline and lane boundaries (ordering of the points, describing those lines).
30+
- Updated the documentation of 3D bounding boxes.
31+
- Update the documentation of ground clearance.
32+
33+
- Make handling of enums in rules check more robust, especially ones.
34+
- Set the default compiler to C++ 11 to support protobuf>3.6.
35+
36+
`v3.3.1 - OSI "Fabulous Fangio", Update 1 <https://github.com/OpenSimulationInterface/open-simulation-interface/releases/tag/v3.3.1>`_
37+
==========================================
38+
39+
`Content/Changes <https://github.com/OpenSimulationInterface/open-simulation-interface/milestone/18?closed=1>`_:
40+
---------------------------------------------------------------------------------------------------------------------------------------------
41+
- **Bug Fix**: Fixed outdated version information in VERSION file in 3.3.0. This lead to wrong versioning in proto definitions and Doxygen documentation.
42+
- **Bug Fix**: Removed outdated picture in README.md.

0 commit comments

Comments
 (0)