Safran/KPConv-PyTorch
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Initial commit

Browse source
This commit is contained in:
HuguesTHOMAS 2020-04-11 11:18:18 -04:00
parent 4b4c7b9f1c
commit a82cafafbc
5 changed files with 175 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
datasets/S3DIS.py
View file

@ -242,6 +242,8 @@ class S3DISDataset(PointCloudDataset):
def potential_item(self, batch_i, debug_workers=False): def potential_item(self, batch_i, debug_workers=False):
t = [time.time()]
# Initiate concatanation lists # Initiate concatanation lists
p_list = [] p_list = []
f_list = [] f_list = []
@ -254,10 +256,15 @@ class S3DISDataset(PointCloudDataset):
batch_n = 0 batch_n = 0
info = get_worker_info() info = get_worker_info()
if info is not None:
wid = info.id wid = info.id
else:
wid = None
while True: while True:
t += [time.time()]
if debug_workers: if debug_workers:
message = '' message = ''
for wi in range(info.num_workers): for wi in range(info.num_workers):
@ -319,13 +326,18 @@ class S3DISDataset(PointCloudDataset):
self.min_potentials[[cloud_ind]] = self.potentials[cloud_ind][min_ind] self.min_potentials[[cloud_ind]] = self.potentials[cloud_ind][min_ind]
self.argmin_potentials[[cloud_ind]] = min_ind self.argmin_potentials[[cloud_ind]] = min_ind
t += [time.time()]
# Get points from tree structure # Get points from tree structure
points = np.array(self.input_trees[cloud_ind].data, copy=False) points = np.array(self.input_trees[cloud_ind].data, copy=False)
# Indices of points in input region # Indices of points in input region
input_inds = self.input_trees[cloud_ind].query_radius(center_point, input_inds = self.input_trees[cloud_ind].query_radius(center_point,
r=self.config.in_radius)[0] r=self.config.in_radius)[0]
t += [time.time()]
# Number collected # Number collected
n = input_inds.shape[0] n = input_inds.shape[0]
@ -338,6 +350,8 @@ class S3DISDataset(PointCloudDataset):
input_labels = self.input_labels[cloud_ind][input_inds] input_labels = self.input_labels[cloud_ind][input_inds]
input_labels = np.array([self.label_to_idx[l] for l in input_labels]) input_labels = np.array([self.label_to_idx[l] for l in input_labels])
t += [time.time()]
# Data augmentation # Data augmentation
input_points, scale, R = self.augmentation_transform(input_points) input_points, scale, R = self.augmentation_transform(input_points)
@ -348,6 +362,8 @@ class S3DISDataset(PointCloudDataset):
# Get original height as additional feature # Get original height as additional feature
input_features = np.hstack((input_colors, input_points[:, 2:] + center_point[:, 2:])).astype(np.float32) input_features = np.hstack((input_colors, input_points[:, 2:] + center_point[:, 2:])).astype(np.float32)
t += [time.time()]
# Stack batch # Stack batch
p_list += [input_points] p_list += [input_points]
f_list += [input_features] f_list += [input_features]
@ -402,12 +418,16 @@ class S3DISDataset(PointCloudDataset):
# Points, neighbors, pooling indices for each layers # Points, neighbors, pooling indices for each layers
# #
t += [time.time()]
# Get the whole input list # Get the whole input list
input_list = self.segmentation_inputs(stacked_points, input_list = self.segmentation_inputs(stacked_points,
stacked_features, stacked_features,
labels, labels,
stack_lengths) stack_lengths)
t += [time.time()]
# Add scale and rotation for testing # Add scale and rotation for testing
input_list += [scales, rots, cloud_inds, point_inds, input_inds] input_list += [scales, rots, cloud_inds, point_inds, input_inds]
@ -425,6 +445,52 @@ class S3DISDataset(PointCloudDataset):
print(message) print(message)
self.worker_waiting[wid] = 2 self.worker_waiting[wid] = 2
t += [time.time()]
# Display timings
debugT = False
if debugT:
print('\n************************\n')
print('Timings:')
ti = 0
N = 5
mess = 'Init ...... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Pots ...... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Sphere .... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Collect ... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Augment ... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += N * (len(stack_lengths) - 1) + 1
print('concat .... {:5.1f}ms'.format(1000 * (t[ti+1] - t[ti])))
ti += 1
print('input ..... {:5.1f}ms'.format(1000 * (t[ti+1] - t[ti])))
ti += 1
print('stack ..... {:5.1f}ms'.format(1000 * (t[ti+1] - t[ti])))
ti += 1
print('\n************************\n')
return input_list return input_list
def random_item(self, batch_i): def random_item(self, batch_i):

