Skip to content

Commit

Permalink
[fix] Fixes for all packages and dependencies (autowarefoundation#1240)
Browse files Browse the repository at this point in the history
* Initial Cleanup

* fixed also for indigo

* kf cjeck

* Fix road wizard

* Added travis ci

* Trigger CI

* Fixes to cv_tracker and lidar_tracker cmake

* Fix kitti player dependencies

* Removed unnecessary dependencies

* messages fixing for can

* Update build script travis

* Travis Path

* Travis Paths fix

* Travis test

* Eigen checks

* removed unnecessary dependencies

* Eigen Detection

* Job number reduced

* Eigen3 more fixes

* More Eigen3

* Even more Eigen

* find package cmake modules included

* More fixes to cmake modules

* Removed non ros dependency

* Enable industrial_ci for indidog and kinetic

* Wrong install command

* fix rviz_plugin install

* FastVirtualScan fix

* Fix Qt5 Fastvirtualscan

* Fixed qt5 system dependencies for rosdep

* NDT TKU Fix catkin not pacakged

* More in detail dependencies fixes for more packages

* GLEW library for ORB

* Ignore OrbLocalizer

* Ignore Version checker

* Fix for driveworks interface

* driveworks not catkinpackagedd

* Missing catkin for driveworks

* libdpm opencv not catkin packaged

* catkin lib gnss  not included in obj_db

* Points2Polygon fix

* More missing dependencies

* image viewer not packaged

* Fixed SSH2 detection, added viewers for all distros

* Fix gnss localizer incorrect dependency config

* Fixes to multiple packages dependencies

* gnss plib and package

* More fixes to gnss

* gnss dependencies for gnss_loclaizer

* Missing gnss dependency for gnss on localizer

* More fixes for dependencies
Replaced gnss for autoware_gnss_library

* gnss more fixes

* fixes to more dependencies

* header dependency

* Debug message

* more debug messages changed back to gnss

* debud messages

* gnss test

* gnss install command

* Several fixes for OpenPlanner and its lbiraries

* Fixes to ROSInterface

* More fixes to robotsdk and rosinterface

* robotsdk calibration fix

* Fixes to rosinterface robotsdk libraries and its nodes

* Fixes to Qt5 missing dependencies in robotsdk

* glviewer missing dependencies

* Missing qt specific config cmake for robotsdk

* disable cv_tracker

* Fix to open planner un needed dependendecies

* Fixes for libraries indecision maker

* Fixes to libraries decision_maker installation

* Gazebo on Kinetic

* Added Missing library

* * Removed Gazebo and synchonization packages
* Renames vmap in lane_planner
* Added installation commands for missing pakcages

* Fixes to lane_planner

* Added NDT TKU Glut extra dependencies

* ndt localizer/lib fast pcl fixes
re enable cv_tracker

* Fix kf_lib

* Keep industrial_ci

* Fixes for dpm library

* Fusion lib fixed

* dpm and fusion header should match exported project name

* Fixes to dpm_ocv  ndt_localizer and pcl_omp

* no fast_pcl anymore

* fixes to libdpm and its package

* CI test

* test with native travis ci

* missing update for apt

* Fixes to pcl_omp installation and headers

* Final fixes for tests, modified README

* * Fixes to README
* Enable industrial_ci

* re enable native travis tests
  • Loading branch information
amc-nu committed May 8, 2018
1 parent 798285e commit 328ae6e
Show file tree
Hide file tree
Showing 319 changed files with 3,495 additions and 3,362 deletions.
51 changes: 37 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
# Use ubuntu trusty (14.04) with sudo privileges.
dist: trusty
sudo: required
language:
- generic
cache:
- apt

matrix:
include:
- dist: xenial
compiler: gcc
os: linux
sudo: required
env: ROS_DISTRO=kinetic
- dist: trusty
compiler: gcc
os: linux
sudo: required
env: ROS_DISTRO=indigo
notifications:
slack: star4:911NA0lU8gDHitCKLto9LzPJ
env:
global:
- ROS_DISTRO=indigo
- ROS_CI_DESKTOP="`lsb_release -cs`" # e.g. [precise|trusty|...]
- ROS_CI_DESKTOP="`lsb_release -cs`"
- CI_SOURCE_PATH=$(pwd)
- ROSINSTALL_FILE=$CI_SOURCE_PATH/dependencies.rosinstall
- CATKIN_OPTIONS=$CI_SOURCE_PATH/catkin.options
# Set the python path manually to include /usr/-/python2.7/dist-packages
# as this is where apt-get installs python packages.
- PYTHONPATH=$PYTHONPATH:/usr/lib/python2.7/dist-packages:/usr/local/lib/python2.7/dist-packages

# Install system dependencies, and Autoware pre requisites (non-ros)
before_install:
- sudo sh -c "echo \"deb http://packages.ros.org/ros/ubuntu $ROS_CI_DESKTOP main\" > /etc/apt/sources.list.d/ros-latest.list"
- sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
# Autoware pre requisites
- sudo apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev software-properties-common libyaml-cpp-dev python-flask python-requests libeigen3-dev
- sudo add-apt-repository ppa:mosquitto-dev/mosquitto-ppa -y
- sudo apt-get update -qq
- sudo apt-get install -y libmosquitto-dev python-catkin-pkg python-rosdep python-wstool ros-$ROS_DISTRO-catkin
# Autoware pre requisites should be installed automatically by rosdep not in here
- sudo apt-get update
- sudo apt-get install -y python-catkin-pkg python-rosdep python-wstool ros-$ROS_DISTRO-catkin
- source /opt/ros/$ROS_DISTRO/setup.bash
- sudo rosdep init
- rosdep update
Expand Down Expand Up @@ -59,4 +64,22 @@ before_script:
script:
- catkin_make clean
- source devel/setup.bash
- catkin_make -j4
- catkin_make -j4

#sudo: required
#dist: trusty
#language: generic
#compiler:
# - gcc
#notifications:
# slack: star4:911NA0lU8gDHitCKLto9LzPJ
#env:
# matrix:
# - USE_DEB=true ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
## - USE_DEB=true ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
# - USE_DEB=true ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
## - USE_DEB=true ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
#install:
# - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
#script:
# - source .ci_config/travis.sh
26 changes: 17 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,21 @@ See also [branching_model](https://github.com/CPFL/Autoware/blob/master/docs/en/

**Please use checkout a revision before 2015/OCT/21 if you want to use Autoware on ROS Hydro or Ubuntu 13.04, 13.10.**

### Install dependencies for Ubuntu 14.04 Indigo
### Install system dependencies for Ubuntu 14.04 Indigo

```
% sudo apt-get install ros-indigo-desktop-full ros-indigo-nmea-msgs ros-indigo-nmea-navsat-driver ros-indigo-sound-play ros-indigo-jsk-visualization ros-indigo-grid-map ros-indigo-gps-common
% sudo apt-get install ros-indigo-controller-manager ros-indigo-ros-control ros-indigo-ros-controllers ros-indigo-gazebo-ros-control ros-indigo-sicktoolbox ros-indigo-sicktoolbox-wrapper ros-indigo-joystick-drivers ros-indigo-novatel-span-driver ros-indigo-urg-node ros-indigo-image-view2
% sudo apt-get install libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev software-properties-common libyaml-cpp-dev python-flask python-requests
% sudo apt-get install -y python-catkin-pkg python-rosdep python-wstool ros-$ROS_DISTRO-catkin
% sudo add-apt-repository ppa:mosquitto-dev/mosquitto-ppa
% sudo apt-get update
% sudo apt-get install libmosquitto-dev
```

**NOTE: Please do not install ros-indigo-velodyne-pointcloud package. If it is already installed, please uninstall.**

### Install dependencies for Ubuntu 16.04 Kinetic
### Install system dependencies for Ubuntu 16.04 Kinetic
```
% sudo apt-get install ros-kinetic-desktop-full ros-kinetic-nmea-msgs ros-kinetic-nmea-navsat-driver ros-kinetic-sound-play ros-kinetic-jsk-visualization ros-kinetic-grid-map ros-kinetic-gps-common
% sudo apt-get install ros-kinetic-controller-manager ros-kinetic-ros-control ros-kinetic-ros-controllers ros-kinetic-gazebo-ros-control ros-kinetic-joystick-drivers ros-kinetic-urg-node ros-kinetic-image-view2
% sudo apt-get install libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev python-wxgtk3.0 software-properties-common libmosquitto-dev libyaml-cpp-dev python-flask python-requests
% sudo apt-get update
% sudo apt-get install -y python-catkin-pkg python-rosdep python-wstool ros-$ROS_DISTRO-catkin libmosquitto-dev
```

**NOTE: Following packages are not supported in ROS Kinetic.**
Expand All @@ -78,14 +76,24 @@ See also [branching_model](https://github.com/CPFL/Autoware/blob/master/docs/en/

## How to Build

1. Clone the repository

```
$ cd $HOME
$ git clone https://github.com/CPFL/Autoware.git
$ git clone https://github.com/CPFL/Autoware.git --recurse-submodules
```
or if you already have a copy of the repo, run `$ git submodule update --init --recursive`.

2. Initialize the workspace, let rosdep to install the missing dependencies and compile.

```
$ cd ~/Autoware/ros/src
$ catkin_init_workspace
$ cd ../
$ rosdep install -y --from-paths src --ignore-src --rosdistro $ROS_DISTRO
$ ./catkin_make_release
```

###Caffe based object detectors
CV based detectors RCNN and SSD nodes are not automatically built.

Expand Down
63 changes: 36 additions & 27 deletions ros/src/actuation/vehicles/packages/as/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,40 +1,49 @@
cmake_minimum_required(VERSION 2.8.3)
project(as)

# If submodule is not cloned this project will not be build.
set(AS_MSG_PATH "${CMAKE_SOURCE_DIR}/msgs/platform_automation_msgs/module_comm_msgs")
if(EXISTS "${AS_MSG_PATH}")

find_package(
catkin REQUIRED COMPONENTS
roscpp
std_msgs
geometry_msgs
module_comm_msgs
dbw_mkz_msgs
catkin REQUIRED COMPONENTS
roscpp
std_msgs
geometry_msgs
module_comm_msgs
dbw_mkz_msgs
)

catkin_package(
CATKIN_DEPENDS
roscpp
std_msgs
geometry_msgs
module_comm_msgs
dbw_mkz_msgs
CATKIN_DEPENDS
roscpp
std_msgs
geometry_msgs
module_comm_msgs
dbw_mkz_msgs
)

SET(CMAKE_CXX_FLAGS "-std=c++11 -O2 -g -Wall ${CMAKE_CXX_FLAGS}")
# If submodule is not cloned this project will not be build.
set(AS_MSG_PATH "${CMAKE_SOURCE_DIR}/msgs/platform_automation_msgs/module_comm_msgs")
if (EXISTS "${AS_MSG_PATH}")

SET(CMAKE_CXX_FLAGS "-std=c++11 -O2 -g -Wall ${CMAKE_CXX_FLAGS}")

include_directories(
${catkin_INCLUDE_DIRS}
)
include_directories(
${catkin_INCLUDE_DIRS}
)

add_executable(pacmod_interface
nodes/pacmod_interface/pacmod_interface_node.cpp
nodes/pacmod_interface/pacmod_interface.cpp
)
target_link_libraries(pacmod_interface ${catkin_LIBRARIES})
add_dependencies(pacmod_interface ${catkin_EXPORTED_TARGETS})

install(TARGETS pacmod_interface
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

add_executable(pacmod_interface
nodes/pacmod_interface/pacmod_interface_node.cpp
nodes/pacmod_interface/pacmod_interface.cpp
)
target_link_libraries(pacmod_interface ${catkin_LIBRARIES})
add_dependencies(pacmod_interface ${catkin_EXPORTED_TARGETS} )
install(DIRECTORY launch/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
PATTERN ".svn" EXCLUDE)

endif()
endif ()
62 changes: 31 additions & 31 deletions ros/src/actuation/vehicles/packages/ymc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,50 @@ project(ymc)
set(CMAKE_CXX_FLAGS "-std=c++11 -Wall ${CMAKE_CXX_FLAGS}")

find_package(
catkin REQUIRED COMPONENTS
roscpp
geometry_msgs
rosconsole
)
catkin REQUIRED COMPONENTS
roscpp
geometry_msgs
rosconsole
)

catkin_package(
CATKIN_DEPENDS
roscpp
geometry_msgs
rosconsole
)
CATKIN_DEPENDS
roscpp
geometry_msgs
rosconsole
)


EXECUTE_PROCESS(
COMMAND uname -m
OUTPUT_VARIABLE ARCHITECTURE
OUTPUT_STRIP_TRAILING_WHITESPACE
COMMAND uname -m
OUTPUT_VARIABLE ARCHITECTURE
OUTPUT_STRIP_TRAILING_WHITESPACE
)


IF("${ARCHITECTURE}" STREQUAL "aarch64")
set(LIB_ARCH _aarch64)
ELSE()
unset(LIB_ARCH)
ENDIF()
IF ("${ARCHITECTURE}" STREQUAL "aarch64")
set(LIB_ARCH _aarch64)
ELSE ()
unset(LIB_ARCH)
ENDIF ()

include_directories(
${catkin_INCLUDE_DIRS}
include
)
${catkin_INCLUDE_DIRS}
include
)

IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.1)
set(LIB_VERSION 2.0) # _GLIBCXX_USE_CXX11_ABI is 1
ELSE()
set(LIB_VERSION 1.0) # _GLIBCXX_USE_CXX11_ABI is 0
ENDIF()
IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.1)
set(LIB_VERSION 2.0) # _GLIBCXX_USE_CXX11_ABI is 1
ELSE ()
set(LIB_VERSION 1.0) # _GLIBCXX_USE_CXX11_ABI is 0
ENDIF ()

