Commit Graph

276 Commits

Author SHA1 Message Date
Fabian Oboril a71e6e9fe6 Fixed spdlog version to v1.7.0 for RSS
Just using the v1.x branch is now longer working, as it
requires a cmake newer than 3.5.
2020-07-29 16:02:09 +02:00
Pasch, Frederik f8dd4e7806 Update ad-rss-lib version 2020-07-23 12:59:37 +02:00
bernat 5ac2ba712c
Adding make commands to retrieve the Plugins (#3017)
Co-authored-by: Marc Garcia Puig <marcgpuig@gmail.com>
2020-07-17 12:36:49 +02:00
Pasch, Frederik bc898acdf9 Cleanup 2020-07-14 17:53:28 +02:00
Pasch, Frederik 88ae9d04ae Update to AD RSS Library 4.0.0
- Added support for unstructured scenes and pedestrians.
- Rework rss example folder structure
- Python based debug drawing
- Handle negative speeds
- Fixes #2871 by linking libproj statically.
- Fixes #2958 by using sequential colcon build
- Allow setting log level
- Add ActorConstellationCallback
- Move setting of RssDynamics to python code
2020-07-14 17:53:28 +02:00
Philipp Dittmann 6bfe53fb46 add 4 more missing backslashes to bat files 2020-07-09 09:16:17 +02:00
Philipp Dittmann 9ad22a290a Fix backslash for UE4_ROOT in Util/BuildTools/BuildCarlaUE4.bat 2020-07-09 09:16:17 +02:00
Philipp Dittmann 20bb4c55bd Fix Windows build: Batch Files: proper handling of input, (back)slashes, spaces 2020-07-09 09:16:17 +02:00
bernat ba63075f37 Move required modules into documentation 2020-07-08 23:17:33 +02:00
Markus Hofbauer 13d9ac7de1 replace deprecated platform dist with distro linux distribution call 2020-07-08 23:17:33 +02:00
bernat 0e60250a2b If UE4_ROOT is not specified, then use the last version found in the registry 2020-05-04 10:04:52 +02:00
bernat 3f6e308301 Fix windows script to find UE4 directory 2020-05-04 10:04:52 +02:00
bernat 2eb2a0c047 Adding make docs on windows 2020-04-22 21:03:11 +02:00
bernat b58414265b Change windows package to Shipping mode 2020-04-22 19:24:19 +02:00
bernat 52b7073b48 Fixing idention 2020-04-22 12:24:28 +02:00
bernat 19627ac094 Smoke test fix, and windows clean fix 2020-04-22 12:24:28 +02:00
bernat 7d3d1796b1 Add opendrive files on packages, for standalone mode 2020-04-15 16:59:26 +02:00
bernat 244a85a9a1 Improved creation of json with 'json' module 2020-04-15 14:57:06 +02:00
bernat ff6d7d79e4 Remove build.utils from import (only used in Docker) 2020-04-15 14:57:06 +02:00
bernat a0294e9e78 Fix Codacy errors 2020-04-15 14:57:06 +02:00
bernat 22ebc81599 Fix PyLint errors 2020-04-15 14:57:06 +02:00
bernat fef9387750 Gives write access to the input folder in Docker 2020-04-15 14:57:06 +02:00
bernat a88c28a972 Adding autogeneration of JSON file if none exist 2020-04-15 14:57:06 +02:00
bernat 8e7d839f07 Adding check to shared library 2020-04-15 14:57:06 +02:00
bernat 53e6d48ce9 Fixing Codacy 2020-04-15 14:57:06 +02:00
bernat 63a19846d6 More checks in script 2020-04-15 14:57:06 +02:00
bernat 72e6a88ce1 Fix running FBX2OBJ with .SO file 2020-04-15 14:57:06 +02:00
Bernd Gassmann f3930a8f0f Ensure make package always package the correct version
Add postfix to libcarla_client{_rss}{_debug}.a in RSS variant.
make package target always rebuilds the final python shared library and
so cannot package wrong version.
Put LGPL lisence in python egg if RSS is linked.
2020-04-03 19:57:44 +02:00
Bernd Gassmann fa8a80c41a add make package.rss target 2020-04-01 16:10:50 +02:00
berndgassmann 849a6c54c5
Merge branch 'master' into feature/integrate_rss_3.0.0 2020-03-31 18:28:22 +02:00
bernat c393f3a1b1 Adding Co-Simulation on packages 2020-03-31 16:33:19 +02:00
Bernd Gassmann d913938f1f Integrate ad-rss without find_package to cope with cmake 3.5 and newer boost version 2020-03-30 17:52:37 +02:00
Bernd Gassmann 19075c8ecb Remove src and build folders before cloning repos 2020-03-30 14:02:50 +02:00
Bernd Gassmann 808028db33 Remove submodules and build ad-rss under Build folder 2020-03-30 12:42:06 +02:00
Bernd Gassmann 7ad35a9ec5 Adapted to clang8 boost built
and added some words on colcon installation in Docu.
2020-03-30 11:00:50 +02:00
berndgassmann ee5c7c8c42
Merge branch 'master' into feature/integrate_rss_3.0.0 2020-03-30 09:46:50 +02:00
bernat 7df4f97ca9 Move backup to a public S3 2020-03-28 13:16:20 +01:00
bernat c65e6e67e6 Adding boost backups to prevent regular web failures from BinTray 2020-03-28 12:07:08 +01:00
berndgassmann 7d351b721d
Merge branch 'master' into feature/integrate_rss_3.0.0 2020-03-27 14:45:53 +01:00
bernat 457b63b85e Upgrade to LLVM 8.0.1 2020-03-27 12:51:02 +01:00
Bernd Gassmann 45d0554483 Revert not required Setup.sh changes 2020-03-24 19:34:06 +01:00
Bernd Gassmann 20e61ef747 Try to comply with codacy output 2020-03-24 18:28:42 +01:00
Bernd Gassmann eea9359527 Integrate AD RSS v3.0.0
Move carla::client::Timestamp ostream operator to Timestamp.h to enable
reuse in log messages

Use of generated python interfaces of ad::physics, ad::map and ad::rss
types

RssSensor (and therefore also the RssRestrictor) now work globally on
the whole road network.

RssCheck: object conversion done in parallel using tbb
2020-03-24 13:46:54 +01:00
bernat 27e3733020 Upgrading windows scripts to 4.24 2020-03-20 12:01:30 +01:00
bernat 5905ef7cc2 More fixes to Jenkinsfile (Doxygen, Windows...)
Adding more scripts to Jenkinsfile


Adding autoscaling scripts
2020-03-19 17:34:07 +01:00
Marc Garcia Puig f47d9bd569 Improved linux recast installation 2020-03-06 12:55:37 +01:00
Marc Garcia Puig 74202dade8 Fixing Jenkins Recast install 2020-03-06 09:49:38 +01:00
Marc Garcia Puig ee343dbe9b Added support for recast build from server-side 2020-03-06 09:49:38 +01:00
Marc Garcia Puig 90284dc91e
Modifying pipeline for use AWS cloud (#2504)
Build success


Added package


Remove delete workspace for testing


Clean workspace after build


Add deploy for testing


Relocation of Unreal Engine


Using absolute path for UnrealEngine


Execute shell


Test without remove at end


Using bash instead of shell


New jenkins file for testing nodes

new tag

modified

modify 'test' stage


all in GPU


tags


all in 'build' and 'gpu'


Adjust some scripts to run smooth on GPU slave


force deploy always


Disable docker push


Remove all on slaves at end


add some locks


add some parallel stages


Fix windows package, now it copies all required files


Add 7zip option to compress package for windows


Add 'make CarlaUE4Editor' to windows


Fix the program files path for windows 64


More jobs on parallel


Add Update.bat to windows pipeline


Fixing make CarlaUE4Editor


Commenting stages in windows


Enable again download of content and fix artifact


Build only Ubuntu


Enable deploy of Docker


Make packaging of additional maps


Enabling windows build again


Adding Deploy for windows


Change URL to the new S3 buckets


Changed the Jenkins public IP


Fixes from Codacy


Disable Windows build


Add more time to smoke tests for connecting


Add 'run' option of examples without compilation


Enabled delete all after job


Adds a lock for the packaging


Removing all locks


Update the Doxygen step in Ubuntu


Fix nodes to use
2020-03-05 13:16:18 +01:00
doterop 85b192530d
Doterop/traffic manager (#2468)
* Initial implementation of t.m. performance script

* Remove redundant getLocation() calls

* Demo for inter-client communication via Carla server

* WIP: To do: For client usage needed to be changed.

* Instead or client instance episodeProxy is passed to TM

* Instead or client instance episodeProxy is passed to TM

* parmeter improvements (walkers,cars,signs,lights)

* adding section id to map setup

* fix manual_control to reload car with autopilot on

* Instead of client instance episodeProxy is passed to TM.

* WIP: Only added vehicle register via RPC server / client call in TM to
local instance from remote instance. Similarly other APIs we need to
added.

* Added all TM APIs

* carla client now can provide TM instance if required.

* While getting TM instance if server given data is not valid new TM
instace is created. Need to decide what to do with earlier registed
vehicle with previous TM.

* Updated with HealthCheckRemoteTM() function to check TM server status
instead of ResetAllTrafficLights() for any new user client.

* Dynamic port selection added to TM server instace (in case of multiple
TM serve run, it required).

* Fixed change map error

* If registered TM at carla server is not present then remote TM should be
freed and new local TM instance is created.

* Created Process for Local TM.
It cheaks with total registered vehicles in it, if no register vehicles
for 5 sec, it closes it self.

In python spawn_npc.py Client Timeout set to 10 sec. as creating Process
is system dependent call and takes time.

User has to unregister vehicle before destroying it (if activated with
TM). Also neet to check TM unregister function to remove vehicles from
register list.

* Fix for collision ignore bug

* Update TM exit function check to compare registered vehicles with world
actors that if any valid vehicle present cointinue to run the TM else
stop.

* Print removal

* Splited work of main for loop in ApplyBatchCommandsSync

* WIP! Trying to get client directly

* WIP! Trying to access episode properly without getting it from TM ctr

* Changes to BatchControlStage for Sync Mode
Changes to Parameters for Synch Mode

* Added port support for TM. Multiclient MultiTM

* Added additions for RPC Synchronous Tick to TM.
Error handeling and code organization.

* Exposed API for Sync Mode

* TMServer notifies Server that it is gonna be destroyed

* Exposed Python API for Sync Mode

* Add TM as separate process and synchronous tick calls

* SetSynchronousModeTimeOutInMiliSecond method added

* TM shutsdown and informs to the connected clients

* WIP! Map change issues again

* Updated Traffic Manager for:
1) Multi-client, Multi-TM (as required) can be reistered to server.
2) TM is not a PROCESS separated from the user-client.
3) TM will exit if user-client exit.
4) If server closed, TM also get closed by catching runtime err.