134
datasets/SemanticKitti.py
View file

@ -204,7 +204,7 @@ class SemanticKittiDataset(PointCloudDataset):
different list of indices. different list of indices.
""" """
t0 = time.time() t = [time.time()]
# Initiate concatanation lists # Initiate concatanation lists
p_list = [] p_list = []
@ -221,6 +221,8 @@ class SemanticKittiDataset(PointCloudDataset):
while True: while True:
t += [time.time()]
with self.worker_lock: with self.worker_lock:
# Get potential minimum # Get potential minimum
@ -232,7 +234,7 @@ class SemanticKittiDataset(PointCloudDataset):
s_ind, f_ind = self.all_inds[ind] s_ind, f_ind = self.all_inds[ind]
t1 = time.time() t += [time.time()]
######################### #########################
# Merge n_frames together # Merge n_frames together
@ -255,15 +257,18 @@ class SemanticKittiDataset(PointCloudDataset):
o_pts = None o_pts = None
o_labels = None o_labels = None
t2 = time.time() t += [time.time()]
num_merged = 0 num_merged = 0
f_inc = 0 f_inc = 0
while num_merged < self.config.n_frames and f_ind - f_inc >= 0: while num_merged < self.config.n_frames and f_ind - f_inc >= 0:
# Current frame pose
pose = self.poses[s_ind][f_ind - f_inc]
# Select frame only if center has moved far away (more than X meter). Negative value to ignore # Select frame only if center has moved far away (more than X meter). Negative value to ignore
X = -1.0 X = -1.0
pose = self.poses[s_ind][f_ind - f_inc] if X > 0:
diff = p_origin.dot(pose.T)[:, :3] - p_origin.dot(pose0.T)[:, :3] diff = p_origin.dot(pose.T)[:, :3] - p_origin.dot(pose0.T)[:, :3]
if num_merged > 0 and np.linalg.norm(diff) < num_merged * X: if num_merged > 0 and np.linalg.norm(diff) < num_merged * X:
f_inc += 1 f_inc += 1
@ -290,10 +295,11 @@ class SemanticKittiDataset(PointCloudDataset):
sem_labels = frame_labels & 0xFFFF # semantic label in lower half sem_labels = frame_labels & 0xFFFF # semantic label in lower half
sem_labels = self.learning_map[sem_labels] sem_labels = self.learning_map[sem_labels]
# Apply pose # Apply pose (without np.dot to avoid multi-threading)
hpoints = np.hstack((points[:, :3], np.ones_like(points[:, :1]))) hpoints = np.hstack((points[:, :3], np.ones_like(points[:, :1])))
new_points = hpoints.dot(pose.T) #new_points = hpoints.dot(pose.T)
new_points[:, 3:] = points[:, 3:] new_points = np.sum(np.expand_dims(hpoints, 2) * pose.T, axis=1)
#new_points[:, 3:] = points[:, 3:]
# In case of validation, keep the original points in memory # In case of validation, keep the original points in memory
if self.set in ['validation', 'test'] and f_inc == 0: if self.set in ['validation', 'test'] and f_inc == 0:
@ -314,23 +320,27 @@ class SemanticKittiDataset(PointCloudDataset):
# Shuffle points # Shuffle points
rand_order = np.random.permutation(mask_inds) rand_order = np.random.permutation(mask_inds)
new_points = new_points[rand_order, :] new_points = new_points[rand_order, :3]
sem_labels = sem_labels[rand_order] sem_labels = sem_labels[rand_order]
# Place points in original frame reference to get coordinates # Place points in original frame reference to get coordinates
hpoints = np.hstack((new_points[:, :3], np.ones_like(new_points[:, :1]))) if f_inc == 0:
new_coords = hpoints.dot(pose0) new_coords = points[rand_order, :]
new_coords[:, 3:] = new_points[:, 3:] else:
# We have to project in the first frame coordinates
new_coords = new_points - pose0[:3, 3]
# new_coords = new_coords.dot(pose0[:3, :3])
new_coords = np.sum(np.expand_dims(new_coords, 2) * pose0[:3, :3], axis=1)
new_coords = np.hstack((new_coords, points[:, 3:]))
# Increment merge count # Increment merge count
merged_points = np.vstack((merged_points, new_points[:, :3])) merged_points = np.vstack((merged_points, new_points))
merged_labels = np.hstack((merged_labels, sem_labels)) merged_labels = np.hstack((merged_labels, sem_labels))
merged_coords = np.vstack((merged_coords, new_coords)) merged_coords = np.vstack((merged_coords, new_coords))
num_merged += 1 num_merged += 1
f_inc += 1 f_inc += 1
t += [time.time()]
t3 = time.time()
######################### #########################
# Merge n_frames together # Merge n_frames together
@ -347,7 +357,7 @@ class SemanticKittiDataset(PointCloudDataset):
labels=merged_labels, labels=merged_labels,
sampleDl=self.config.first_subsampling_dl) sampleDl=self.config.first_subsampling_dl)
t4 = time.time() t += [time.time()]
# Number collected # Number collected
n = in_pts.shape[0] n = in_pts.shape[0]
@ -364,7 +374,7 @@ class SemanticKittiDataset(PointCloudDataset):
in_lbls = in_lbls[input_inds] in_lbls = in_lbls[input_inds]
n = input_inds.shape[0] n = input_inds.shape[0]
t5 = time.time() t += [time.time()]
# Before augmenting, compute reprojection inds (only for validation and test) # Before augmenting, compute reprojection inds (only for validation and test)
if self.set in ['validation', 'test']: if self.set in ['validation', 'test']:
@ -381,12 +391,12 @@ class SemanticKittiDataset(PointCloudDataset):
proj_inds = np.zeros((0,)) proj_inds = np.zeros((0,))
reproj_mask = np.zeros((0,)) reproj_mask = np.zeros((0,))
t6 = time.time() t += [time.time()]
# Data augmentation # Data augmentation
in_pts, scale, R = self.augmentation_transform(in_pts) in_pts, scale, R = self.augmentation_transform(in_pts)
t7 = time.time() t += [time.time()]
# Color augmentation # Color augmentation
if np.random.rand() > self.config.augment_color: if np.random.rand() > self.config.augment_color:
@ -404,8 +414,7 @@ class SemanticKittiDataset(PointCloudDataset):
r_mask_list += [reproj_mask] r_mask_list += [reproj_mask]
val_labels_list += [o_labels] val_labels_list += [o_labels]
t += [time.time()]
t8 = time.time()
# Update batch size # Update batch size
batch_n += n batch_n += n
@ -427,7 +436,6 @@ class SemanticKittiDataset(PointCloudDataset):
scales = np.array(s_list, dtype=np.float32) scales = np.array(s_list, dtype=np.float32)
rots = np.stack(R_list, axis=0) rots = np.stack(R_list, axis=0)
# Input features (Use reflectance, input height or all coordinates) # Input features (Use reflectance, input height or all coordinates)
stacked_features = np.ones_like(stacked_points[:, :1], dtype=np.float32) stacked_features = np.ones_like(stacked_points[:, :1], dtype=np.float32)
if self.config.in_features_dim == 1: if self.config.in_features_dim == 1:
@ -447,7 +455,8 @@ class SemanticKittiDataset(PointCloudDataset):
else: else:
raise ValueError('Only accepted input dimensions are 1, 4 and 7 (without and with XYZ)') raise ValueError('Only accepted input dimensions are 1, 4 and 7 (without and with XYZ)')
t9 = time.time()
t += [time.time()]
####################### #######################
# Create network inputs # Create network inputs
####################### #######################
@ -461,29 +470,80 @@ class SemanticKittiDataset(PointCloudDataset):
labels.astype(np.int64), labels.astype(np.int64),
stack_lengths) stack_lengths)
t10 = time.time() t += [time.time()]
# Add scale and rotation for testing # Add scale and rotation for testing
input_list += [scales, rots, frame_inds, frame_centers, r_inds_list, r_mask_list, val_labels_list] input_list += [scales, rots, frame_inds, frame_centers, r_inds_list, r_mask_list, val_labels_list]
t11 = time.time() t += [time.time()]
# Display timings # Display timings
debug = False debugT = False
if debug: if debugT:
print('\n************************\n') print('\n************************\n')
print('Timings:') print('Timings:')
print('Lock ...... {:.1f}ms'.format(1000 * (t1 - t0))) ti = 0
print('Init ...... {:.1f}ms'.format(1000 * (t2 - t1))) N = 9
print('Load ...... {:.1f}ms'.format(1000 * (t3 - t2))) mess = 'Init ...... {:5.1f}ms /'
print('subs ...... {:.1f}ms'.format(1000 * (t4 - t3))) loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
print('drop ...... {:.1f}ms'.format(1000 * (t5 - t4))) for dt in loop_times:
print('reproj .... {:.1f}ms'.format(1000 * (t6 - t5))) mess += ' {:5.1f}'.format(dt)
print('augment ... {:.1f}ms'.format(1000 * (t7 - t6))) print(mess.format(np.sum(loop_times)))
print('stack ..... {:.1f}ms'.format(1000 * (t8 - t7))) ti += 1
print('concat .... {:.1f}ms'.format(1000 * (t9 - t8))) mess = 'Lock ...... {:5.1f}ms /'
print('input ..... {:.1f}ms'.format(1000 * (t10 - t9))) loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
print('stack ..... {:.1f}ms'.format(1000 * (t11 - t10))) for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Init ...... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Load ...... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Subs ...... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Drop ...... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Reproj .... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Augment ... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += 1
mess = 'Stack ..... {:5.1f}ms /'
loop_times = [1000 * (t[ti + N * i + 1] - t[ti + N * i]) for i in range(len(stack_lengths))]
for dt in loop_times:
mess += ' {:5.1f}'.format(dt)
print(mess.format(np.sum(loop_times)))
ti += N * (len(stack_lengths) - 1) + 1
print('concat .... {:5.1f}ms'.format(1000 * (t[ti+1] - t[ti])))
ti += 1
print('input ..... {:5.1f}ms'.format(1000 * (t[ti+1] - t[ti])))
ti += 1
print('stack ..... {:5.1f}ms'.format(1000 * (t[ti+1] - t[ti])))
ti += 1
print('\n************************\n') print('\n************************\n')
# Timings: (in test configuration) # Timings: (in test configuration)