find_library(ymc_can NAMES libymc_can_${LIB_VERSION}${LIB_ARCH}.a PATHS lib)
add_executable(g30esli_interface
node/g30esli_interface/g30esli_interface.cpp
)
node/g30esli_interface/g30esli_interface.cpp
)

target_link_libraries(g30esli_interface
${catkin_LIBRARIES}
${ymc_can}
)
${catkin_LIBRARIES}
${ymc_can}
)
50 changes: 28 additions & 22 deletions ros/src/computing/perception/detection/lib/fusion/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,46 @@ cmake_minimum_required(VERSION 2.8.3)
project(fusion)

find_package(catkin REQUIRED COMPONENTS
roscpp
cv_bridge
autoware_msgs
)
roscpp
cv_bridge
autoware_msgs
)
find_package(OpenCV REQUIRED)

catkin_package(
INCLUDE_DIRS include
LIBRARIES fusion
CATKIN_DEPENDS roscpp autoware_msgs
INCLUDE_DIRS include
LIBRARIES fusion
CATKIN_DEPENDS roscpp autoware_msgs cv_bridge
)

SET(CMAKE_CXX_FLAGS "-std=c++11 -O2 -g -Wall ${CMAKE_CXX_FLAGS}")

include_directories(
include
${catkin_INCLUDE_DIRS}
include
${catkin_INCLUDE_DIRS}
)