* Server side changes ...

* Fixed possible stall on TM destruction

* fixing collision stage + cybertruck not safe

* Merge branch 'master' into 'soumyadeep/traffic_manager'

* WIP! Disconnection of server has to be properly handled by clients

* format update

* Fix bug unsignalized junctions

* # WARNING: head commit changed in the meantime

Merge branch 'doterop/traffic_manager' into soumyadeep/traffic_manager
Updates for Syncronized Tick.

* Updated runtime exception in Episode for smooth exit if TN server closed
for any other user client.

* Better Exception handeling

* Merged with jackbart94/tm_reduce_getloc_calls

* Merged soumyadeep/traffic_manager.
Removed World getter and recovered Episode as a parameter of TM ctr.
Fixed syntax errors.

* Initial implementation of t.m. performance script

* Remove redundant getLocation() calls

* Demo for inter-client communication via Carla server

* WIP: To do: For client usage needed to be changed.

* Instead or client instance episodeProxy is passed to TM

* Instead or client instance episodeProxy is passed to TM

* parmeter improvements (walkers,cars,signs,lights)

* fix manual_control to reload car with autopilot on

* Instead of client instance episodeProxy is passed to TM.

* WIP: Only added vehicle register via RPC server / client call in TM to
local instance from remote instance. Similarly other APIs we need to
added.

