Skip to content

Commit

Permalink
sort python imports with isort
Browse files Browse the repository at this point in the history
  • Loading branch information
sshaoshuai committed Jul 30, 2020
1 parent 2b53953 commit 44c10a3
Show file tree
Hide file tree
Showing 68 changed files with 187 additions and 131 deletions.
3 changes: 1 addition & 2 deletions pcdet/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from pathlib import Path
import subprocess
from pathlib import Path

from .version import __version__

Expand All @@ -22,4 +22,3 @@ def get_git_commit_number():

if script_version not in __version__:
__version__ = __version__ + '+py%s' % script_version

3 changes: 2 additions & 1 deletion pcdet/config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from easydict import EasyDict
from pathlib import Path

import yaml
from easydict import EasyDict


def log_config_to_file(cfg, pre='cfg', logger=None):
Expand Down
6 changes: 4 additions & 2 deletions pcdet/datasets/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import torch
from torch.utils.data import DataLoader
from torch.utils.data import DistributedSampler as _DistributedSampler

from pcdet.utils import common_utils

from .dataset import DatasetTemplate
from .kitti.kitti_dataset import KittiDataset
from .nuscenes.nuscenes_dataset import NuScenesDataset
from torch.utils.data import DistributedSampler as _DistributedSampler
from pcdet.utils import common_utils

