-
Notifications
You must be signed in to change notification settings - Fork 327
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Various smaller fixes for ROS Kinetic
- Updated Dockerfiles, fix Rviz crash by adding dedicated GPU docker image, remove indigo as distro is outdated - Fix build warnings in laser_features and rwth_ground_plane - Use find_package(Eigen3) instead of find_package(Eigen) - Reduce logging level at nodelet startup to remove logging clutter - Bugfix for #78, blocked aggregator nodelets due to detector stall. Fix by monitoring if any message are actually received on detections topic, before advertising publisher. - Add missing install targets for spencer_leg_detector_wrapper (fix for #64) - Configurable odom and base footprint frame IDs (fixes #53) - Updated README
- Loading branch information
Showing
33 changed files
with
247 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
# GPU support (only works if nvidia-container-toolkit is installed on the docker host)! | ||
FROM nvidia/cudagl:10.1-runtime-ubuntu16.04 | ||
RUN apt-get update && apt-get install -y lsb-release && rm -rf /var/lib/apt/lists/* | ||
ENV NVIDIA_VISIBLE_DEVICES ${NVIDIA_VISIBLE_DEVICES:-all} | ||
ENV NVIDIA_DRIVER_CAPABILITIES ${NVIDIA_DRIVER_CAPABILITIES:+$NVIDIA_DRIVER_CAPABILITIES,}graphics | ||
|
||
# Following block originates from https://github.com/osrf/docker_images/blob/master/ros/kinetic/ubuntu/xenial/ros-core/Dockerfile | ||
# and http://wiki.ros.org/kinetic/Installation/Ubuntu | ||
# Copyright 2020 Open Source Robotics Foundation (CC-BY 3.0 license) | ||
RUN echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list | ||
RUN apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 | ||
RUN apt-get update && apt-get install -y --no-install-recommends ros-kinetic-perception && rm -rf /var/lib/apt/lists/* | ||
ENV LANG C.UTF-8 | ||
ENV LC_ALL C.UTF-8 | ||
ENV ROS_DISTRO kinetic | ||
|
||
# Install build tools | ||
RUN apt-get update && apt-get install -y \ | ||
python-catkin-tools tmux vim \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
|
||
# Setup workspace | ||
ENV CATKIN_WS=/root/catkin_ws | ||
RUN mkdir -p $CATKIN_WS/src | ||
WORKDIR $CATKIN_WS/src | ||
|
||
# Acquire source | ||
#RUN git clone https://github.com/spencer-project/spencer_people_tracking.git | ||
COPY . spencer_people_tracking/ | ||
|
||
# Install dependencies | ||
RUN apt-get update && \ | ||
apt-get install -y \ | ||
wget && \ | ||
rosdep init && \ | ||
rosdep update && \ | ||
rosdep install -y -r --from-paths . --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \ | ||
rm -rf /var/lib/apt/lists/* | ||
|
||
# Build repo | ||
WORKDIR $CATKIN_WS | ||
ENV TERM xterm | ||
ENV PYTHONIOENCODING UTF-8 | ||
RUN catkin config --extend /opt/ros/$ROS_DISTRO && \ | ||
catkin build -c -s | ||
|
||
# Initialize bashrc | ||
RUN echo "source ~/catkin_ws/devel/setup.bash" >> /root/.bashrc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
#!/bin/bash | ||
|
||
# Command-line arguments: | ||
# $1 - name of docker image variant (e.g. indigo, kinetic, kinetic-gpu, noetic) | ||
|
||
# Following lines are based upon code from the ROS wiki | ||
# See http://wiki.ros.org/docker/Tutorials/Hardware%20Acceleration#nvidia-docker2 | ||
# Copyright 2020 Open Source Robotics Foundation (CC-BY 3.0 license) | ||
XAUTH=/tmp/.docker.xauth | ||
if [ ! -f $XAUTH ] | ||
then | ||
xauth_list=$(xauth nlist :0 | sed -e 's/^..../ffff/') | ||
if [ ! -z "$xauth_list" ] | ||
then | ||
echo $xauth_list | xauth -f $XAUTH nmerge - | ||
else | ||
touch $XAUTH | ||
fi | ||
chmod a+r $XAUTH | ||
fi | ||
|
||
docker run -it \ | ||
--env="DISPLAY=$DISPLAY" \ | ||
--env="QT_X11_NO_MITSHM=1" \ | ||
--volume="/tmp/.X11-unix:/tmp/.X11-unix:rw" \ | ||
--env="XAUTHORITY=$XAUTH" \ | ||
--volume="$XAUTH:$XAUTH" \ | ||
--runtime=nvidia \ | ||
spencer/spencer_people_tracking:$1 \ | ||
tmux |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
.../spencer_detected_person_association/launch/detection_to_detection_fusion_pipeline.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.