edited setup.py & fixed some issues

ericleiva · Sep 3, 2020 · 6b1edb4 · 6b1edb4
1 parent aa8e13c
commit 6b1edb4
Show file tree

Hide file tree

Showing 40 changed files with 26 additions and 3,468 deletions.
diff --git a/SFA_3d_object_detection/data_process/demo_dataset.py b/SFA_3d_object_detection/data_process/demo_dataset.py
@@ -20,9 +20,9 @@
 
 sys.path.append('../')
 
-from data_process.kitti_data_utils import get_filtered_lidar
-from data_process.kitti_bev_utils import makeBEVMap
-import config.kitti_config as cnf
+from SFA_3d_object_detection.data_process.kitti_data_utils import get_filtered_lidar
+from SFA_3d_object_detection.data_process.kitti_bev_utils import makeBEVMap
+import SFA_3d_object_detection.config.kitti_config as cnf
 
 
 class Demo_KittiDataset(Dataset):

diff --git a/SFA_3d_object_detection/data_process/kitti_bev_utils.py b/SFA_3d_object_detection/data_process/kitti_bev_utils.py
@@ -11,7 +11,7 @@
 
 sys.path.append('../')
 
-import config.kitti_config as cnf
+import SFA_3d_object_detection.config.kitti_config as cnf
 
 
 def makeBEVMap(PointCloud_, boundary):

diff --git a/SFA_3d_object_detection/data_process/kitti_data_utils.py b/SFA_3d_object_detection/data_process/kitti_data_utils.py
@@ -16,7 +16,7 @@
 
 sys.path.append('../')
 
-import config.kitti_config as cnf
+import SFA_3d_object_detection.config.kitti_config as cnf
 
 
 class Object3d(object):

diff --git a/SFA_3d_object_detection/data_process/kitti_dataloader.py b/SFA_3d_object_detection/data_process/kitti_dataloader.py
@@ -16,8 +16,8 @@
 
 sys.path.append('../')
 
-from data_process.kitti_dataset import KittiDataset
-from data_process.transformation import OneOf, Random_Rotation, Random_Scaling
+from SFA_3d_object_detection.data_process.kitti_dataset import KittiDataset
+from SFA_3d_object_detection.data_process.transformation import OneOf, Random_Rotation, Random_Scaling
 
 
 def create_train_dataloader(configs):

diff --git a/SFA_3d_object_detection/data_process/kitti_dataset.py b/SFA_3d_object_detection/data_process/kitti_dataset.py
@@ -20,10 +20,10 @@
 
 sys.path.append('../')
 
-from data_process.kitti_data_utils import gen_hm_radius, compute_radius, Calibration, get_filtered_lidar
-from data_process.kitti_bev_utils import makeBEVMap, drawRotatedBox, get_corners
-from data_process import transformation
-import config.kitti_config as cnf
+from SFA_3d_object_detection.data_process.kitti_data_utils import gen_hm_radius, compute_radius, Calibration, get_filtered_lidar
+from SFA_3d_object_detection.data_process.kitti_bev_utils import makeBEVMap, drawRotatedBox, get_corners
+from SFA_3d_object_detection.data_process import transformation
+import SFA_3d_object_detection.config.kitti_config as cnf
 
 
 class KittiDataset(Dataset):

diff --git a/SFA_3d_object_detection/data_process/transformation.py b/SFA_3d_object_detection/data_process/transformation.py
@@ -12,7 +12,7 @@
 
 sys.path.append('../')
 
-from config import kitti_config as cnf
+from SFA_3d_object_detection.config import kitti_config as cnf
 
 
 def angle_in_limit(angle):

diff --git a/SFA_3d_object_detection/losses/losses.py b/SFA_3d_object_detection/losses/losses.py
@@ -15,7 +15,7 @@
 
 sys.path.append('../')
 
-from utils.torch_utils import to_cpu, _sigmoid
+from SFA_3d_object_detection.utils.torch_utils import to_cpu, _sigmoid
 
 
 def _gather_feat(feat, ind, mask=None):

diff --git a/SFA_3d_object_detection/models/model_utils.py b/SFA_3d_object_detection/models/model_utils.py
@@ -14,7 +14,7 @@
 
 sys.path.append('../')
 
-from models import resnet, fpn_resnet
+from SFA_3d_object_detection.models import resnet, fpn_resnet
 
 
 def create_model(configs):

diff --git a/SFA_3d_object_detection/utils/demo_utils.py b/SFA_3d_object_detection/utils/demo_utils.py
@@ -24,9 +24,9 @@
 
 sys.path.append('../')
 
-from utils.misc import make_folder, time_synchronized
-from utils.evaluation_utils import decode, post_processing
-from utils.torch_utils import _sigmoid
+from SFA_3d_object_detection.utils.misc import make_folder, time_synchronized
+from SFA_3d_object_detection.utils.evaluation_utils import decode, post_processing
+from SFA_3d_object_detection.utils.torch_utils import _sigmoid
 
 
 def parse_demo_configs():

diff --git a/SFA_3d_object_detection/utils/evaluation_utils.py b/SFA_3d_object_detection/utils/evaluation_utils.py
@@ -18,8 +18,8 @@
 import cv2
 
 sys.path.append('../')
-import config.kitti_config as cnf
-from data_process.kitti_bev_utils import drawRotatedBox
+import SFA_3d_object_detection.config.kitti_config as cnf
+from SFA_3d_object_detection.data_process.kitti_bev_utils import drawRotatedBox
 
 
 def _nms(heat, kernel=3):

diff --git a/SFA_3d_object_detection/utils/train_utils.py b/SFA_3d_object_detection/utils/train_utils.py
@@ -19,7 +19,7 @@
 
 sys.path.append('../')
 
-from utils.lr_scheduler import OneCyclePolicy
+from SFA_3d_object_detection.utils.lr_scheduler import OneCyclePolicy
 
 
 def create_optimizer(configs, model):

diff --git a/SFA_3d_object_detection/utils/visualization_utils.py b/SFA_3d_object_detection/utils/visualization_utils.py
@@ -17,7 +17,7 @@
 
 sys.path.append('../')
 
-import config.kitti_config as cnf
+import SFA_3d_object_detection.config.kitti_config as cnf
 
 
 def roty(angle):

diff --git a/ros/.catkin_workspace b/ros/.catkin_workspace
@@ -0,0 +1 @@
+# This file currently only serves to mark the location of a catkin workspace for tool integration
diff --git a/ros/src/CMakeLists.txt b/ros/src/CMakeLists.txt
@@ -0,0 +1 @@
+/opt/ros/melodic/share/catkin/cmake/toplevel.cmake
diff --git a/ros/src/super_fast_object_detection/src/config/__init__.py b/ros/src/super_fast_object_detection/src/config/__init__.py
diff --git a/ros/src/super_fast_object_detection/src/config/kitti_config.py b/ros/src/super_fast_object_detection/src/config/kitti_config.py
diff --git a/ros/src/super_fast_object_detection/src/config/train_config.py b/ros/src/super_fast_object_detection/src/config/train_config.py
diff --git a/ros/src/super_fast_object_detection/src/data_process/__init__.py b/ros/src/super_fast_object_detection/src/data_process/__init__.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# This file currently only serves to mark the location of a catkin workspace for tool integration
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/opt/ros/melodic/share/catkin/cmake/toplevel.cmake