* Added all TM APIs

* carla client now can provide TM instance if required.

* While getting TM instance if server given data is not valid new TM
instace is created. Need to decide what to do with earlier registed
vehicle with previous TM.

* Updated with HealthCheckRemoteTM() function to check TM server status
instead of ResetAllTrafficLights() for any new user client.

* Dynamic port selection added to TM server instace (in case of multiple
TM serve run, it required).

* Fixed change map error

* If registered TM at carla server is not present then remote TM should be
freed and new local TM instance is created.

* Created Process for Local TM.
It cheaks with total registered vehicles in it, if no register vehicles
for 5 sec, it closes it self.

In python spawn_npc.py Client Timeout set to 10 sec. as creating Process
is system dependent call and takes time.

User has to unregister vehicle before destroying it (if activated with
TM). Also neet to check TM unregister function to remove vehicles from
register list.

* Fix for collision ignore bug

* Update TM exit function check to compare registered vehicles with world
actors that if any valid vehicle present cointinue to run the TM else
stop.

* Splited work of main for loop in ApplyBatchCommandsSync

* WIP! Trying to get client directly

* WIP! Trying to access episode properly without getting it from TM ctr

* Changes to BatchControlStage for Sync Mode
Changes to Parameters for Synch Mode

* Added port support for TM. Multiclient MultiTM

