"vscode:/vscode.git/clone" did not exist on "2be5e8f5ea8ced2949b38932892c48cbb9ee10c0"
Commit ee11621c authored by Shaoshuai Shi's avatar Shaoshuai Shi
Browse files

Merge branch 'master' into dev_v0.3.1

parents cbf2f4eb c9d31d39
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
`OpenPCDet` is a clear, simple, self-contained open source project for LiDAR-based 3D object detection. `OpenPCDet` is a clear, simple, self-contained open source project for LiDAR-based 3D object detection.
It is also the official code release of [`[PointRCNN]`](https://arxiv.org/abs/1812.04244), [`[Part-A^2 net]`](https://arxiv.org/abs/1907.03670) and [`[PV-RCNN]`](https://arxiv.org/abs/1912.13192). It is also the official code release of [`[PointRCNN]`](https://arxiv.org/abs/1812.04244), [`[Part-A^2 net]`](https://arxiv.org/abs/1907.03670), [`[PV-RCNN]`](https://arxiv.org/abs/1912.13192) and [`[Voxel R-CNN]`](https://arxiv.org/abs/2012.15712).
## Overview ## Overview
...@@ -18,6 +18,8 @@ It is also the official code release of [`[PointRCNN]`](https://arxiv.org/abs/18 ...@@ -18,6 +18,8 @@ It is also the official code release of [`[PointRCNN]`](https://arxiv.org/abs/18
## Changelog ## Changelog
[2021-06-08] Added support for the voxel-based 3D object detection model [`Voxel R-CNN`](#KITTI-3D-Object-Detection-Baselines)
[2021-05-14] Added support for the monocular 3D object detection model [`CaDDN`](#KITTI-3D-Object-Detection-Baselines) [2021-05-14] Added support for the monocular 3D object detection model [`CaDDN`](#KITTI-3D-Object-Detection-Baselines)
[2020-11-27] **Bugfixed:** Please re-prepare the validation infos of Waymo dataset (version 1.2) if you would like to [2020-11-27] **Bugfixed:** Please re-prepare the validation infos of Waymo dataset (version 1.2) if you would like to
......
...@@ -27,7 +27,7 @@ def load_data_to_gpu(batch_dict): ...@@ -27,7 +27,7 @@ def load_data_to_gpu(batch_dict):
elif key in ['frame_id', 'metadata', 'calib']: elif key in ['frame_id', 'metadata', 'calib']:
continue continue
elif key in ['images']: elif key in ['images']:
batch_dict[key] = image_to_tensor(val).float().cuda().contiguous() batch_dict[key] = kornia.image_to_tensor(val).float().cuda().contiguous()
elif key in ['image_shape']: elif key in ['image_shape']:
batch_dict[key] = torch.from_numpy(val).int().cuda() batch_dict[key] = torch.from_numpy(val).int().cuda()
else: else:
......
...@@ -123,17 +123,17 @@ def main(): ...@@ -123,17 +123,17 @@ def main():
start_epoch = it = 0 start_epoch = it = 0
last_epoch = -1 last_epoch = -1
if args.pretrained_model is not None: if args.pretrained_model is not None:
model.load_params_from_file(filename=args.pretrained_model, to_cpu=dist, logger=logger) model.load_params_from_file(filename=args.pretrained_model, to_cpu=dist_train, logger=logger)
if args.ckpt is not None: if args.ckpt is not None:
it, start_epoch = model.load_params_with_optimizer(args.ckpt, to_cpu=dist, optimizer=optimizer, logger=logger) it, start_epoch = model.load_params_with_optimizer(args.ckpt, to_cpu=dist_train, optimizer=optimizer, logger=logger)
last_epoch = start_epoch + 1 last_epoch = start_epoch + 1
else: else:
ckpt_list = glob.glob(str(ckpt_dir / '*checkpoint_epoch_*.pth')) ckpt_list = glob.glob(str(ckpt_dir / '*checkpoint_epoch_*.pth'))
if len(ckpt_list) > 0: if len(ckpt_list) > 0:
ckpt_list.sort(key=os.path.getmtime) ckpt_list.sort(key=os.path.getmtime)
it, start_epoch = model.load_params_with_optimizer( it, start_epoch = model.load_params_with_optimizer(
ckpt_list[-1], to_cpu=dist, optimizer=optimizer, logger=logger ckpt_list[-1], to_cpu=dist_train, optimizer=optimizer, logger=logger
) )
last_epoch = start_epoch + 1 last_epoch = start_epoch + 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment