Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GPU support on Melodic #2173

Merged
merged 38 commits into from
Apr 27, 2019
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c53a081
[Release] 1.9.1 (#1691)
kfunaoka Nov 7, 2018
b3e0aec
Feature/edit typo (#1769)
harderthan Jan 16, 2019
9fae6cc
[Release] 1.10.0 (#1898)
kfunaoka Jan 23, 2019
2b8fb78
Update README.md
amc-nu Feb 3, 2019
34ff6a6
Update contact details
gbiggs Feb 27, 2019
b98cf4b
Feature/update autoware launcher (#2056)
isamu-takagi Mar 15, 2019
166c826
Merge pull request #2039 from gbiggs/master
gbiggs Mar 18, 2019
f781965
Update CHANGELOGs
kfunaoka Mar 21, 2019
f4c35b9
Replace URI in CHANGELOGs
kfunaoka Mar 21, 2019
8877ebd
Set version 1.10.0
kfunaoka Mar 21, 2019
f7d2eb9
Creanup rst format
kfunaoka Mar 21, 2019
a4b6f37
1.11.0
kfunaoka Mar 21, 2019
37b9feb
Change RTM default topic to match UKF node launch file (#2142)
amc-nu Mar 22, 2019
21e268d
[Release] 1.11.0 (#2140)
kfunaoka Mar 23, 2019
ec63273
Remove old issue and PR templates (#2148)
gbiggs Mar 25, 2019
276073b
Update repository info files (#2149)
gbiggs Mar 25, 2019
6a7d1b9
Merge left over features from around the 1.11 release (#2151)
Mar 26, 2019
e95966c
Add CMake, CUDA, Eigen version checks for the CUDA accelerated nodes
amc-nu Mar 29, 2019
ae89730
Remove deprecated vision_detector DPM
amc-nu Mar 30, 2019
eabc8fe
Switch CI to use colcon insead of catkin tools
amc-nu Mar 31, 2019
b669442
Fix travis ci syntax file
amc-nu Mar 31, 2019
46935fc
switch from colcon to catkin tools on kinetic(not supported on indust…
amc-nu Mar 31, 2019
91e13e8
CUDA CMake checks for lidar_localizer
amc-nu Mar 31, 2019
e60688c
CUDA CMake checks for lidar_apollo_cnn_seg_detect
amc-nu Mar 31, 2019
d691fab
CUDA CMake checks for vision_segment_enet_detect
amc-nu Mar 31, 2019
fb0edb6
CUDA CMake checks for vision_ssd_detect
amc-nu Mar 31, 2019
829eda3
CUDA CMake checks for lidar_point_pillars
amc-nu Mar 31, 2019
d5b2ed9
Add .repos file for setting up an Autoware workspace using vcs (#2161)
Apr 1, 2019
5d1b262
Remove non-required Eigen check on lidar_apollo_cnn_seg_detect package
amc-nu Apr 2, 2019
58f04b8
Add Driveworks check on ARM64/CUDA devices for autoware_driveworks_gm…
amc-nu Apr 2, 2019
d1e8ccf
Add Driveworks check on ARM64/CUDA devices for autoware_driveworks_in…
amc-nu Apr 2, 2019
9f7bf97
Remove enablePlannerDynamicSwitch (#1919)
kfunaoka Apr 15, 2019
bb4fcd0
Updated paths in quick_start launch files and parameters in default.r…
sgermanserrano Apr 16, 2019
7998aa7
Fix bug that limits the data rate of DataRateCheckerPlugin (#2205)
drwnz Apr 23, 2019
3888daa
Adding install directive for node (#2195)
snehagn Apr 26, 2019
8b6665c
Remove unnecesary gstreamer1.0-plugins-good dependency from pointgrey…
amc-nu Apr 26, 2019
e7c12b0
fix install directive for waypoint extractor (#2219)
wep21 Apr 26, 2019
306e8e4
Merge branch 'master' into feature/melodic_gpu
amc-nu Apr 27, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
language: generic
services:
- docker
cache:
directories:
- $HOME/.ccache
env:
global:
- CCACHE_DIR=$HOME/.ccache

env:
matrix:
- ROS_DISTRO="kinetic" _GUARD_INTERVAL=10 CATKIN_PARALLEL_JOBS='-p2' ROS_PARALLEL_JOBS='-j2' NOT_TEST_BUILD='true' NOT_TEST_INSTALL='true'
- ROS_DISTRO="melodic" _GUARD_INTERVAL=10 CATKIN_PARALLEL_JOBS='-p2' ROS_PARALLEL_JOBS='-j2' NOT_TEST_BUILD='true' NOT_TEST_INSTALL='true'
matrix:
allow_failures:
- env: ROS_DISTRO="melodic" _GUARD_INTERVAL=10 CATKIN_PARALLEL_JOBS='-p2' ROS_PARALLEL_JOBS='-j2' NOT_TEST_BUILD='true' NOT_TEST_INSTALL='true'
- ROS_DISTRO="kinetic" _GUARD_INTERVAL=10 CATKIN_PARALLEL_JOBS='-p2' ROS_PARALLEL_JOBS='-j2' NOT_TEST_BUILD='true' NOT_TEST_INSTALL='true' DOCKER_BASE_IMAGE=nvidia/cuda:9.0-cudnn7-devel-ubuntu16.04
- ROS_DISTRO="melodic" _GUARD_INTERVAL=10 CATKIN_PARALLEL_JOBS='-p2' ROS_PARALLEL_JOBS='-j2' NOT_TEST_BUILD='true' NOT_TEST_INSTALL='true' BUILDER=colcon
- ROS_DISTRO="melodic" _GUARD_INTERVAL=10 CATKIN_PARALLEL_JOBS='-p2' ROS_PARALLEL_JOBS='-j2' NOT_TEST_BUILD='true' NOT_TEST_INSTALL='true' DOCKER_BASE_IMAGE=nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04 BUILDER=colcon

install:
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .industrial_ci
- git clone --branch colcon --quiet --depth 1 https://github.com/ipa-mdl/industrial_ci.git .industrial_ci
script:
- .industrial_ci/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,25 @@ catkin_package(
autoware_msgs
)

IF (CUDA_FOUND)
###CAFFE
set(CAFFE_PATH "$ENV{HOME}/caffe/distribute")

####### Melodic Checks
SET (CPU_ONLY FALSE)
if (CUDA_FOUND AND "$ENV{ROS_DISTRO}" STREQUAL "melodic" )
if(${CMAKE_VERSION} VERSION_LESS "3.12.3")
message("GPU support on Melodic requires CMake version>= 3.12.3")
SET (CPU_ONLY TRUE)
endif()
endif()
####### End Melodic Checks

if (NOT CPU_ONLY AND ${CUDA_FOUND} AND EXISTS "${CAFFE_PATH}")
include_directories(${CUDA_INCLUDE_DIRS})

IF ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^arm")
link_directories(/usr/lib/arm-linux-gnueabihf/tegra)
endif ()
ENDIF ()
###CAFFE
set(CAFFE_PATH "$ENV{HOME}/caffe/distribute")

if (EXISTS "${CAFFE_PATH}")

include_directories(
include
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,22 @@ add_executable(lidar_euclidean_cluster_detect
nodes/lidar_euclidean_cluster_detect/cluster.cpp)

find_package(CUDA)
if (${CUDA_FOUND})
find_package(Eigen3 QUIET)
####### Melodic Checks
SET (CPU_ONLY FALSE)
if (CUDA_FOUND AND "$ENV{ROS_DISTRO}" STREQUAL "melodic" )
if(${CMAKE_VERSION} VERSION_LESS "3.12.3")
message("GPU support on Melodic requires CMake version>= 3.12.3")
SET (CPU_ONLY TRUE)
else()
if (${EIGEN3_VERSION_STRING} VERSION_LESS "3.3.5")
message("GPU support on Melodic requires Eigen version>= 3.3.5")
SET (CPU_ONLY TRUE)
endif()
endif()
endif()
####### End Melodic Checks
if (NOT CPU_ONLY AND ${CUDA_FOUND})
INCLUDE(FindCUDA)
message("-- USING ACCELERATED CLUSTERING --")
message("Version: " ${CUDA_VERSION})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,24 @@ project(lidar_point_pillars)
# set flags for CUDA availability
option(CUDA_AVAIL "CUDA available" OFF)
find_package(CUDA)
if (CUDA_FOUND)

####### Melodic Checks
SET (CPU_ONLY FALSE)
if (NOT CPU_ONLY AND CUDA_FOUND AND "$ENV{ROS_DISTRO}" STREQUAL "melodic" )
if(${CMAKE_VERSION} VERSION_LESS "3.12.3")
message("GPU support on Melodic requires CMake version>= 3.12.3")
SET (CPU_ONLY TRUE)
endif()
endif()
####### End Melodic Checks

if (NOT CPU_ONLY AND CUDA_FOUND)
message("CUDA is available!")
message("CUDA Libs: ${CUDA_LIBRARIES}")
message("CUDA Headers: ${CUDA_INCLUDE_DIRS}")
set(CUDA_AVAIL ON)
else()
message("CUDA NOT FOUND")
message("CUDA NOT FOUND OR INCOMPATIBLE CMAKE VERSION FOUND")
set(CUDA_AVAIL OFF)
endif (CUDA_FOUND)

Expand Down

This file was deleted.

Loading