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

OpenPCDet LiDar Object Detection Node #73

Open
wants to merge 78 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 64 commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
aa95f29
base node for openpcdet
danielrhuynh Jan 19, 2024
ff4a955
copied dockerfile for openpcdet
danielrhuynh Jan 19, 2024
4455065
working package in ros
danielrhuynh Jan 20, 2024
1af45db
ig we dont need these
danielrhuynh Jan 20, 2024
47b7163
added python package if I want to use that
danielrhuynh Jan 20, 2024
a42c5d6
adding ros node
danielrhuynh Jan 23, 2024
afddd09
made node and WIP on dockerfile
danielrhuynh Jan 25, 2024
9a072d9
builds with cuda and I can run the setup script :)
danielrhuynh Feb 2, 2024
00eec7b
Adding OpenCV
danielrhuynh Feb 4, 2024
3fad1f7
ROS node runs and makes a single inference on a .bin!
danielrhuynh Feb 5, 2024
cab5d52
Foxglove integration and bounding boxes
danielrhuynh Feb 6, 2024
9832d19
aligned lidar data with bounding boxes
danielrhuynh Feb 6, 2024
c0aa3e8
changing to work with wato fork of openpcdet
danielrhuynh Feb 9, 2024
424af34
base node for openpcdet
danielrhuynh Jan 19, 2024
46441ba
copied dockerfile for openpcdet
danielrhuynh Jan 19, 2024
e966132
working package in ros
danielrhuynh Jan 20, 2024
257407e
ig we dont need these
danielrhuynh Jan 20, 2024
f1c47c0
added python package if I want to use that
danielrhuynh Jan 20, 2024
db7c638
adding ros node
danielrhuynh Jan 23, 2024
cec4f6d
made node and WIP on dockerfile
danielrhuynh Jan 25, 2024
1a7eedf
builds with cuda and I can run the setup script :)
danielrhuynh Feb 2, 2024
0346da7
Adding OpenCV
danielrhuynh Feb 4, 2024
3164865
ROS node runs and makes a single inference on a .bin!
danielrhuynh Feb 5, 2024
6ac0f6d
Foxglove integration and bounding boxes
danielrhuynh Feb 6, 2024
58f0e19
aligned lidar data with bounding boxes
danielrhuynh Feb 6, 2024
2480fd4
changing to work with wato fork of openpcdet
danielrhuynh Feb 9, 2024
128cb63
Merge branch 'openpcdet-dan' of https://github.com/WATonomous/wato_mo…
danielrhuynh Feb 9, 2024
41e1296
updated
danielrhuynh Feb 9, 2024
3071625
we're changing this to copy for now since we want to clone OpenPCDet …
danielrhuynh Feb 9, 2024
9f177c6
renaming package
danielrhuynh Feb 13, 2024
6d08576
WIP
danielrhuynh Feb 13, 2024
41254e2
WIP integrating with watod
danielrhuynh Feb 13, 2024
95fd8cc
integrated with watod :)
danielrhuynh Feb 13, 2024
48c76f1
now runs on same frame
danielrhuynh Feb 13, 2024
2ab5305
working with ros bags
danielrhuynh Feb 14, 2024
0eb740c
removing dependancy on static .bin
danielrhuynh Feb 14, 2024
517fba2
refactoring
danielrhuynh Feb 14, 2024
97676f7
Update watod-config.sh
danielrhuynh Feb 14, 2024
95ec494
re-enabling other services
danielrhuynh Feb 14, 2024
4a0f73a
Working with wato ros bags
danielrhuynh Feb 17, 2024
17797ad
refactored
danielrhuynh Feb 17, 2024
bf996be
changing to kitti model and making data loader more flexible
danielrhuynh Feb 18, 2024
e208d6a
Merge branch 'main' into openpcdet-dan
danielrhuynh Feb 18, 2024
a5dcdfa
Update watod-config.sh
danielrhuynh Feb 18, 2024
775515f
Clean up dockerfile and fix missing config file
Gongsta Feb 21, 2024
b3b4948
Update config files and cleanup publisher
Gongsta Feb 23, 2024
257a53b
updates
danielrhuynh Feb 23, 2024
29aefff
Merge branch 'main' into openpcdet-dan
danielrhuynh Feb 23, 2024
3112963
experimenting
danielrhuynh Feb 23, 2024
ed1b548
Merge branch 'openpcdet-dan' of https://github.com/WATonomous/wato_mo…
danielrhuynh Feb 23, 2024
4b9b36f
Fix styling
Gongsta Feb 23, 2024
ec95c6f
Added thresholding
danielrhuynh Mar 12, 2024
1331dc2
WIP: added timestamps to (x,y,z,intensity) data to make them nuscenes…
danielrhuynh Mar 20, 2024
002f29b
updated data loader + mounted bevfusion pth
danielrhuynh Mar 20, 2024
0f7b407
better data loader :)
danielrhuynh Mar 22, 2024
b31e331
fixed bounding box orientation issues
dylanwang0 Mar 25, 2024
f15eb0f
implementing simple time syncer for messages
danielrhuynh Mar 25, 2024
fc8d18a
messing with confidence
danielrhuynh Mar 25, 2024
0efbca2
Merge branch 'main' into openpcdet-dan
danielrhuynh Mar 25, 2024
92723b6
fixing styling
danielrhuynh Apr 4, 2024
0fd32e0
fixing styling again
danielrhuynh Apr 4, 2024
d0c6005
styling
danielrhuynh Apr 4, 2024
06cb03a
removing old modules
danielrhuynh Apr 5, 2024
c643b43
skip CI for lidar
danielrhuynh May 27, 2024
6a28e25
PR comments
danielrhuynh Jun 11, 2024
08b6b05
Merge branch 'main' into openpcdet-dan
danielrhuynh Jun 11, 2024
8c9f195
setting bounding box to be optional in configs
danielrhuynh Jun 11, 2024
a0b046f
fixing pep8
danielrhuynh Jun 11, 2024
824b238
autopep8
danielrhuynh Jun 11, 2024
c4f3705
autopep8
danielrhuynh Jun 11, 2024
93edc19
autopep8
danielrhuynh Jun 11, 2024
a45626f
fixing docker staging issue
danielrhuynh Jun 13, 2024
43870bb
added label server
danielrhuynh Jun 28, 2024
2055cd3
Merge branch 'main' into openpcdet-dan
danielrhuynh Jun 28, 2024
34e0a21
linter
danielrhuynh Jun 28, 2024
210d3cb
Merge branch 'openpcdet-dan' of https://github.com/WATonomous/wato_mo…
danielrhuynh Jun 28, 2024
43628a4
linter
danielrhuynh Jun 28, 2024
d72d2dc
for linter
danielrhuynh Jun 28, 2024
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
1 change: 1 addition & 0 deletions .github/templates/docker_context/docker_context.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ while read -r module; do
# Temporarily skip perception services that have too large image size
if [[ "$service_out" == "lane_detection" ]] || \
[[ "$service_out" == "camera_object_detection" ]] || \
[[ "$service_out" == "lidar_object_detection" ]] || \
[[ "$service_out" == "semantic_segmentation" ]]; then
continue
fi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=ghcr.io/watonomous/wato_monorepo/base:humble-ubuntu22.04
ARG BASE_IMAGE=ghcr.io/watonomous/wato_monorepo/base:cuda11.7-humble-ubuntu22.04-devel

