From d6f9dd979f5d9d6cd38656dd8da5b0d74c410d8b Mon Sep 17 00:00:00 2001 From: Liangliang Zhang Date: Mon, 5 Mar 2018 17:16:00 -0800 Subject: [PATCH] Perception: use short lib names when not conflict in BUILD files. --- modules/perception/BUILD | 2 +- modules/perception/common/BUILD | 14 +-- modules/perception/lib/config_manager/BUILD | 4 +- modules/perception/obstacle/base/BUILD | 12 +-- modules/perception/obstacle/camera/cipv/BUILD | 14 +-- .../perception/obstacle/camera/common/BUILD | 5 +- .../obstacle/camera/detector/common/BUILD | 4 +- .../detector/yolo_camera_detector/BUILD | 8 +- .../perception/obstacle/camera/dummy/BUILD | 2 +- .../obstacle/camera/interface/BUILD | 2 +- .../cc_lane_post_processor/BUILD | 11 +-- .../camera/lane_post_process/common/BUILD | 10 +-- .../obstacle/camera/motionmanager/BUILD | 8 +- .../perception/obstacle/camera/tracker/BUILD | 36 ++++---- .../obstacle/camera/tracker/cs2d/BUILD | 6 +- .../obstacle/camera/tracker/dlf/BUILD | 6 +- .../obstacle/camera/tracker/kcf/BUILD | 4 +- .../obstacle/camera/visualizer/BUILD | 24 ++--- .../obstacle/camera/visualizer/common/BUILD | 12 +-- modules/perception/obstacle/common/BUILD | 10 +-- .../obstacle/fusion/interface/BUILD | 4 +- .../fusion/probabilistic_fusion/BUILD | 6 +- modules/perception/obstacle/lidar/dummy/BUILD | 6 +- .../perception/obstacle/lidar/interface/BUILD | 6 +- .../lidar/object_builder/min_box/BUILD | 14 +-- .../lidar/roi_filter/hdmap_roi_filter/BUILD | 6 +- .../obstacle/lidar/segmentation/cnnseg/BUILD | 16 ++-- .../obstacle/lidar/tracker/hm_tracker/BUILD | 20 ++--- .../type_fuser/sequence_type_fuser/BUILD | 24 ++--- .../lidar/visualizer/opengl_visualizer/BUILD | 16 ++-- modules/perception/obstacle/onboard/BUILD | 90 +++++++++---------- modules/perception/obstacle/radar/dummy/BUILD | 6 +- .../perception/obstacle/radar/interface/BUILD | 6 +- .../perception/obstacle/radar/modest/BUILD | 12 +-- modules/perception/onboard/BUILD | 2 +- .../perception/tool/export_sensor_data/BUILD | 8 +- .../tool/export_sensor_data/conf/BUILD | 2 +- .../tool/offline_visualizer_tool/BUILD | 22 ++--- .../tool/offline_visualizer_tool/conf/BUILD | 2 +- .../perception/traffic_light/rectify/BUILD | 6 +- .../perception/traffic_light/reviser/BUILD | 4 +- .../perception/traffic_light/visualizer/BUILD | 2 +- 42 files changed, 237 insertions(+), 237 deletions(-) diff --git a/modules/perception/BUILD b/modules/perception/BUILD index 42e71e468f..27794a9352 100644 --- a/modules/perception/BUILD +++ b/modules/perception/BUILD @@ -12,7 +12,7 @@ cc_library( "//modules/common", "//modules/common:apollo_app", "//modules/common/adapters:adapter_manager", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/obstacle/onboard:perception_obstacle_fusion_subnode", "//modules/perception/obstacle/onboard:perception_obstacle_lidar_subnode", diff --git a/modules/perception/common/BUILD b/modules/perception/common/BUILD index 101e1cd2f1..4bea8aa825 100644 --- a/modules/perception/common/BUILD +++ b/modules/perception/common/BUILD @@ -3,13 +3,13 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_common", - srcs = glob([ - "*.cc", - ]), - hdrs = glob([ - "*.h", - ]), + name = "common", + srcs = [ + "perception_gflags.cc", + ], + hdrs = [ + "perception_gflags.h", + ], deps = [ "//modules/common", ], diff --git a/modules/perception/lib/config_manager/BUILD b/modules/perception/lib/config_manager/BUILD index a3585d063f..3a034d137e 100644 --- a/modules/perception/lib/config_manager/BUILD +++ b/modules/perception/lib/config_manager/BUILD @@ -15,7 +15,7 @@ cc_library( deps = [ "//modules/common:log", "//modules/common/util", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/lib/config_manager/proto:config_proto", "//modules/perception/obstacle/camera/common", @@ -33,7 +33,7 @@ cc_test( data = ["//modules/perception:perception_data"], deps = [ ":config_manager", - "//modules/perception/common:perception_common", + "//modules/perception/common", "@gtest//:main", ], ) diff --git a/modules/perception/obstacle/base/BUILD b/modules/perception/obstacle/base/BUILD index 03c350929c..457c3be5b2 100644 --- a/modules/perception/obstacle/base/BUILD +++ b/modules/perception/obstacle/base/BUILD @@ -3,11 +3,11 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_base", + name = "base", srcs = [ "object.cc", - "types.cc", "object_supplement.cc", + "types.cc", ], hdrs = [ "hdmap_struct.h", @@ -19,25 +19,25 @@ cc_library( "//modules/common", "//modules/common/proto:error_code_proto", "//modules/common/util:string_util", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", + "//modules/perception/obstacle/camera/lane_post_process/common:type", "//modules/perception/proto:perception_proto", - "//modules/perception/obstacle/camera/lane_post_process/common:perception_obstacle_camera_lane_post_process_common_type", "@eigen", "@opencv2//:core", ], ) cc_test( - name = "perception_obstacle_base_test", + name = "base_test", size = "small", srcs = [ "object_test.cc", "types_test.cc", ], deps = [ - ":perception_obstacle_base", + ":base", "@gtest//:main", ], ) diff --git a/modules/perception/obstacle/camera/cipv/BUILD b/modules/perception/obstacle/camera/cipv/BUILD index 726c1a32bb..a806e59535 100644 --- a/modules/perception/obstacle/camera/cipv/BUILD +++ b/modules/perception/obstacle/camera/cipv/BUILD @@ -7,15 +7,15 @@ cc_library( srcs = ["cipv.cc"], hdrs = ["cipv.h"], deps = [ - "@eigen//:eigen", "//modules/common:log", - "//modules/perception/lib/base:base", - "//modules/perception/obstacle/camera/common:common", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/common:perception_obstacle_common", "//modules/common/configs:vehicle_config_helper", - "//modules/perception/obstacle/camera/lane_post_process/common:perception_obstacle_camera_lane_post_process_common_type" - ] + "//modules/perception/lib/base", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/camera/common", + "//modules/perception/obstacle/camera/lane_post_process/common:type", + "//modules/perception/obstacle/common", + "@eigen", + ], ) cpplint() diff --git a/modules/perception/obstacle/camera/common/BUILD b/modules/perception/obstacle/camera/common/BUILD index 1217ca778f..4b445d99d3 100644 --- a/modules/perception/obstacle/camera/common/BUILD +++ b/modules/perception/obstacle/camera/common/BUILD @@ -9,11 +9,10 @@ cc_library( hdrs = [ "camera.h", "lane_object.h", - "util.h", "visual_object.h", ], deps = [ - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", "@eigen", "@undistort", ], @@ -30,7 +29,7 @@ cc_library( ], deps = [ "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", "@eigen", "@undistort", ], diff --git a/modules/perception/obstacle/camera/detector/common/BUILD b/modules/perception/obstacle/camera/detector/common/BUILD index d6983a85a3..f4658d1313 100644 --- a/modules/perception/obstacle/camera/detector/common/BUILD +++ b/modules/perception/obstacle/camera/detector/common/BUILD @@ -25,8 +25,8 @@ cc_library( "//modules/common:log", "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/camera/common", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/camera/common:util", "//modules/perception/obstacle/camera/detector/common/proto:tracking_feature_proto", "@caffe//:lib", "@cuda", diff --git a/modules/perception/obstacle/camera/detector/yolo_camera_detector/BUILD b/modules/perception/obstacle/camera/detector/yolo_camera_detector/BUILD index c8e0aea6a9..77e7124380 100644 --- a/modules/perception/obstacle/camera/detector/yolo_camera_detector/BUILD +++ b/modules/perception/obstacle/camera/detector/yolo_camera_detector/BUILD @@ -8,10 +8,10 @@ cc_library( hdrs = ["region_output.h"], deps = [ "//modules/common:log", - "//modules/perception/obstacle/camera/common:common", + "//modules/perception/obstacle/camera/common:util", "//modules/perception/obstacle/camera/detector/common:util", - "@opencv2//:core", "@caffe//:lib", + "@opencv2//:core", ], ) @@ -25,7 +25,7 @@ cc_library( # ], # deps = [ # "//modules/common:log", -# "//modules/perception/obstacle/base:perception_obstacle_base", +# "//modules/perception/obstacle/base", # "@caffe//:lib", # "@eigen", # ], @@ -37,7 +37,7 @@ cc_library( hdrs = ["util.h"], deps = [ "//modules/common:log", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", "@caffe//:lib", "@eigen", ], diff --git a/modules/perception/obstacle/camera/dummy/BUILD b/modules/perception/obstacle/camera/dummy/BUILD index 71ac390ffd..97451166dd 100644 --- a/modules/perception/obstacle/camera/dummy/BUILD +++ b/modules/perception/obstacle/camera/dummy/BUILD @@ -8,7 +8,7 @@ package(default_visibility = ["//visibility:public"]) # hdrs = ["dummy_algorithms.h"], # deps = [ # "//modules/common:log", -# "//modules/perception/obstacle/base:perception_obstacle_base", +# "//modules/perception/obstacle/base", # "@caffe//:lib", # "@eigen", # ], diff --git a/modules/perception/obstacle/camera/interface/BUILD b/modules/perception/obstacle/camera/interface/BUILD index 11f7843a18..4f5bfbb7e3 100644 --- a/modules/perception/obstacle/camera/interface/BUILD +++ b/modules/perception/obstacle/camera/interface/BUILD @@ -8,7 +8,7 @@ cc_library( hdrs = glob(["*.h"]), deps = [ "//modules/perception/lib/base", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", "//modules/perception/obstacle/camera/common", "@eigen", "@opencv2//:core", diff --git a/modules/perception/obstacle/camera/lane_post_process/cc_lane_post_processor/BUILD b/modules/perception/obstacle/camera/lane_post_process/cc_lane_post_processor/BUILD index aee0673e38..7f2767763a 100644 --- a/modules/perception/obstacle/camera/lane_post_process/cc_lane_post_processor/BUILD +++ b/modules/perception/obstacle/camera/lane_post_process/cc_lane_post_processor/BUILD @@ -11,10 +11,11 @@ cc_library( ], deps = [ "//modules/common:log", - "//modules/perception/obstacle/camera/lane_post_process/common:perception_obstacle_camera_lane_post_process_common_connected_component_analysis", - "//modules/perception/obstacle/camera/lane_post_process/common:perception_obstacle_camera_lane_post_process_common_type", - "//modules/perception/obstacle/camera/lane_post_process/common:perception_obstacle_camera_lane_post_process_common_util", + "//modules/perception/obstacle/camera/common:util", + "//modules/perception/obstacle/camera/lane_post_process/common:connected_component", "//modules/perception/obstacle/camera/lane_post_process/common:projector", + "//modules/perception/obstacle/camera/lane_post_process/common:type", + "//modules/perception/obstacle/camera/lane_post_process/common:util", "@eigen", "@opencv2//:core", ], @@ -25,11 +26,11 @@ cc_library( srcs = ["cc_lane_post_processor.cc"], hdrs = ["cc_lane_post_processor.h"], deps = [ + ":lane_frame", "//modules/common:log", "//modules/perception/lib/config_manager", - "//modules/perception/obstacle/camera/common", + "//modules/perception/obstacle/camera/common:util", "//modules/perception/obstacle/camera/interface", - "//modules/perception/obstacle/camera/lane_post_process/cc_lane_post_processor:lane_frame", "@eigen", "@opencv2//:core", ], diff --git a/modules/perception/obstacle/camera/lane_post_process/common/BUILD b/modules/perception/obstacle/camera/lane_post_process/common/BUILD index 7b80e0f9f1..019516d2a6 100644 --- a/modules/perception/obstacle/camera/lane_post_process/common/BUILD +++ b/modules/perception/obstacle/camera/lane_post_process/common/BUILD @@ -3,7 +3,7 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_camera_lane_post_process_common_type", + name = "type", hdrs = ["type.h"], deps = [ "//modules/common:log", @@ -13,21 +13,21 @@ cc_library( ) cc_library( - name = "perception_obstacle_camera_lane_post_process_common_util", + name = "util", hdrs = ["util.h"], deps = [ + ":type", "//modules/common:log", - "//modules/perception/obstacle/camera/lane_post_process/common:perception_obstacle_camera_lane_post_process_common_type", ], ) cc_library( - name = "perception_obstacle_camera_lane_post_process_common_connected_component_analysis", + name = "connected_component", srcs = ["connected_component.cc"], hdrs = ["connected_component.h"], deps = [ + ":type", "//modules/common:log", - "//modules/perception/obstacle/camera/lane_post_process/common:perception_obstacle_camera_lane_post_process_common_type", "@eigen", "@opencv2//:core", ], diff --git a/modules/perception/obstacle/camera/motionmanager/BUILD b/modules/perception/obstacle/camera/motionmanager/BUILD index 47565f0739..df4ac1bd48 100644 --- a/modules/perception/obstacle/camera/motionmanager/BUILD +++ b/modules/perception/obstacle/camera/motionmanager/BUILD @@ -3,9 +3,9 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_camera_motionmanager", + name = "motionmanager", srcs = [ - "vehicleplanemotion.cc" + "vehicleplanemotion.cc", ], hdrs = [ "vehicleplanemotion.h", @@ -14,8 +14,8 @@ cc_library( "-Wno-deprecated", ], deps = [ - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", ], ) -cpplint() \ No newline at end of file +cpplint() diff --git a/modules/perception/obstacle/camera/tracker/BUILD b/modules/perception/obstacle/camera/tracker/BUILD index 16ad1a67f3..651d1def93 100644 --- a/modules/perception/obstacle/camera/tracker/BUILD +++ b/modules/perception/obstacle/camera/tracker/BUILD @@ -6,7 +6,7 @@ cc_library( name = "base_affinity", srcs = [], hdrs = ["base_affinity_tracker.h"], - deps = ["@opencv2//:core"] + deps = ["@opencv2//:core"], ) cc_library( @@ -14,33 +14,33 @@ cc_library( srcs = ["cascaded_camera_tracker_util.cc"], hdrs = ["cascaded_camera_tracker_util.h"], deps = [ - "@eigen", + ":base_affinity", "//modules/common:log", "//modules/perception/lib/base", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/camera/common:common", - ":base_affinity" + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/camera/common:util", + "//modules/perception/obstacle/common", + "@eigen", ], ) cc_library( name = "cascaded", - srcs = ["cascaded_camera_tracker.cc",], - hdrs = ["cascaded_camera_tracker.h",], + srcs = ["cascaded_camera_tracker.cc"], + hdrs = ["cascaded_camera_tracker.h"], deps = [ - "@eigen", + ":base_affinity", + ":util", "//modules/common:log", "//modules/perception/lib/base", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/camera/common:common", - "//modules/perception/obstacle/camera/interface:interface", - "//modules/perception/obstacle/camera/tracker/cs2d:cs2d", - "//modules/perception/obstacle/camera/tracker/dlf:dlf", - "//modules/perception/obstacle/camera/tracker/kcf:kcf", - ":base_affinity", - ":util" + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/camera/common", + "//modules/perception/obstacle/camera/interface", + "//modules/perception/obstacle/camera/tracker/cs2d", + "//modules/perception/obstacle/camera/tracker/dlf", + "//modules/perception/obstacle/camera/tracker/kcf", + "//modules/perception/obstacle/common", + "@eigen", ], ) diff --git a/modules/perception/obstacle/camera/tracker/cs2d/BUILD b/modules/perception/obstacle/camera/tracker/cs2d/BUILD index 38cfda6ef9..fae1cdb1b8 100644 --- a/modules/perception/obstacle/camera/tracker/cs2d/BUILD +++ b/modules/perception/obstacle/camera/tracker/cs2d/BUILD @@ -7,9 +7,9 @@ cc_library( srcs = ["cs2d_affinity_tracker.cc"], hdrs = ["cs2d_affinity_tracker.h"], deps = [ - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/camera/tracker:base_affinity" - ] + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/camera/tracker:base_affinity", + ], ) cpplint() diff --git a/modules/perception/obstacle/camera/tracker/dlf/BUILD b/modules/perception/obstacle/camera/tracker/dlf/BUILD index faccea8888..4d9a3b0708 100644 --- a/modules/perception/obstacle/camera/tracker/dlf/BUILD +++ b/modules/perception/obstacle/camera/tracker/dlf/BUILD @@ -7,10 +7,10 @@ cc_library( srcs = ["dlf_affinity_tracker.cc"], hdrs = ["dlf_affinity_tracker.h"], deps = [ + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/camera/tracker:base_affinity", "@eigen", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/camera/tracker:base_affinity" - ] + ], ) cpplint() diff --git a/modules/perception/obstacle/camera/tracker/kcf/BUILD b/modules/perception/obstacle/camera/tracker/kcf/BUILD index e21a6d2722..f4065b2c07 100644 --- a/modules/perception/obstacle/camera/tracker/kcf/BUILD +++ b/modules/perception/obstacle/camera/tracker/kcf/BUILD @@ -14,11 +14,11 @@ cc_library( ], deps = [ "//modules/perception/lib/base", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", "//modules/perception/obstacle/camera/common:util", "//modules/perception/obstacle/camera/tracker:base_affinity", "//modules/perception/obstacle/camera/tracker:util", - "//modules/perception/obstacle/common:perception_obstacle_common", + "//modules/perception/obstacle/common", "@eigen", "@opencv2//:core", ], diff --git a/modules/perception/obstacle/camera/visualizer/BUILD b/modules/perception/obstacle/camera/visualizer/BUILD index 2b7304f29d..9802c4c77c 100644 --- a/modules/perception/obstacle/camera/visualizer/BUILD +++ b/modules/perception/obstacle/camera/visualizer/BUILD @@ -3,17 +3,17 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_camera_visualizer", + name = "visualizer", srcs = [ "frame_content.cc", - "glfw_fusion_viewer.cc", "gl_fusion_visualizer.cc", + "glfw_fusion_viewer.cc", ], hdrs = [ - "frame_content.h", "base_visualizer.h", - "glfw_fusion_viewer.h", + "frame_content.h", "gl_fusion_visualizer.h", + "glfw_fusion_viewer.h", ], copts = [ "-Wno-deprecated", @@ -22,15 +22,15 @@ cc_library( "//modules/common:log", "//modules/drivers/proto:sensor_proto", "//modules/perception/lib/base", - "//modules/perception/lib/config_manager:config_manager", + "//modules/perception/lib/config_manager", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/radar/interface:perception_obstacle_radar_interface", - "//modules/perception/obstacle/camera/visualizer/common:perception_obstacle_camera_visualizer_common", - "@eigen//:eigen", - "@glew//:glew", - "@glfw//:glfw", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/camera/visualizer/common", + "//modules/perception/obstacle/common", + "//modules/perception/obstacle/radar/interface", + "@eigen", + "@glew", + "@glfw", ], ) diff --git a/modules/perception/obstacle/camera/visualizer/common/BUILD b/modules/perception/obstacle/camera/visualizer/common/BUILD index ca6e9403bc..90eac8e510 100644 --- a/modules/perception/obstacle/camera/visualizer/common/BUILD +++ b/modules/perception/obstacle/camera/visualizer/common/BUILD @@ -3,25 +3,25 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_camera_visualizer_common", + name = "common", srcs = [ "camera.cc", "frame.cc", - "gl_raster_text.cc" + "gl_raster_text.cc", ], hdrs = [ "bmp.h", "camera.h", "frame.h", - "gl_raster_text.h" + "gl_raster_text.h", ], copts = [ "-Wno-deprecated", ], deps = [ - "@eigen//:eigen", - "@glew//:glew", - "@glfw//:glfw" + "@eigen", + "@glew", + "@glfw", ], ) diff --git a/modules/perception/obstacle/common/BUILD b/modules/perception/obstacle/common/BUILD index bff9757dad..2ff9d8c661 100644 --- a/modules/perception/obstacle/common/BUILD +++ b/modules/perception/obstacle/common/BUILD @@ -3,7 +3,7 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_common", + name = "common", srcs = [ "file_system_util.cc", "geometry_util.cc", @@ -29,14 +29,14 @@ cc_library( "//modules/common:log", "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", "@eigen", "@yaml_cpp//:yaml", ], ) cc_test( - name = "perception_obstacle_common_test", + name = "common_test", size = "small", srcs = [ "convex_hullxy_test.cc", @@ -52,8 +52,8 @@ cc_test( "//modules/perception:perception_data", ], deps = [ - ":perception_obstacle_common", - "//modules/perception/obstacle/lidar/object_builder/min_box:perception_obstacle_lidar_object_builder_min_box", + ":common", + "//modules/perception/obstacle/lidar/object_builder/min_box", "@gtest//:main", ], ) diff --git a/modules/perception/obstacle/fusion/interface/BUILD b/modules/perception/obstacle/fusion/interface/BUILD index 2d000bdcd8..8ed5255c12 100644 --- a/modules/perception/obstacle/fusion/interface/BUILD +++ b/modules/perception/obstacle/fusion/interface/BUILD @@ -9,8 +9,8 @@ cc_library( deps = [ "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/onboard:perception_obstacle_hdmapinput", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/onboard:hdmapinput", "@eigen", ], ) diff --git a/modules/perception/obstacle/fusion/probabilistic_fusion/BUILD b/modules/perception/obstacle/fusion/probabilistic_fusion/BUILD index 73ed301001..f982d098b7 100644 --- a/modules/perception/obstacle/fusion/probabilistic_fusion/BUILD +++ b/modules/perception/obstacle/fusion/probabilistic_fusion/BUILD @@ -39,10 +39,10 @@ cc_library( "//modules/common", "//modules/common:log", "//modules/perception/lib/config_manager", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/common:perception_obstacle_common", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/common", "//modules/perception/obstacle/fusion/interface:perception_obstacle_fusion_interface", - "//modules/perception/obstacle/onboard:perception_obstacle_hdmapinput", + "//modules/perception/obstacle/onboard:hdmapinput", "@eigen", "@pcl", ], diff --git a/modules/perception/obstacle/lidar/dummy/BUILD b/modules/perception/obstacle/lidar/dummy/BUILD index e1b573a911..a741820ac6 100644 --- a/modules/perception/obstacle/lidar/dummy/BUILD +++ b/modules/perception/obstacle/lidar/dummy/BUILD @@ -3,7 +3,7 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_lidar_dummy", + name = "dummy", srcs = [ "dummy_algorithms.cc", ], @@ -12,8 +12,8 @@ cc_library( ], deps = [ "//modules/common:log", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/lidar/interface:perception_obstacle_lidar_interface", + "//modules/perception/obstacle/common", + "//modules/perception/obstacle/lidar/interface", "@eigen", "@pcl", ], diff --git a/modules/perception/obstacle/lidar/interface/BUILD b/modules/perception/obstacle/lidar/interface/BUILD index 13f4720943..7b8d17e1b2 100644 --- a/modules/perception/obstacle/lidar/interface/BUILD +++ b/modules/perception/obstacle/lidar/interface/BUILD @@ -3,14 +3,14 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_lidar_interface", + name = "interface", srcs = [], hdrs = glob(["*.h"]), deps = [ "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/onboard:perception_obstacle_hdmapinput", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/onboard:hdmapinput", "@eigen", ], ) diff --git a/modules/perception/obstacle/lidar/object_builder/min_box/BUILD b/modules/perception/obstacle/lidar/object_builder/min_box/BUILD index 8ca16f3db6..a44c679539 100644 --- a/modules/perception/obstacle/lidar/object_builder/min_box/BUILD +++ b/modules/perception/obstacle/lidar/object_builder/min_box/BUILD @@ -3,17 +3,17 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_lidar_object_builder_min_box", + name = "min_box", srcs = ["min_box.cc"], hdrs = ["min_box.h"], deps = [ "//modules/common", "//modules/common:log", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/lidar/interface:perception_obstacle_lidar_interface", + "//modules/perception/obstacle/common", + "//modules/perception/obstacle/lidar/interface", "@eigen", ], ) @@ -29,10 +29,10 @@ cc_test( "-lqhull", ], deps = [ - ":perception_obstacle_lidar_object_builder_min_box", - "//modules/perception/common:perception_common", + ":min_box", + "//modules/perception/common", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/common:perception_obstacle_common", + "//modules/perception/obstacle/common", "@gtest//:main", ], ) diff --git a/modules/perception/obstacle/lidar/roi_filter/hdmap_roi_filter/BUILD b/modules/perception/obstacle/lidar/roi_filter/hdmap_roi_filter/BUILD index 8f407b46c9..43fa001af7 100644 --- a/modules/perception/obstacle/lidar/roi_filter/hdmap_roi_filter/BUILD +++ b/modules/perception/obstacle/lidar/roi_filter/hdmap_roi_filter/BUILD @@ -21,9 +21,9 @@ cc_library( "//modules/common", "//modules/perception/lib/config_manager", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/lidar/interface:perception_obstacle_lidar_interface", - "//modules/perception/obstacle/onboard:perception_obstacle_hdmapinput", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/lidar/interface", + "//modules/perception/obstacle/onboard:hdmapinput", "@eigen", "@pcl", ], diff --git a/modules/perception/obstacle/lidar/segmentation/cnnseg/BUILD b/modules/perception/obstacle/lidar/segmentation/cnnseg/BUILD index e4bf815f35..750367b49c 100644 --- a/modules/perception/obstacle/lidar/segmentation/cnnseg/BUILD +++ b/modules/perception/obstacle/lidar/segmentation/cnnseg/BUILD @@ -3,7 +3,7 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_lidar_segmention_cnnseg", + name = "cnnseg", srcs = ["cnn_segmentation.cc"], hdrs = ["cnn_segmentation.h"], deps = [ @@ -12,8 +12,8 @@ cc_library( "//modules/perception/lib/base", "//modules/perception/lib/config_manager", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/lidar/interface:perception_obstacle_lidar_interface", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/lidar/interface", "//modules/perception/obstacle/lidar/segmentation/cnnseg:cnnseg_cluster2d", "//modules/perception/obstacle/lidar/segmentation/cnnseg:cnnseg_feature_generator", "//modules/perception/obstacle/lidar/segmentation/cnnseg:cnnseg_util", @@ -47,8 +47,8 @@ cc_library( deps = [ "//modules/common:log", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/common:perception_obstacle_common", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/common", "//modules/perception/obstacle/lidar/segmentation/cnnseg:cnnseg_util", "@caffe//:lib", ], @@ -66,11 +66,11 @@ cc_test( "//modules/perception/conf:perception_config", ], deps = [ - "perception_obstacle_lidar_segmention_cnnseg", + "cnnseg", "//modules/common:log", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", "@caffe//:lib", "@gtest//:main", "@opencv2//:core", diff --git a/modules/perception/obstacle/lidar/tracker/hm_tracker/BUILD b/modules/perception/obstacle/lidar/tracker/hm_tracker/BUILD index 16cc32418a..116b0dda11 100644 --- a/modules/perception/obstacle/lidar/tracker/hm_tracker/BUILD +++ b/modules/perception/obstacle/lidar/tracker/hm_tracker/BUILD @@ -3,7 +3,7 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_lidar_tracker_hm_tracker", + name = "hm_tracker", srcs = [ "feature_descriptor.cc", "hm_tracker.cc", @@ -28,12 +28,12 @@ cc_library( "//modules/common", "//modules/common:log", "//modules/perception/lib/config_manager", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/lidar/interface:perception_obstacle_lidar_interface", - "//modules/perception/obstacle/onboard:perception_obstacle_hdmapinput", - "@eigen//:eigen", - "@pcl//:pcl", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/common", + "//modules/perception/obstacle/lidar/interface", + "//modules/perception/obstacle/onboard:hdmapinput", + "@eigen", + "@pcl", ], ) @@ -52,12 +52,12 @@ cc_test( "-lqhull", ], deps = [ - ":perception_obstacle_lidar_tracker_hm_tracker", + ":hm_tracker", "//modules/common:log", "//modules/perception/lib/config_manager", - "//modules/perception/obstacle/lidar/object_builder/min_box:perception_obstacle_lidar_object_builder_min_box", + "//modules/perception/obstacle/lidar/object_builder/min_box", "@gtest//:main", - "@pcl//:pcl", + "@pcl", ], ) diff --git a/modules/perception/obstacle/lidar/type_fuser/sequence_type_fuser/BUILD b/modules/perception/obstacle/lidar/type_fuser/sequence_type_fuser/BUILD index 33ea0f6460..a0a3c2edd0 100644 --- a/modules/perception/obstacle/lidar/type_fuser/sequence_type_fuser/BUILD +++ b/modules/perception/obstacle/lidar/type_fuser/sequence_type_fuser/BUILD @@ -3,25 +3,25 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_lidar_type_fuser_sequence_type_fuser", + name = "sequence_type_fuser", srcs = [ "sequence_type_fuser.cc", - "util.cc" + "util.cc", ], hdrs = [ "sequence_type_fuser.h", - "util.h" + "util.h", ], deps = [ "//modules/common", "//modules/common:log", - "//modules/perception/lib/config_manager", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", + "//modules/perception/lib/config_manager", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/lidar/interface:perception_obstacle_lidar_interface", - "@eigen//:eigen", + "//modules/perception/obstacle/common", + "//modules/perception/obstacle/lidar/interface", + "@eigen", ], ) @@ -40,13 +40,13 @@ cc_test( "-lqhull", ], deps = [ - ":perception_obstacle_lidar_type_fuser_sequence_type_fuser", + ":sequence_type_fuser", "//modules/common:log", "//modules/perception/lib/config_manager", - "//modules/perception/obstacle/lidar/object_builder/min_box:perception_obstacle_lidar_object_builder_min_box", - "//modules/perception/obstacle/lidar/tracker/hm_tracker:perception_obstacle_lidar_tracker_hm_tracker", + "//modules/perception/obstacle/lidar/object_builder/min_box", + "//modules/perception/obstacle/lidar/tracker/hm_tracker", "@gtest//:main", - "@pcl//:pcl", + "@pcl", ], ) diff --git a/modules/perception/obstacle/lidar/visualizer/opengl_visualizer/BUILD b/modules/perception/obstacle/lidar/visualizer/opengl_visualizer/BUILD index b84020cd33..a5a59305f5 100644 --- a/modules/perception/obstacle/lidar/visualizer/opengl_visualizer/BUILD +++ b/modules/perception/obstacle/lidar/visualizer/opengl_visualizer/BUILD @@ -3,7 +3,7 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_lidar_opengl_visualizer", + name = "opengl_visualizer", srcs = [ "camera.cc", "frame_content.cc", @@ -24,13 +24,13 @@ cc_library( "//modules/common:log", "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/common:perception_obstacle_common", - "@eigen//:eigen", - "@glew//:glew", - "@glfw//:glfw", - "@pcl//:pcl", - "@vtk//:vtk", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/common", + "@eigen", + "@glew", + "@glfw", + "@pcl", + "@vtk", ], ) diff --git a/modules/perception/obstacle/onboard/BUILD b/modules/perception/obstacle/onboard/BUILD index d42b477953..b44c47c825 100644 --- a/modules/perception/obstacle/onboard/BUILD +++ b/modules/perception/obstacle/onboard/BUILD @@ -3,7 +3,7 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_hdmapinput", + name = "hdmapinput", srcs = ["hdmap_input.cc"], hdrs = ["hdmap_input.h"], deps = [ @@ -12,31 +12,31 @@ cc_library( "//modules/common/configs:config_gflags", "//modules/map/hdmap", "//modules/map/hdmap:hdmap_util", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", "@eigen", ], ) cc_library( - name = "perception_obstacle_lidar_process", + name = "lidar_process", srcs = ["lidar_process.cc"], hdrs = ["lidar_process.h"], deps = [ - ":perception_obstacle_hdmapinput", + ":hdmapinput", "//modules/common/adapters:adapter_manager", "//modules/perception/lib/config_manager", - "//modules/perception/obstacle/lidar/dummy:perception_obstacle_lidar_dummy", - "//modules/perception/obstacle/lidar/interface:perception_obstacle_lidar_interface", - "//modules/perception/obstacle/lidar/object_builder/min_box:perception_obstacle_lidar_object_builder_min_box", + "//modules/perception/obstacle/lidar/dummy", + "//modules/perception/obstacle/lidar/interface", + "//modules/perception/obstacle/lidar/object_builder/min_box", "//modules/perception/obstacle/lidar/roi_filter/hdmap_roi_filter", - "//modules/perception/obstacle/lidar/segmentation/cnnseg:perception_obstacle_lidar_segmention_cnnseg", - "//modules/perception/obstacle/lidar/tracker/hm_tracker:perception_obstacle_lidar_tracker_hm_tracker", - "//modules/perception/obstacle/lidar/type_fuser/sequence_type_fuser:perception_obstacle_lidar_type_fuser_sequence_type_fuser", - "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer:perception_obstacle_lidar_opengl_visualizer", - "//modules/perception/obstacle/radar/dummy:perception_obstacle_radar_dummy", + "//modules/perception/obstacle/lidar/segmentation/cnnseg", + "//modules/perception/obstacle/lidar/tracker/hm_tracker", + "//modules/perception/obstacle/lidar/type_fuser/sequence_type_fuser", + "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer", + "//modules/perception/obstacle/radar/dummy", "@ros//:ros_common", ], ) @@ -51,17 +51,17 @@ cc_library( "object_shared_data.h", ], deps = [ - ":perception_obstacle_hdmapinput", + ":hdmapinput", "//modules/common/adapters:adapter_manager", "//modules/perception/lib/config_manager", - "//modules/perception/obstacle/lidar/dummy:perception_obstacle_lidar_dummy", - "//modules/perception/obstacle/lidar/interface:perception_obstacle_lidar_interface", - "//modules/perception/obstacle/lidar/object_builder/min_box:perception_obstacle_lidar_object_builder_min_box", + "//modules/perception/obstacle/lidar/dummy", + "//modules/perception/obstacle/lidar/interface", + "//modules/perception/obstacle/lidar/object_builder/min_box", "//modules/perception/obstacle/lidar/roi_filter/hdmap_roi_filter", - "//modules/perception/obstacle/lidar/segmentation/cnnseg:perception_obstacle_lidar_segmention_cnnseg", - "//modules/perception/obstacle/lidar/tracker/hm_tracker:perception_obstacle_lidar_tracker_hm_tracker", - "//modules/perception/obstacle/lidar/type_fuser/sequence_type_fuser:perception_obstacle_lidar_type_fuser_sequence_type_fuser", - "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer:perception_obstacle_lidar_opengl_visualizer", + "//modules/perception/obstacle/lidar/segmentation/cnnseg", + "//modules/perception/obstacle/lidar/tracker/hm_tracker", + "//modules/perception/obstacle/lidar/type_fuser/sequence_type_fuser", + "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer", "//modules/perception/onboard:perception_onboard", "@ros//:ros_common", ], @@ -77,20 +77,20 @@ cc_library( "radar_process_subnode.h", ], deps = [ - ":perception_obstacle_hdmapinput", + ":hdmapinput", "//modules/common", "//modules/common:log", "//modules/common/adapters:adapter_manager", "//modules/common/configs:config_gflags", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/lib/config_manager", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/obstacle/base", "//modules/perception/obstacle/lidar/roi_filter/hdmap_roi_filter", - "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer:perception_obstacle_lidar_opengl_visualizer", - "//modules/perception/obstacle/radar/dummy:perception_obstacle_radar_dummy", - "//modules/perception/obstacle/radar/modest:perception_obstacle_radar_modest_modest_detector", + "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer", + "//modules/perception/obstacle/radar/dummy", + "//modules/perception/obstacle/radar/modest:modest_detector", "//modules/perception/onboard:perception_onboard", "@eigen", "@ros//:ros_common", @@ -107,19 +107,19 @@ cc_library( "object_shared_data.h", ], deps = [ - ":perception_obstacle_hdmapinput", + ":hdmapinput", "//modules/common/adapters:adapter_manager", "//modules/perception/lib/config_manager", "//modules/perception/obstacle/fusion/probabilistic_fusion", "//modules/perception/obstacle/lidar/roi_filter/hdmap_roi_filter", - "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer:perception_obstacle_lidar_opengl_visualizer", + "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer", "//modules/perception/onboard:perception_onboard", "@ros//:ros_common", ], ) cc_library( - name = "perception_obstacle_motion_manager_subnode", + name = "motion_manager_subnode", srcs = [ "motion_manager_service.cc", ], @@ -127,17 +127,16 @@ cc_library( "motion_manager_service.h", ], deps = [ - "//modules/common/adapters:adapter_manager", "//modules/perception/lib/config_manager", + "//modules/perception/obstacle/camera/motionmanager", "//modules/perception/onboard:perception_onboard", - "//modules/perception/obstacle/camera/motionmanager:perception_obstacle_camera_motionmanager", "@ros//:ros_common", ], ) cc_library( - name = "perception_obstacle_obstacle_perception", + name = "obstacle_perception", srcs = [ "obstacle_perception.cc", ], @@ -146,14 +145,14 @@ cc_library( "sensor_raw_frame.h", ], deps = [ - ":perception_obstacle_hdmapinput", + ":hdmapinput", "//modules/common/adapters:adapter_manager", "//modules/perception/lib/config_manager", "//modules/perception/obstacle/fusion/probabilistic_fusion", "//modules/perception/obstacle/lidar/roi_filter/hdmap_roi_filter", - "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer:perception_obstacle_lidar_opengl_visualizer", - "//modules/perception/obstacle/onboard:perception_obstacle_lidar_process", - "//modules/perception/obstacle/radar/modest:perception_obstacle_radar_modest_modest_detector", + "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer", + "//modules/perception/obstacle/onboard:lidar_process", + "//modules/perception/obstacle/radar/modest:modest_detector", "//modules/perception/onboard:perception_onboard", "@ros//:ros_common", ], @@ -170,8 +169,8 @@ cc_library( "fusion_shared_data.h", ], deps = [ + "//modules/perception/obstacle/base", "//modules/perception/onboard:perception_onboard", - "//modules/perception/obstacle/base:perception_obstacle_base", ], ) @@ -181,15 +180,16 @@ cc_library( "visualization_subnode.cc", ], hdrs = [ - "visualization_subnode.h", "object_shared_data.h", + "visualization_subnode.h", ], deps = [ + ":perception_obstacle_shared_data", "//modules/perception/lib/config_manager", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/camera/common:util", + "//modules/perception/obstacle/camera/visualizer", "//modules/perception/onboard:perception_onboard", - "//modules/perception/obstacle/base:perception_obstacle_base", - ":perception_obstacle_shared_data", - "//modules/perception/obstacle/camera/visualizer:perception_obstacle_camera_visualizer", ], ) @@ -204,14 +204,14 @@ cc_test( "//modules/perception:perception_data", ], deps = [ - ":perception_obstacle_hdmapinput", + ":hdmapinput", "//modules/common/configs:config_gflags", "@gtest//:main", ], ) cc_test( - name = "perception_obstacle_lidar_process_test", + name = "lidar_process_test", size = "small", srcs = [ "lidar_process_test.cc", @@ -221,7 +221,7 @@ cc_test( "//modules/perception:perception_data", ], deps = [ - ":perception_obstacle_lidar_process", + ":lidar_process", "@gtest//:main", ], ) diff --git a/modules/perception/obstacle/radar/dummy/BUILD b/modules/perception/obstacle/radar/dummy/BUILD index e4fa67007a..daff6a402f 100644 --- a/modules/perception/obstacle/radar/dummy/BUILD +++ b/modules/perception/obstacle/radar/dummy/BUILD @@ -3,7 +3,7 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_radar_dummy", + name = "dummy", srcs = [ "dummy_algorithms.cc", ], @@ -12,8 +12,8 @@ cc_library( ], deps = [ "//modules/common:log", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/radar/interface:perception_obstacle_radar_interface", + "//modules/perception/obstacle/common", + "//modules/perception/obstacle/radar/interface", "@eigen", "@pcl", ], diff --git a/modules/perception/obstacle/radar/interface/BUILD b/modules/perception/obstacle/radar/interface/BUILD index 64065a8a28..dbcb748981 100644 --- a/modules/perception/obstacle/radar/interface/BUILD +++ b/modules/perception/obstacle/radar/interface/BUILD @@ -3,15 +3,15 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_radar_interface", + name = "interface", srcs = [], hdrs = glob(["*.h"]), deps = [ "//modules/drivers/proto:sensor_proto", "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/base:perception_obstacle_base", - "//modules/perception/obstacle/onboard:perception_obstacle_hdmapinput", + "//modules/perception/obstacle/base", + "//modules/perception/obstacle/onboard:hdmapinput", "@eigen", ], ) diff --git a/modules/perception/obstacle/radar/modest/BUILD b/modules/perception/obstacle/radar/modest/BUILD index eb415e831e..933bb23442 100644 --- a/modules/perception/obstacle/radar/modest/BUILD +++ b/modules/perception/obstacle/radar/modest/BUILD @@ -3,7 +3,7 @@ load("//tools:cpplint.bzl", "cpplint") package(default_visibility = ["//visibility:public"]) cc_library( - name = "perception_obstacle_radar_modest_modest_detector", + name = "modest_detector", srcs = [ "conti_radar_id_expansion.cc", "conti_radar_util.cc", @@ -26,8 +26,8 @@ cc_library( deps = [ "//modules/common:log", "//modules/perception/lib/config_manager", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/radar/interface:perception_obstacle_radar_interface", + "//modules/perception/obstacle/common", + "//modules/perception/obstacle/radar/interface", "@eigen", "@pcl", ], @@ -40,10 +40,10 @@ cc_test( "conti_radar_id_expansion_test.cc", ], deps = [ + ":modest_detector", "//external:gflags", "//modules/common:log", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/radar/modest:perception_obstacle_radar_modest_modest_detector", "@gtest", "@gtest//:main", ], @@ -61,10 +61,10 @@ cc_test( "//modules/perception/conf:perception_config", ], deps = [ + ":modest_detector", "//external:gflags", "//modules/common:log", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/radar/modest:perception_obstacle_radar_modest_modest_detector", "@gtest", "@gtest//:main", ], @@ -82,10 +82,10 @@ cc_test( "//modules/perception/conf:perception_config", ], deps = [ + ":modest_detector", "//external:gflags", "//modules/common:log", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/radar/modest:perception_obstacle_radar_modest_modest_detector", "@gtest", "@gtest//:main", ], diff --git a/modules/perception/onboard/BUILD b/modules/perception/onboard/BUILD index 1f5d3f9328..8f1931f260 100644 --- a/modules/perception/onboard/BUILD +++ b/modules/perception/onboard/BUILD @@ -30,7 +30,7 @@ cc_library( "//modules/common/adapters:adapter_manager", "//modules/common/configs:config_gflags", "//modules/common/status", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/onboard/proto:dag_proto", "@eigen", diff --git a/modules/perception/tool/export_sensor_data/BUILD b/modules/perception/tool/export_sensor_data/BUILD index e63ac2a00f..a6fd8136ab 100644 --- a/modules/perception/tool/export_sensor_data/BUILD +++ b/modules/perception/tool/export_sensor_data/BUILD @@ -13,10 +13,10 @@ cc_library( "//modules/common:apollo_app", "//modules/common:log", "//modules/common/adapters:adapter_manager", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/radar/modest:perception_obstacle_radar_modest_modest_detector", + "//modules/perception/obstacle/radar/modest:modest_detector", "//modules/perception/onboard:perception_onboard", "@pcl", "@ros//:ros_common", @@ -28,13 +28,13 @@ cc_binary( srcs = ["export_sensor_data_main.cc"], data = [ "//modules/perception/conf:perception_adapter_manager_config", - "//modules/perception/tool/export_sensor_data/conf:perception_tool_export_sensor_data_config", + "//modules/perception/tool/export_sensor_data/conf:config", ], deps = [ ":export_sensor_data_lib", "//external:gflags", "//modules/common:log", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/lib/pcl_util", "//modules/perception/proto:perception_proto", diff --git a/modules/perception/tool/export_sensor_data/conf/BUILD b/modules/perception/tool/export_sensor_data/conf/BUILD index 4e941eaed6..da43fb8bf0 100644 --- a/modules/perception/tool/export_sensor_data/conf/BUILD +++ b/modules/perception/tool/export_sensor_data/conf/BUILD @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) filegroup( - name = "perception_tool_export_sensor_data_config", + name = "config", srcs = [ "export_sensor_data.flag", ], diff --git a/modules/perception/tool/offline_visualizer_tool/BUILD b/modules/perception/tool/offline_visualizer_tool/BUILD index 61c8a079a8..669999ead6 100644 --- a/modules/perception/tool/offline_visualizer_tool/BUILD +++ b/modules/perception/tool/offline_visualizer_tool/BUILD @@ -7,19 +7,19 @@ cc_binary( srcs = ["offline_lidar_visualizer_tool.cc"], data = [ "//modules/perception:perception_model", - "//modules/perception/tool/offline_visualizer_tool/conf:perception_tool_config", + "//modules/perception/tool/offline_visualizer_tool/conf:config", ], linkstatic = 0, deps = [ "//modules/common", "//modules/common:log", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/lib/config_manager", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer:perception_obstacle_lidar_opengl_visualizer", - "//modules/perception/obstacle/onboard:perception_obstacle_lidar_process", + "//modules/perception/obstacle/common", + "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer", + "//modules/perception/obstacle/onboard:lidar_process", "@eigen", "@glew", "@glfw", @@ -32,20 +32,20 @@ cc_binary( srcs = ["offline_sequential_obstacle_perception_test.cc"], data = [ "//modules/perception:perception_model", - "//modules/perception/tool/offline_visualizer_tool/conf:perception_tool_config", + "//modules/perception/tool/offline_visualizer_tool/conf:config", ], linkstatic = 0, deps = [ "//modules/common", "//modules/common:log", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/lib/base", "//modules/perception/lib/config_manager", "//modules/perception/lib/pcl_util", - "//modules/perception/obstacle/common:perception_obstacle_common", - "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer:perception_obstacle_lidar_opengl_visualizer", - "//modules/perception/obstacle/onboard:perception_obstacle_lidar_process", - "//modules/perception/obstacle/onboard:perception_obstacle_obstacle_perception", + "//modules/perception/obstacle/common", + "//modules/perception/obstacle/lidar/visualizer/opengl_visualizer", + "//modules/perception/obstacle/onboard:lidar_process", + "//modules/perception/obstacle/onboard:obstacle_perception", "@eigen", "@glew", "@glfw", diff --git a/modules/perception/tool/offline_visualizer_tool/conf/BUILD b/modules/perception/tool/offline_visualizer_tool/conf/BUILD index 1e3de3a6dc..1a859827ba 100644 --- a/modules/perception/tool/offline_visualizer_tool/conf/BUILD +++ b/modules/perception/tool/offline_visualizer_tool/conf/BUILD @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) filegroup( - name = "perception_tool_config", + name = "config", srcs = [ "config_manager.config", "offline_lidar_perception_test.flag", diff --git a/modules/perception/traffic_light/rectify/BUILD b/modules/perception/traffic_light/rectify/BUILD index fdb11494e7..83a7eb0695 100644 --- a/modules/perception/traffic_light/rectify/BUILD +++ b/modules/perception/traffic_light/rectify/BUILD @@ -22,7 +22,7 @@ cc_library( "//modules/common/proto:header_proto", "//modules/map/proto:map_proto", "//modules/perception/lib/config_manager", - "//modules/perception/obstacle/common:perception_obstacle_common", + "//modules/perception/obstacle/common", "//modules/perception/proto:perception_proto", "//modules/perception/traffic_light/base:perception_traffic_light_base", "//modules/perception/traffic_light/interface:perception_traffic_light_interface", @@ -44,8 +44,8 @@ cc_test( deps = [ "perception_traffic_light_rectify", "//modules/common:log", - "//modules/perception/common:perception_common", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/common", + "//modules/perception/obstacle/base", "@caffe//:lib", "@gtest//:main", "@opencv2//:core", diff --git a/modules/perception/traffic_light/reviser/BUILD b/modules/perception/traffic_light/reviser/BUILD index ca52a5f46a..9f0d58f00e 100644 --- a/modules/perception/traffic_light/reviser/BUILD +++ b/modules/perception/traffic_light/reviser/BUILD @@ -36,8 +36,8 @@ cc_test( deps = [ "perception_traffic_light_reviser", "//modules/common:log", - "//modules/perception/common:perception_common", - "//modules/perception/obstacle/base:perception_obstacle_base", + "//modules/perception/common", + "//modules/perception/obstacle/base", "@caffe//:lib", "@gtest//:main", "@opencv2//:core", diff --git a/modules/perception/traffic_light/visualizer/BUILD b/modules/perception/traffic_light/visualizer/BUILD index a73153efe2..88ef213624 100644 --- a/modules/perception/traffic_light/visualizer/BUILD +++ b/modules/perception/traffic_light/visualizer/BUILD @@ -15,7 +15,7 @@ cc_binary( "//modules/perception/traffic_light/base:perception_traffic_light_base", "//modules/perception/traffic_light/util:perception_traffic_light_util", "//modules/perception/lib/base", - "//modules/perception/common:perception_common", + "//modules/perception/common", "//modules/perception/proto:perception_proto", "@ros//:ros_common", ], -- GitLab