* Added additions for RPC Synchronous Tick to TM.
Error handeling and code organization.

* Exposed API for Sync Mode

* TMServer notifies Server that it is gonna be destroyed

* Exposed Python API for Sync Mode

* Add TM as separate process and synchronous tick calls

* SetSynchronousModeTimeOutInMiliSecond method added

* TM shutsdown and informs to the connected clients

* WIP! Map change issues again

* Updated Traffic Manager for:
1) Multi-client, Multi-TM (as required) can be reistered to server.
2) TM is not a PROCESS separated from the user-client.
3) TM will exit if user-client exit.
4) If server closed, TM also get closed by catching runtime err.

* Fixed possible stall on TM destruction

* fixing collision stage + cybertruck not safe

* Merge branch 'master' into 'soumyadeep/traffic_manager'

* WIP! Disconnection of server has to be properly handled by clients

* format update

* Fix bug unsignalized junctions

* # WARNING: head commit changed in the meantime

Merge branch 'doterop/traffic_manager' into soumyadeep/traffic_manager
Updates for Syncronized Tick.

* Updated runtime exception in Episode for smooth exit if TN server closed
for any other user client.

* Better Exception handeling

* Merged with jackbart94/tm_reduce_getloc_calls

* Merged soumyadeep/traffic_manager.
Removed World getter and recovered Episode as a parameter of TM ctr.
Fixed syntax errors.

* Rebased with master

* Changes after rebase

* Solving tab errors

* Updated Changelog

* Removing Destroyed vehicle's from TM Server

* Fixed uint compatibility with Windows

* Merged soumyadeep/traffic_manager. Discarded destroyed actors

* -Removed unnecessary files

* restoring docs from rebase

* Fix windows compilation

* refactoring stage-related code

* more code refactoring

* When map change the simulation doesn't throw exception anymore

* Fixed incorrect episode

* Fixed map change and TM remote detached thread destruction

* Syntax and comments fixes

* Missed change on previous commit

* Fixed compile minor compile issue

* Cleaned and fixed some issues after merge

* fix to sync localization bugs
modified PID parameters
revamping spawn_npc

* deleted tm_spawn_npc

* fixes spawn error in sync mode

* Redoing TM sync logic

* finished performance benchmark for tm

* deprecated wrapped methods:
register_vehicle
unregister_vehicle

* New TM management

* Fixed sync mode on TM

* Cleaned TM of prints and unussed functions

* collision stage checks for (0,0,0) to ignore.
in memory map has an # between keys to avoid possible mixup.
fixed spawn_npc with new sync mode

* changelog

* added more connection retries

* fixed changelog + comments (see reviewable)

* Moved socket include's to single header

* Added missing line at the end of the file

* Fixed syntax errors

* final commit

* Minor correction in comment

* update copyright year to 2020 + removed break

* restoring unwanted changes

* patch for smoke test error

* Removed "todo" for pylint

Co-authored-by: Jacopo Bartiromo <32928804+jackbart94@users.noreply.github.com>
Co-authored-by: Praveen Kumar <35625166+pravinblaze@users.noreply.github.com>
Co-authored-by: Soumyadeep <soumyadeep.dhar@kpit.com>
Co-authored-by: joel-mb <joel.moriana@gmail.com>
Co-authored-by: Sekhar Barua <58979936+sekhar2912@users.noreply.github.com>
Co-authored-by: bernat <bernatx@gmail.com>
Co-authored-by: Marc Garcia Puig <marcgpuig@gmail.com>
2020-02-28 19:58:13 +01:00