Skip to content

Commit 6227921

Browse files
Alexander ReimannAlexander Reimann
authored andcommitted
Make elevation_mapping_cupy python module and add python setup
1 parent 71ef07b commit 6227921

File tree

15 files changed

+28
-15
lines changed

15 files changed

+28
-15
lines changed

elevation_mapping_cupy/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ target_link_libraries(elevation_mapping_ros ${PYTHON_LIBRARIES} ${catkin_LIBRARI
6363
add_executable(elevation_mapping_node src/elevation_mapping_node.cpp)
6464
target_link_libraries(elevation_mapping_node elevation_mapping_ros)
6565

66+
catkin_python_setup()
67+
6668
install(
6769
TARGETS elevation_mapping_ros elevation_mapping_node
6870
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}

elevation_mapping_cupy/script/elevation_mapping.py renamed to elevation_mapping_cupy/script/elevation_mapping_cupy/elevation_mapping.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
import threading
88
import subprocess
99

10-
from traversability_filter import get_filter_chainer, get_filter_torch
11-
from parameter import Parameter
12-
from custom_kernels import add_points_kernel
13-
from custom_kernels import error_counting_kernel
14-
from custom_kernels import average_map_kernel
15-
from custom_kernels import dilation_filter_kernel
16-
from custom_kernels import normal_filter_kernel
17-
from custom_kernels import polygon_mask_kernel
18-
from map_initializer import MapInitializer
19-
from plugins.plugin_manager import PluginManger
20-
21-
from traversability_polygon import (
10+
from .traversability_filter import get_filter_chainer, get_filter_torch
11+
from .parameter import Parameter
12+
from .custom_kernels import add_points_kernel
13+
from .custom_kernels import error_counting_kernel
14+
from .custom_kernels import average_map_kernel
15+
from .custom_kernels import dilation_filter_kernel
16+
from .custom_kernels import normal_filter_kernel
17+
from .custom_kernels import polygon_mask_kernel
18+
from .map_initializer import MapInitializer
19+
from .plugins.plugin_manager import PluginManger
20+
21+
from .traversability_polygon import (
2222
get_masked_traversability,
2323
is_traversable,
2424
calculate_area,

elevation_mapping_cupy/script/elevation_mapping_cupy/plugins/__init__.py

Whitespace-only changes.

elevation_mapping_cupy/script/plugins/plugin_manager.py renamed to elevation_mapping_cupy/script/elevation_mapping_cupy/plugins/plugin_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def init(self, plugin_params: List[PluginParams], extra_params: List[Dict]):
6767

6868
self.plugins = []
6969
for param, extra_param in zip(plugin_params, extra_params):
70-
m = importlib.import_module("." + param.name, package="plugins") # -> 'module'
70+
m = importlib.import_module("." + param.name, package="elevation_mapping_cupy.plugins") # -> 'module'
7171
for name, obj in inspect.getmembers(m):
7272
if inspect.isclass(obj) and issubclass(obj, PluginBase) and name != "PluginBase":
7373
# Add cell_n to params

0 commit comments

Comments
 (0)