################################ Source ################################
FROM ${BASE_IMAGE} as source
Expand All @@ -7,20 +7,70 @@ WORKDIR ${AMENT_WS}/src

# Copy in source code
COPY src/perception/lidar_object_detection lidar_object_detection
COPY src/wato_msgs/sample_msgs sample_msgs

# Scan for rosdeps
RUN apt-get -qq update && rosdep update && \
rosdep install --from-paths . --ignore-src -r -s \
| grep 'apt-get install' \
| awk '{print $3}' \
| sort > /tmp/colcon_install_list
| grep 'apt-get install' \
| awk '{print $3}' \
| sort > /tmp/colcon_install_list


################################# Dependencies ################################
FROM ${BASE_IMAGE} as dependencies

RUN apt-get update && apt-get install -y \
git zip unzip libssl-dev libcairo2-dev lsb-release libgoogle-glog-dev libgflags-dev libatlas-base-dev libeigen3-dev software-properties-common \
build-essential cmake pkg-config libapr1-dev autoconf automake libtool curl libc6 libboost-all-dev debconf libomp5 libstdc++6 \
libqt5core5a libqt5xml5 libqt5gui5 libqt5widgets5 libqt5concurrent5 libqt5opengl5 libcap2 libusb-1.0-0 libatk-adaptor neovim \
python3-pip python3-setuptools \
&& apt-get -qq autoremove -y && apt-get -qq autoclean && apt-get -qq clean && \
rm -rf /var/lib/apt/lists/* /root/* /root/.ros /tmp/* /usr/share/doc

################################ INSTALL OpenCV with CUDA Support ##############
WORKDIR /opt
RUN git clone https://github.com/opencv/opencv.git && \
cd opencv && git checkout 4.5.5
danielrhuynh marked this conversation as resolved.
Show resolved Hide resolved
danielrhuynh marked this conversation as resolved.
Show resolved Hide resolved
RUN git clone https://github.com/opencv/opencv_contrib.git && \
cd opencv_contrib && git checkout 4.5.5
danielrhuynh marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR /opt/opencv/build
RUN cmake -D CMAKE_BUILD_TYPE=RELEASE \
-D CMAKE_INSTALL_PREFIX=/usr/local \
-D OPENCV_GENERATE_PKGCONFIG=ON \
-D BUILD_EXAMPLES=OFF \
-D INSTALL_PYTHON_EXAMPLES=OFF \
-D INSTALL_C_EXAMPLES=OFF \
-D PYTHON_EXECUTABLE=$(which python3) \
-D PYTHON3_INCLUDE_DIR=$(python3 -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \
-D PYTHON3_PACKAGES_PATH=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
-D BUILD_opencv_python3=ON \
-D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules/ \
-D WITH_GSTREAMER=ON \
-D WITH_CUDA=ON \
-D ENABLE_PRECOMPILED_HEADERS=OFF \
.. && make -j$(nproc) && make install && ldconfig
RUN rm -rf /opt/opencv /opt/opencv_contrib
# Set environment variables
ENV CUDA_HOME /usr/local/cuda
ENV LD_LIBRARY_PATH /usr/local/cuda/lib64:${LD_LIBRARY_PATH}
ENV PATH /usr/local/cuda/bin:${PATH}
ENV OpenCV_DIR=/usr/share/OpenCV
# Install Python dependencies
RUN pip3 install torch==1.13.1+cu116 torchvision==0.14.1+cu116 torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/cu116
RUN pip3 install torch-scatter -f https://data.pyg.org/whl/torch-1.13.1+cu116.html
ENV TORCH_CUDA_ARCH_LIST="3.5;5.0;6.0;6.1;7.0;7.5;8.0;8.6+PTX"
RUN pip3 install spconv-cu116 pyquaternion numpy==1.23 pillow==8.4 mayavi open3d av2
WORKDIR /home/bolty
RUN git clone https://github.com/WATonomous/OpenPCDet.git
RUN cd OpenPCDet && pip3 install -r requirements.txt
RUN pip3 install kornia==0.6.8
danielrhuynh marked this conversation as resolved.
Show resolved Hide resolved
RUN pip3 install nuscenes-devkit==1.0.5
WORKDIR /home/bolty/OpenPCDet/
RUN python3 setup.py develop

# Install Rosdep requirements
COPY --from=source /tmp/colcon_install_list /tmp/colcon_install_list
RUN apt-get update && apt-fast update
RUN apt-fast install -qq -y --no-install-recommends $(cat /tmp/colcon_install_list)

# Copy in source code from source stage
Expand All @@ -32,20 +82,20 @@ WORKDIR /
RUN apt-get -qq autoremove -y && apt-get -qq autoclean && apt-get -qq clean && \
rm -rf /root/* /root/.ros /tmp/* /var/lib/apt/lists/* /usr/share/doc/*

################################ Build ################################
################################ Source #######################################
FROM dependencies as build
danielrhuynh marked this conversation as resolved.
Show resolved Hide resolved

# Build ROS2 packages
WORKDIR ${AMENT_WS}
RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
colcon build \
--cmake-args -DCMAKE_BUILD_TYPE=Release
--cmake-args -DCMAKE_BUILD_TYPE=Release

# Entrypoint will run before any CMD on launch. Sources ~/opt/<ROS_DISTRO>/setup.bash and ~/ament_ws/install/setup.bash
COPY docker/wato_ros_entrypoint.sh ${AMENT_WS}/wato_ros_entrypoint.sh
ENTRYPOINT ["./wato_ros_entrypoint.sh"]

################################ Prod ################################
################################ Prod #########################################
FROM build as deploy

# Source Cleanup and Security Setup
Expand Down
21 changes: 18 additions & 3 deletions modules/docker-compose.perception.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,23 @@ services:
- "${PERCEPTION_LIDAR_OBJECT_DETECTION_IMAGE}:build_main"
target: deploy
image: "${PERCEPTION_LIDAR_OBJECT_DETECTION_IMAGE}:${TAG}"
command: /bin/bash -c "ros2 launch lidar_object_detection lidar_object_detection.launch.py"

command: /bin/bash -c "ros2 launch lidar_object_detection nuscenes_launch.py"
volumes:
- /mnt/wato-drive2/perception_models/transfusion_trained_model.pth:/home/bolty/OpenPCDet/models/transfusion_trained_model.pth
- /mnt/wato-drive2/perception_models/cbgs_transfusion_lidar.pth:/home/bolty/OpenPCDet/models/cbgs_transfusion_lidar.pth
- /mnt/wato-drive2/perception_models/pv_rcnn_8369.pth:/home/bolty/OpenPCDet/models/pv_rcnn_8369.pth
- /mnt/wato-drive2/perception_models/nuscenes_trained_voxelNext.pth:/home/bolty/OpenPCDet/models/nuscenes_trained_voxelNext.pth
# New Models to Try
- /mnt/wato-drive/perception/bevfusion_pretrain/bevfusion-det.pth:/home/bolty/OpenPCDet/models/bevfusion-det.pth
- /mnt/wato-drive/perception/bevfusion_pretrain/lidar-only-det.pth:/home/bolty/OpenPCDet/models/lidar-only-det.pth
- /mnt/wato-drive/perception/bevfusion_pretrain/lidar-only-seg.pth:/home/bolty/OpenPCDet/models/lidar-only-seg.pth
- /mnt/wato-drive/perception/bevfusion_pretrain/lidar-only-seg.pth:/home/bolty/OpenPCDet/models/swint-nuimages-pretrained.pth
- /mnt/wato-drive/perception/pcds/pvrcnn_ros_ckpt.pth:/home/bolty/OpenPCDet/models/pvrcnn_ros_ckpt.pth
- /mnt/wato-drive/perception/pcds/pvrcnn_base_ckpt.pth:/home/bolty/OpenPCDet/models/pvrcnn_base_ckpt.pth
# Data sets
- /mnt/wato-drive2/nuscenes-1.0-mini:/home/bolty/OpenPCDet/data/nuscenes/v1.0-mini
- /mnt/wato-drive2/wato-datasets/nuscenes/full-dataset:/home/bolty/OpenPCDet/data/nuscenes/v1.0-trainval
danielrhuynh marked this conversation as resolved.
Show resolved Hide resolved

semantic_segmentation:
build:
context: ..
Expand Down Expand Up @@ -88,4 +103,4 @@ services:
- "${PERCEPTION_DEPTH_ESTIMATION_IMAGE}:build_main"
target: deploy
image: "${PERCEPTION_DEPTH_ESTIMATION_IMAGE}:${TAG}"
command: /bin/bash -c "ros2 launch depth_estimation eve.launch.py"
command: /bin/bash -c "ros2 launch depth_estimation eve.launch.py"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong package

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for depth estimation?

14 changes: 0 additions & 14 deletions src/perception/lidar_object_detection/CMakeLists.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
lidar_object_detection_node:
ros__parameters:
lidar_topic: /velodyne_points
model_config_path: /home/bolty/OpenPCDet/tools/cfgs/nuscenes_models/transfusion_lidar.yaml
model_path: /home/bolty/OpenPCDet/models/transfusion_trained_model.pth
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
lidar_object_detection_node:
ros__parameters:
lidar_topic: /LIDAR_TOP
model_config_path: /home/bolty/OpenPCDet/tools/cfgs/nuscenes_models/transfusion_lidar.yaml
model_path: /home/bolty/OpenPCDet/models/cbgs_transfusion_lidar.pth
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
from launch import LaunchDescription
from launch_ros.actions import Node
from ament_index_python.packages import get_package_share_directory
import os


def generate_launch_description():
ld = LaunchDescription()
config = os.path.join(
get_package_share_directory('lidar_object_detection'),
'config',
'eve_config.yaml'
)

# nodes
lidar_object_detection = Node(
package='lidar_object_detection',
executable='lidar_object_detection_node',
name='lidar_object_detection_node',
parameters=[config],
arguments=['--ros-args', '--log-level', 'info']
)

# finalize
ld.add_action(lidar_object_detection)

return ld
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
from launch import LaunchDescription
from launch_ros.actions import Node
from ament_index_python.packages import get_package_share_directory
import os


def generate_launch_description():
ld = LaunchDescription()
config = os.path.join(
get_package_share_directory('lidar_object_detection'),
'config',
'nuscenes_config.yaml'
)

# nodes
lidar_object_detection = Node(
package='lidar_object_detection',
executable='lidar_object_detection_node',
name='lidar_object_detection_node',
parameters=[config],
arguments=['--ros-args', '--log-level', 'info']
)

# finalize
ld.add_action(lidar_object_detection)

return ld
Loading
Loading