add_library(fusion
fusion.cpp
search_distance.cpp
)
src/fusion.cpp
src/search_distance.cpp
)

target_link_libraries(fusion
${catkin_LIBRARIES}
${OpenCV_LIBS}
)
${catkin_LIBRARIES}
${OpenCV_LIBS}
)
add_dependencies(fusion
${catkin_EXPORTED_TARGETS}
)
${catkin_EXPORTED_TARGETS}
)

# Mark cpp header files for installation
install(DIRECTORY include
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "fusion_func.h"
)
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h"
)

install(TARGETS
fusion
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
)
26 changes: 14 additions & 12 deletions ros/src/computing/perception/detection/lib/fusion/package.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<?xml version="1.0"?>
<package>
<name>fusion</name>
<version>1.6.3</version>
<description>The fusion package</description>
<maintainer email="kondoh@axe-inc.co.jp">Masao KONDOH</maintainer>
<license>BSD</license>
<buildtool_depend>catkin</buildtool_depend>
<build_depend>roscpp</build_depend>
<build_depend>autoware_msgs</build_depend>
<run_depend>roscpp</run_depend>
<run_depend>autoware_msgs</run_depend>
<export>
</export>
<name>fusion</name>
<version>1.6.3</version>
<description>The fusion package</description>
<maintainer email="kondoh@axe-inc.co.jp">Masao KONDOH</maintainer>
<license>BSD</license>
<buildtool_depend>catkin</buildtool_depend>

<build_depend>roscpp</build_depend>
<build_depend>autoware_msgs</build_depend>
<build_depend>cv_bridge</build_depend>

<run_depend>roscpp</run_depend>
<run_depend>autoware_msgs</run_depend>
<run_depend>cv_bridge</run_depend>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#include <opencv/highgui.h>
#include <opencv/cxcore.h>

#include "fusion_func.h"
#include "search_distance.h"
#include "fusion/fusion_func.h"
#include "fusion/search_distance.h"

#if _DEBUG //debug
static const char *window_name = "CAR_TRACK";
Expand Down
Loading

0 comments on commit 328ae6e

Please sign in to comment.