5
datasets/common.py
View file

@ -240,7 +240,10 @@ class PointCloudDataset(Dataset):
# Apply transforms # Apply transforms
################## ##################
augmented_points = np.dot(points, R) * scale + noise # Do not use np.dot because it is multi-threaded
#augmented_points = np.dot(points, R) * scale + noise
augmented_points = np.sum(np.expand_dims(points, 2) * R, axis=1) * scale + noise
if normals is None: if normals is None:
return augmented_points, scale, R return augmented_points, scale, R

4
train_S3DIS.py
View file

@ -104,7 +104,7 @@ class S3DISConfig(Config):
################### ###################
# Radius of the input sphere # Radius of the input sphere
in_radius = 2.5 in_radius = 1.0
# Number of kernel points # Number of kernel points
num_kernel_points = 15 num_kernel_points = 15
@ -158,7 +158,7 @@ class S3DISConfig(Config):
grad_clip_norm = 100.0 grad_clip_norm = 100.0
# Number of batch # Number of batch
batch_num = 4 batch_num = 8
# Number of steps per epochs # Number of steps per epochs
epoch_steps = 500 epoch_steps = 500

2
train_SemanticKitti.py
View file

@ -62,7 +62,7 @@ class SemanticKittiConfig(Config):
dataset_task = '' dataset_task = ''
# Number of CPU threads for the input pipeline # Number of CPU threads for the input pipeline
input_threads = 20 input_threads = 10
######################### #########################
# Architecture definition # Architecture definition