__all__ = {
'DatasetTemplate': DatasetTemplate,
Expand Down
1 change: 1 addition & 0 deletions pcdet/datasets/augmentor/augmentor_utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import numpy as np

from ...utils import common_utils


Expand Down
4 changes: 3 additions & 1 deletion pcdet/datasets/augmentor/data_augmentor.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from functools import partial

import numpy as np
from . import augmentor_utils, database_sampler

from ...utils import common_utils
from . import augmentor_utils, database_sampler


class DataAugmentor(object):
Expand Down
6 changes: 4 additions & 2 deletions pcdet/datasets/augmentor/database_sampler.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import numpy as np
import pickle
from ...utils import box_utils

import numpy as np

from ...ops.iou3d_nms import iou3d_nms_utils
from ...utils import box_utils


class DataBaseSampler(object):
Expand Down
6 changes: 4 additions & 2 deletions pcdet/datasets/dataset.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from pathlib import Path
from collections import defaultdict
from pathlib import Path

import numpy as np
import torch.utils.data as torch_data

from ..utils import common_utils
from .augmentor.data_augmentor import DataAugmentor
from .processor.data_processor import DataProcessor
from .processor.point_feature_encoder import PointFeatureEncoder
from ..utils import common_utils


class DatasetTemplate(torch_data.Dataset):
Expand Down
9 changes: 5 additions & 4 deletions pcdet/datasets/kitti/kitti_dataset.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import pickle
import copy
import pickle

import numpy as np
from skimage import io
from ...utils import box_utils, common_utils, calibration_kitti, object3d_kitti
from ..dataset import DatasetTemplate

from ...ops.roiaware_pool3d import roiaware_pool3d_utils
from ...utils import box_utils, calibration_kitti, common_utils, object3d_kitti
from ..dataset import DatasetTemplate


class KittiDataset(DatasetTemplate):
Expand Down Expand Up @@ -435,4 +437,3 @@ def create_kitti_infos(dataset_cfg, class_names, data_path, save_path, workers=4
data_path=ROOT_DIR / 'data' / 'kitti',
save_path=ROOT_DIR / 'data' / 'kitti'
)

6 changes: 4 additions & 2 deletions pcdet/datasets/kitti/kitti_object_eval_python/eval.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import numpy as np
import numba
import io as sysio

import numba
import numpy as np

from .rotate_iou import rotate_iou_gpu_eval


Expand Down
3 changes: 2 additions & 1 deletion pcdet/datasets/kitti/kitti_object_eval_python/evaluate.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import time

import fire

import .kitti_common as kitti
from .eval import get_official_eval_result, get_coco_eval_result
from .eval import get_coco_eval_result, get_official_eval_result


def _read_imageset_file(path):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import numpy as np
from skimage import io


def get_image_index_str(img_idx):
return "{:06d}".format(img_idx)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import numpy as np
from numba import cuda


@numba.jit(nopython=True)
def div_up(m, n):
return m // n + (m % n > 0)
Expand Down
8 changes: 5 additions & 3 deletions pcdet/datasets/nuscenes/nuscenes_dataset.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import pickle
import copy
import pickle
from pathlib import Path

import numpy as np
from tqdm import tqdm
from pathlib import Path

from ...ops.roiaware_pool3d import roiaware_pool3d_utils
from ...utils import common_utils
from ..dataset import DatasetTemplate
from ...ops.roiaware_pool3d import roiaware_pool3d_utils


class NuScenesDataset(DatasetTemplate):
Expand Down
10 changes: 5 additions & 5 deletions pcdet/datasets/nuscenes/nuscenes_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
https://github.com/traveller59/second.pytorch and https://github.com/poodarchu/Det3D
"""

from pathlib import Path
import tqdm
import numpy as np
import operator
from functools import reduce
from pathlib import Path

import numpy as np
import tqdm
from nuscenes.utils.data_classes import Box
from nuscenes.utils.geometry_utils import transform_matrix
from pyquaternion import Quaternion
from nuscenes.utils.data_classes import Box


map_name_from_general_to_detection = {
'human.pedestrian.adult': 'pedestrian',
Expand Down
2 changes: 2 additions & 0 deletions pcdet/datasets/processor/data_processor.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from functools import partial

import numpy as np

from ...utils import box_utils, common_utils


Expand Down
6 changes: 4 additions & 2 deletions pcdet/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import torch
import numpy as np
from collections import namedtuple

import numpy as np
import torch

from .detectors import build_detector


Expand Down
3 changes: 1 addition & 2 deletions pcdet/models/backbones_2d/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from .base_bev_backbone import BaseBEVBackbone


__all__ = {
'BaseBEVBackbone': BaseBEVBackbone
}
}
2 changes: 1 addition & 1 deletion pcdet/models/backbones_2d/base_bev_backbone.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np
import torch
import torch.nn as nn
import numpy as np


class BaseBEVBackbone(nn.Module):
Expand Down
2 changes: 1 addition & 1 deletion pcdet/models/backbones_3d/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .pointnet2_backbone import PointNet2Backbone, PointNet2MSG
from .spconv_backbone import VoxelBackBone8x, VoxelResBackBone8x
from .spconv_unet import UNetV2
from .pointnet2_backbone import PointNet2Backbone, PointNet2MSG

__all__ = {
'VoxelBackBone8x': VoxelBackBone8x,
Expand Down
1 change: 0 additions & 1 deletion pcdet/models/backbones_3d/pfe/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from .voxel_set_abstraction import VoxelSetAbstraction


__all__ = {
'VoxelSetAbstraction': VoxelSetAbstraction
}
4 changes: 2 additions & 2 deletions pcdet/models/backbones_3d/pfe/voxel_set_abstraction.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import torch
import torch.nn as nn
from ....utils import common_utils

from ....ops.pointnet2.pointnet2_stack import pointnet2_modules as pointnet2_stack_modules
from ....ops.pointnet2.pointnet2_stack import pointnet2_utils as pointnet2_stack_utils
from ....utils import common_utils


def bilinear_interpolate_torch(im, x, y):
Expand Down Expand Up @@ -236,4 +237,3 @@ def forward(self, batch_dict):
batch_dict['point_features'] = point_features # (BxN, C)
batch_dict['point_coords'] = point_coords # (BxN, 4)
return batch_dict

1 change: 1 addition & 0 deletions pcdet/models/backbones_3d/pointnet2_backbone.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import torch
import torch.nn as nn

from ...ops.pointnet2.pointnet2_batch import pointnet2_modules
from ...ops.pointnet2.pointnet2_stack import pointnet2_modules as pointnet2_modules_stack
from ...ops.pointnet2.pointnet2_stack import pointnet2_utils as pointnet2_utils_stack
Expand Down
5 changes: 3 additions & 2 deletions pcdet/models/backbones_3d/spconv_backbone.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import torch.nn as nn
import spconv
from functools import partial

import spconv
import torch.nn as nn


def post_act_block(in_channels, out_channels, kernel_size, indice_key=None, stride=1, padding=0,
conv_type='subm', norm_fn=None):
Expand Down
8 changes: 5 additions & 3 deletions pcdet/models/backbones_3d/spconv_unet.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from functools import partial

import spconv
import torch
import torch.nn as nn
import spconv
from functools import partial
from .spconv_backbone import post_act_block

from ...utils import common_utils
from .spconv_backbone import post_act_block


class SparseBasicBlock(spconv.SparseModule):
Expand Down
2 changes: 1 addition & 1 deletion pcdet/models/backbones_3d/vfe/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .vfe_template import VFETemplate
from .mean_vfe import MeanVFE
from .pillar_vfe import PillarVFE
from .vfe_template import VFETemplate

__all__ = {
'VFETemplate': VFETemplate,
Expand Down
1 change: 1 addition & 0 deletions pcdet/models/backbones_3d/vfe/mean_vfe.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import torch

from .vfe_template import VFETemplate


Expand Down
1 change: 1 addition & 0 deletions pcdet/models/backbones_3d/vfe/pillar_vfe.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import torch
import torch.nn as nn
import torch.nn.functional as F

from .vfe_template import VFETemplate


Expand Down
8 changes: 4 additions & 4 deletions pcdet/models/dense_heads/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from .anchor_head_template import AnchorHeadTemplate
from .anchor_head_multi import AnchorHeadMulti
from .anchor_head_single import AnchorHeadSingle
from .point_intra_part_head import PointIntraPartOffsetHead
from .point_head_simple import PointHeadSimple
from .anchor_head_template import AnchorHeadTemplate
from .point_head_box import PointHeadBox
from .anchor_head_multi import AnchorHeadMulti
from .point_head_simple import PointHeadSimple
from .point_intra_part_head import PointIntraPartOffsetHead

__all__ = {
'AnchorHeadTemplate': AnchorHeadTemplate,
Expand Down
5 changes: 3 additions & 2 deletions pcdet/models/dense_heads/anchor_head_multi.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import numpy as np
import torch
import torch.nn as nn
from .anchor_head_template import AnchorHeadTemplate

from ..backbones_2d import BaseBEVBackbone
import torch
from .anchor_head_template import AnchorHeadTemplate


class SingleHead(BaseBEVBackbone):
Expand Down
2 changes: 1 addition & 1 deletion pcdet/models/dense_heads/anchor_head_single.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import numpy as np
import torch.nn as nn

from .anchor_head_template import AnchorHeadTemplate


Expand Down Expand Up @@ -72,4 +73,3 @@ def forward(self, data_dict):
data_dict['cls_preds_normalized'] = False

return data_dict

3 changes: 2 additions & 1 deletion pcdet/models/dense_heads/anchor_head_template.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import numpy as np
import torch
import torch.nn as nn

from ...utils import box_coder_utils, common_utils, loss_utils
from .target_assigner.anchor_generator import AnchorGenerator
from .target_assigner.atss_target_assigner import ATSSTargetAssigner
from .target_assigner.axis_aligned_target_assigner import AxisAlignedTargetAssigner
from ...utils import box_coder_utils, loss_utils, common_utils


class AnchorHeadTemplate(nn.Module):
Expand Down
3 changes: 2 additions & 1 deletion pcdet/models/dense_heads/point_head_box.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import torch
from .point_head_template import PointHeadTemplate

from ...utils import box_coder_utils, box_utils
from .point_head_template import PointHeadTemplate


class PointHeadBox(PointHeadTemplate):
Expand Down
3 changes: 2 additions & 1 deletion pcdet/models/dense_heads/point_head_simple.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import torch
from .point_head_template import PointHeadTemplate

from ...utils import box_utils
from .point_head_template import PointHeadTemplate


class PointHeadSimple(PointHeadTemplate):
Expand Down
3 changes: 2 additions & 1 deletion pcdet/models/dense_heads/point_head_template.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import torch
import torch.nn as nn
import torch.nn.functional as F
from ...utils import loss_utils, common_utils

from ...ops.roiaware_pool3d import roiaware_pool3d_utils
from ...utils import common_utils, loss_utils


class PointHeadTemplate(nn.Module):
Expand Down
3 changes: 2 additions & 1 deletion pcdet/models/dense_heads/point_intra_part_head.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import torch

from ...utils import box_coder_utils, box_utils
from .point_head_template import PointHeadTemplate
from ...utils import box_utils, box_coder_utils


class PointIntraPartOffsetHead(PointHeadTemplate):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import torch
from ....utils import common_utils

from ....ops.iou3d_nms import iou3d_nms_utils
from ....utils import common_utils


class ATSSTargetAssigner(object):
Expand Down
Loading

0 comments on commit 44c10a3

Please sign in to comment.