Skip to content

Commit 7c8a2ba

Browse files
committed
fixed for later version of cupy
1 parent e8ccff4 commit 7c8a2ba

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

elevation_mapping_cupy/elevation_mapping_cupy/elevation_mapping.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ def __init__(self, param: Parameter):
100100

101101
self.semantic_map.initialize_fusion()
102102

103-
weight_file = subprocess.getoutput('echo "' + param.weight_file + '"')
104-
param.load_weights(weight_file)
103+
param.load_weights(param.weight_file)
105104

106105
if param.use_chainer:
107106
self.traversability_filter = get_filter_chainer(param.w1, param.w2, param.w3, param.w_out)
@@ -111,8 +110,7 @@ def __init__(self, param: Parameter):
111110

112111
# Plugins
113112
self.plugin_manager = PluginManager(cell_n=self.cell_n)
114-
plugin_config_file = subprocess.getoutput('echo "' + param.plugin_config_file + '"')
115-
self.plugin_manager.load_plugin_settings(plugin_config_file)
113+
self.plugin_manager.load_plugin_settings(param.plugin_config_file)
116114

117115
self.map_initializer = MapInitializer(self.initial_variance, param.initialized_variance, xp=cp, method="points")
118116

elevation_mapping_cupy/elevation_mapping_cupy/semantic_map.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def __init__(self, param: Parameter):
4141
self.new_map = xp.zeros((self.amount_layer_names, self.param.cell_n, self.param.cell_n), param.data_type,)
4242
# which layers should be reset to zero at each update, per default everyone,
4343
# if a layer should not be reset, it is defined in compile_kernels function
44-
self.delete_new_layers = cp.ones(self.new_map.shape[0], cp.bool8)
44+
self.delete_new_layers = cp.ones(self.new_map.shape[0], cp.bool_)
4545
self.fusion_manager = FusionManager(self.param)
4646

4747
def clear(self):
@@ -94,7 +94,7 @@ def add_layer(self, name):
9494
self.new_map = cp.append(
9595
self.new_map, cp.zeros((1, self.param.cell_n, self.param.cell_n), dtype=self.param.data_type), axis=0,
9696
)
97-
self.delete_new_layers = cp.append(self.delete_new_layers, cp.array([1], dtype=cp.bool8))
97+
self.delete_new_layers = cp.append(self.delete_new_layers, cp.array([1], dtype=cp.bool_))
9898

9999
def pad_value(self, x, shift_value, idx=None, value=0.0):
100100
"""Create a padding of the map along x,y-axis according to amount that has shifted.

0 commit comments

Comments
 (0)