Skip to content

Commit 3aef1ed

Browse files
committed
chore: remove unused plane segmentation and sensors
1 parent 948166a commit 3aef1ed

File tree

139 files changed

+13
-8566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+13
-8566
lines changed

README.md

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ Inside docker container.
105105
```zsh
106106
cd $HOME/catkin_ws
107107
catkin build elevation_mapping_cupy
108-
catkin build convex_plane_decomposition_ros # If you want to use plane segmentation
109-
catkin build semantic_sensor # If you want to use semantic sensors
108+
109+
> [!NOTE]
110+
> The ``plane_segmentation`` and ``sensor_processing`` stacks were removed from this workspace because they are not maintained on ROS 2. Use an older commit if you still need them.
110111
```
111112
112113
### Run turtlebot example
@@ -118,28 +119,6 @@ export TURTLEBOT3_MODEL=waffle
118119
roslaunch elevation_mapping_cupy turtlesim_simple_example.launch
119120
```
120121
121-
For fusing semantics into the map such as rgb from a multi modal pointcloud:
122-
123-
```bash
124-
export TURTLEBOT3_MODEL=waffle
125-
roslaunch elevation_mapping_cupy turtlesim_semantic_pointcloud_example.launch
126-
```
127-
128-
For fusing semantics into the map such as rgb semantics or features from an image:
129-
130-
```bash
131-
export TURTLEBOT3_MODEL=waffle
132-
roslaunch elevation_mapping_cupy turtlesim_semantic_image_example.launch
133-
```
134-
135-
For plane segmentation:
136-
137-
```bash
138-
catkin build convex_plane_decomposition_ros
139-
export TURTLEBOT3_MODEL=waffle
140-
roslaunch elevation_mapping_cupy turtlesim_plane_decomposition_example.launch
141-
```
142-
143122
To control the robot with a keyboard, a new terminal window needs to be opened.
144123
Then run
145124

TODO.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
- [x] Compile "elevation_mapping_msgs" with ROS2
22
- [x] Compile "elevation_mapping_cupy" with ROS2
3-
- [x] Compile "semantic_sensor" with ROS2
4-
- [x] Compile "convex_plane_decomposition_msgs" with ROS2
5-
- [ ] Compile "convex_plane_decomposition" with ROS2
6-
- [x] Compile "grid_map_filters_rsl" with ROS2
7-
- [x] Compile "cgal5_ament" with ROS2
83

94
- [x] Run "elevation_mapping_cupy" with ROS2
10-
- [ ] Run "semantic_sensor" with ROS2
11-
- [ ] Run "convex_plane_decomposition" with ROS2

docker/build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,3 @@ colcon build \
1717
"-DBUILD_TESTING=OFF"\
1818
"-DCMAKE_CXX_FLAGS="-Wl,--allow-shlib-undefined""\
1919
-Wall -Wextra -Wpedantic -Wshadow \
20-
--packages-skip \
21-
convex_plane_decomposition \
22-
convex_plane_decomposition_ros

docs/source/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import os, sys
1010

1111
sys.path.append(os.path.join(os.path.dirname(__file__), '../../elevation_mapping_cupy/script'))
12-
sys.path.append(os.path.join(os.path.dirname(__file__), '../../sensor_processing/semantic_sensor/script'))
1312

1413
autodoc_mock_imports = [
1514
"cupy",

docs/source/documentation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Index
2020
2121

2222
This is a ROS package for elevation mapping on GPU. The elevation mapping code is written in python and uses cupy for GPU computation. The
23-
plane segmentation is done independently and runs on CPU. When the plane segmentation is generated, local convex approximations of the
24-
terrain can be efficiently generated.
23+
legacy plane segmentation pipeline ran independently on the CPU to provide convex terrain approximations, but it has been removed from the
24+
current ROS 2 workspace until it is validated again.
2525

2626
.. image:: ../media/main_repo.png
2727
:alt: Elevation map examples

docs/source/getting_started/installation.rst

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -257,32 +257,6 @@ have the third-party libaries installed on you machine:
257257
258258
Semantic Sensors
259259
==================================================================
260-
Elevation mapping node can receive multi-modal point cloud and image topics.
261-
In this example, we use semantic segmentation models to process color images and publish those topics.
262-
263-
Python dependencies
264-
-------------------------------------------------------------------
265-
266-
.. code-block:: bash
267-
268-
pip3 install scikit-learn
269-
270-
Torchvision (for Jetson Orin on Ubuntu 20.04)
271-
272-
.. code-block:: bash
273-
274-
git clone --branch release/0.15 https://github.com/pytorch/vision torchvision
275-
cd torchvision/
276-
export BUILD_VERSION=0.15.1
277-
python3 setup.py install --user
278-
279-
Detectron
280-
281-
.. code-block:: bash
282-
283-
python3 -m pip install 'git+https://github.com/facebookresearch/detectron2.git'
284-
285-
286260
Build
287261
==================================================================
288262
After installing all the dependencies, you can build the packages.
@@ -293,5 +267,6 @@ Then, build the packages with catkin.
293267
294268
cd <your_catkin_ws>
295269
catkin build elevation_mapping_cupy # The core package
296-
catkin build convex_plane_decomposition_ros # If you want to use plane segmentation
297-
catkin build semantic_sensor # If you want to use semantic sensors
270+
271+
.. note::
272+
The legacy ``plane_segmentation`` and ``sensor_processing`` stacks have been removed from this workspace because they were untested on ROS 2. Use an earlier revision if you rely on those packages.

docs/source/getting_started/introduction.rst

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Key Features
3535

3636
* **Learning-based Traversability Filter**: Assesses terrain traversability using local geometry, improving path planning and navigation.
3737

38-
* **Versatile Locomotion Tools**: Incorporates smoothing filters and plane segmentation, optimizing movement across various terrains.
38+
* **Versatile Locomotion Tools**: Incorporates smoothing filters and, in legacy setups, plane segmentation to optimize movement across various terrains.
3939

4040
* **Multi-Modal Elevation Map (MEM) Framework**: Allows seamless integration of diverse data like geometry, semantics, and RGB information, enhancing multi-modal robotic perception.
4141

@@ -78,8 +78,6 @@ Example setup is in **elevation_mapping_cupy/config/core/example_setup.yaml**.
7878

7979
The transformation tree.
8080

81-
* The plane segmentation node subscribes to an elevation map topic ([grid_map_msg/GridMap]). This can be configured in
82-
**convex_plane_decomposition_ros/config/core/parameters.yaml**
8381

8482
Published Topics
8583
-------------------------------------------------------------------
@@ -110,23 +108,3 @@ Example setting in `config/parameters.yaml`.
110108
* **elevation_map_filter** ([grid_map_msg/GridMap])
111109

112110
The filtered maps using plugins.
113-
114-
The plane segmentation node publishes the following:
115-
116-
* **planar_terrain** ([convex_plane_decomposition_msgs/PlanarTerrain])
117-
118-
A custom message that contains the full segmentation as a map together with the boundary information.
119-
120-
* **filtered_map** ([grid_map_msg/GridMap])
121-
122-
A grid map message to visualize the segmentation and some intermediate results. This information is also part of **planar_terrain**.
123-
124-
* **boundaries** ([visualization_msgs/MarkerArray])
125-
126-
A set of polygons that trace the boundaries of the segmented region. Holes and boundaries of a single region are published as separate
127-
markers with the same color.
128-
129-
* **insets** ([visualization_msgs/PolygonArray])
130-
131-
A set of polygons that are at a slight inward offset from **boundaries**. There might be more insets than boundaries since the inward
132-
shift can cause a single region to break down into multiple when narrow passages exist.

docs/source/getting_started/tutorial.rst

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
Tutorial
44
******************************************************************
5-
This tutorial will guide you through the basic usage of the elevation mapping cupy.
6-
You will learn how to run the plane segmentation node, the sensor node, and the TurtleBot example.
5+
This tutorial will guide you through the basic usage of elevation_mapping_cupy.
6+
You will learn how to run the core node and the TurtleBot example.
77

88
If you want to use your own custom plugins, please refer to the :ref:`plugins`.
99

@@ -18,20 +18,6 @@ Basic usage.
1818
roslaunch elevation_mapping_cupy elevation_mapping_cupy.launch
1919
2020
21-
For the plane segmentation node
22-
23-
.. code-block:: bash
24-
25-
roslaunch convex_plane_decomposition_ros convex_plane_decomposition.launch
26-
27-
For the sensor node
28-
29-
.. code-block:: bash
30-
31-
roslaunch semantic_sensor semantic_pointcloud.launch
32-
roslaunch semantic_sensor semantic_image.launch
33-
34-
3521
Run TurtleBot example
3622
==================================================================
3723

@@ -55,27 +41,6 @@ For fusing semantics into the map such as rgb from a multi modal pointcloud:
5541
.. image:: ../../media/turtlebot.png
5642
:alt: Elevation map examples
5743

58-
.. code-block:: bash
59-
60-
export TURTLEBOT3_MODEL=waffle
61-
roslaunch elevation_mapping_cupy turtlesim_semantic_pointcloud_example.launch
62-
63-
For fusing semantics into the map such as rgb semantics or features from an image:
64-
65-
.. code-block:: bash
66-
67-
export TURTLEBOT3_MODEL=waffle
68-
roslaunch elevation_mapping_cupy turtlesim_semantic_image_example.launch
69-
70-
Or, for the version including plane segmentation:
71-
72-
.. code-block:: bash
73-
74-
catkin build convex_plane_decomposition_ros
75-
export TURTLEBOT3_MODEL=waffle
76-
roslaunch elevation_mapping_cupy turtlesim_plane_decomposition_example.launch
77-
78-
7944
To control the robot with a keyboard, a new terminal window needs to be opened.
8045
Then run
8146

@@ -87,6 +52,8 @@ Then run
8752
8853
Velocity inputs can be sent to the robot by pressing the keys `a`, `w`, `d`, `x`. To stop the robot completely, press `s`.
8954

55+
.. note::
56+
The previous semantic sensor and plane segmentation demos were removed from this workspace because they have not been validated on ROS 2. Use a historical revision if you still need them.
9057

9158

9259

@@ -124,4 +91,3 @@ Build with option.
12491
catkin build elevation_mapping_cupy -DPYTHON_EXECUTABLE=$(which python3)
12592
12693
127-

docs/source/index.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
Plugins <usage/plugins>
2323
Parameters <usage/parameters>
24-
Plane Segmentation <usage/plane_segmentation>
2524
Semantics <usage/semantics>
2625

2726

@@ -36,4 +35,3 @@
3635

3736

3837

39-

docs/source/python/index.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ Python software
33

44
.. toctree::
55
elevation_mapping
6-
semantic_sensor
7-
86

0 commit comments

Comments
 (0)