Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
27ee9084
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
27ee9084
编写于
9月 25, 2018
作者:
D
Dong Li
提交者:
Liangliang Zhang
9月 25, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
perception: change log.h to cybertron log
上级
99e20d21
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
49 addition
and
40 deletion
+49
-40
modules/perception/common/io/io_util.cc
modules/perception/common/io/io_util.cc
+1
-1
modules/perception/fusion/base/fusion_log.h
modules/perception/fusion/base/fusion_log.h
+1
-1
modules/perception/fusion/base/sensor.cc
modules/perception/fusion/base/sensor.cc
+1
-1
modules/perception/fusion/base/sensor_data_manager.cc
modules/perception/fusion/base/sensor_data_manager.cc
+1
-1
modules/perception/fusion/common/dst_evidence.cc
modules/perception/fusion/common/dst_evidence.cc
+1
-1
modules/perception/fusion/common/kalman_filter.cc
modules/perception/fusion/common/kalman_filter.cc
+1
-1
modules/perception/fusion/test/fusion_common_camera_util_test.cc
.../perception/fusion/test/fusion_common_camera_util_test.cc
+1
-1
modules/perception/fusion/test/fusion_common_dst_evidence_test.cc
...perception/fusion/test/fusion_common_dst_evidence_test.cc
+1
-1
modules/perception/fusion/test/fusion_common_information_filter_test.cc
...tion/fusion/test/fusion_common_information_filter_test.cc
+1
-1
modules/perception/fusion/test/fusion_common_kalman_filter_test.cc
...erception/fusion/test/fusion_common_kalman_filter_test.cc
+1
-1
modules/perception/inference/tensorrt/batch_stream.cc
modules/perception/inference/tensorrt/batch_stream.cc
+1
-1
modules/perception/inference/tensorrt/rt_net.cc
modules/perception/inference/tensorrt/rt_net.cc
+1
-1
modules/perception/inference/test/inference_batch_stream_test.cc
.../perception/inference/test/inference_batch_stream_test.cc
+1
-1
modules/perception/inference/test/inference_entropy_calibrator_test.cc
...ption/inference/test/inference_entropy_calibrator_test.cc
+1
-1
modules/perception/lidar/lib/segmentation/cnnseg/cnn_segmentation.cc
...ception/lidar/lib/segmentation/cnnseg/cnn_segmentation.cc
+1
-1
modules/perception/lidar/lib/tracker/hm_tracker/gnn_bipartite_graph_matcher.cc
...dar/lib/tracker/hm_tracker/gnn_bipartite_graph_matcher.cc
+1
-1
modules/perception/lidar/lib/tracker/hm_tracker/kalman_filter.cc
.../perception/lidar/lib/tracker/hm_tracker/kalman_filter.cc
+1
-1
modules/perception/lidar/lib/tracker/hm_tracker/multi_hm_bipartite_graph_matcher.cc
...ib/tracker/hm_tracker/multi_hm_bipartite_graph_matcher.cc
+1
-1
modules/perception/lidar/lib/tracker/hm_tracker/tracker.cc
modules/perception/lidar/lib/tracker/hm_tracker/tracker.cc
+1
-1
modules/perception/lidar/test/lidar_lib_hm_tracker_bipartite_graph_matcher_test.cc
...test/lidar_lib_hm_tracker_bipartite_graph_matcher_test.cc
+1
-1
modules/perception/map/hdmap/BUILD
modules/perception/map/hdmap/BUILD
+4
-1
modules/perception/map/hdmap/hdmap_input.cc
modules/perception/map/hdmap/hdmap_input.cc
+7
-5
modules/perception/map/hdmap/hdmap_input_test.cc
modules/perception/map/hdmap/hdmap_input_test.cc
+14
-10
modules/perception/onboard/msg_buffer/msg_buffer.h
modules/perception/onboard/msg_buffer/msg_buffer.h
+1
-1
modules/perception/onboard/msg_serializer/msg_serializer.cc
modules/perception/onboard/msg_serializer/msg_serializer.cc
+1
-1
modules/perception/onboard/transform_wrapper/transform_wrapper.cc
...perception/onboard/transform_wrapper/transform_wrapper.cc
+1
-1
modules/perception/proto/BUILD
modules/perception/proto/BUILD
+1
-1
未找到文件。
modules/perception/common/io/io_util.cc
浏览文件 @
27ee9084
...
...
@@ -27,7 +27,7 @@
#include <iomanip>
#include "modules/perception/base/camera.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/lib/io/file_util.h"
namespace
apollo
{
...
...
modules/perception/fusion/base/fusion_log.h
浏览文件 @
27ee9084
...
...
@@ -15,7 +15,7 @@
*****************************************************************************/
#ifndef MODULES_PERCEPTION_FUSION_BASE_LOG_H_
#define MODULES_PERCEPTION_FUSION_BASE_LOG_H_
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
// 500-599 reserve for fusion module error
#define FUSION_GET_POSE_ERROR 500 // get pose error
#define FUSION_GET_HDMAP_ERROR 501 // get hdmap error
...
...
modules/perception/fusion/base/sensor.cc
浏览文件 @
27ee9084
...
...
@@ -17,7 +17,7 @@
#include <assert.h>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
namespace
apollo
{
namespace
perception
{
...
...
modules/perception/fusion/base/sensor_data_manager.cc
浏览文件 @
27ee9084
...
...
@@ -17,7 +17,7 @@
#include <utility>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
namespace
apollo
{
namespace
perception
{
...
...
modules/perception/fusion/common/dst_evidence.cc
浏览文件 @
27ee9084
...
...
@@ -20,7 +20,7 @@
#include "boost/format.hpp"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
namespace
apollo
{
namespace
perception
{
...
...
modules/perception/fusion/common/kalman_filter.cc
浏览文件 @
27ee9084
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*****************************************************************************/
#include "modules/perception/fusion/common/kalman_filter.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
namespace
apollo
{
namespace
perception
{
...
...
modules/perception/fusion/test/fusion_common_camera_util_test.cc
浏览文件 @
27ee9084
...
...
@@ -16,7 +16,7 @@
#include <gtest/gtest.h>
#include <iostream>
#include <vector>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/fusion/base/sensor_data_manager.h"
#include "modules/perception/fusion/common/camera_util.h"
...
...
modules/perception/fusion/test/fusion_common_dst_evidence_test.cc
浏览文件 @
27ee9084
...
...
@@ -21,7 +21,7 @@
#include "boost/format.hpp"
#include "gtest/gtest.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/fusion/common/dst_evidence.h"
...
...
modules/perception/fusion/test/fusion_common_information_filter_test.cc
浏览文件 @
27ee9084
...
...
@@ -15,7 +15,7 @@
*****************************************************************************/
#include <gtest/gtest.h>
#include <iostream>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/fusion/common/information_filter.h"
namespace
apollo
{
...
...
modules/perception/fusion/test/fusion_common_kalman_filter_test.cc
浏览文件 @
27ee9084
...
...
@@ -17,7 +17,7 @@
#include <iostream>
#include <vector>
#define private public
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/fusion/common/kalman_filter.h"
namespace
apollo
{
...
...
modules/perception/inference/tensorrt/batch_stream.cc
浏览文件 @
27ee9084
...
...
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cstdio>
#include <string>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
namespace
apollo
{
namespace
perception
{
...
...
modules/perception/inference/tensorrt/rt_net.cc
浏览文件 @
27ee9084
...
...
@@ -19,7 +19,7 @@
#include <set>
#include <vector>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/inference/tensorrt/plugins/argmax_plugin.h"
#include "modules/perception/inference/tensorrt/plugins/slice_plugin.h"
#include "modules/perception/inference/tensorrt/plugins/softmax_plugin.h"
...
...
modules/perception/inference/test/inference_batch_stream_test.cc
浏览文件 @
27ee9084
...
...
@@ -18,7 +18,7 @@
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp>
#include "gtest/gtest.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#define private public
...
...
modules/perception/inference/test/inference_entropy_calibrator_test.cc
浏览文件 @
27ee9084
...
...
@@ -18,7 +18,7 @@
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp>
#include "gtest/gtest.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#define private public
...
...
modules/perception/lidar/lib/segmentation/cnnseg/cnn_segmentation.cc
浏览文件 @
27ee9084
...
...
@@ -17,7 +17,7 @@
#include <string>
#include <vector>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/base/object_pool_types.h"
#include "modules/perception/lib/config_manager/config_manager.h"
#include "modules/perception/lib/io/file_util.h"
...
...
modules/perception/lidar/lib/tracker/hm_tracker/gnn_bipartite_graph_matcher.cc
浏览文件 @
27ee9084
...
...
@@ -17,7 +17,7 @@
#include <algorithm>
#include <iostream>
#include <vector>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
namespace
apollo
{
namespace
perception
{
...
...
modules/perception/lidar/lib/tracker/hm_tracker/kalman_filter.cc
浏览文件 @
27ee9084
...
...
@@ -15,7 +15,7 @@
*****************************************************************************/
#include "modules/perception/lidar/lib/tracker/hm_tracker/kalman_filter.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/common/geometry/basic.h"
#include "modules/perception/lib/config_manager/config_manager.h"
#include "modules/perception/lib/io/file_util.h"
...
...
modules/perception/lidar/lib/tracker/hm_tracker/multi_hm_bipartite_graph_matcher.cc
浏览文件 @
27ee9084
...
...
@@ -15,7 +15,7 @@
*****************************************************************************/
#include "modules/perception/lidar/lib/tracker/hm_tracker/multi_hm_bipartite_graph_matcher.h"
#include <Eigen/Core>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/common/graph/gated_hungarian_bigraph_matcher.h"
namespace
apollo
{
...
...
modules/perception/lidar/lib/tracker/hm_tracker/tracker.cc
浏览文件 @
27ee9084
...
...
@@ -15,7 +15,7 @@
*****************************************************************************/
#include "modules/perception/lidar/lib/tracker/hm_tracker/tracker.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/lib/config_manager/config_manager.h"
#include "modules/perception/lib/io/file_util.h"
#include "modules/perception/lib/io/protobuf_util.h"
...
...
modules/perception/lidar/test/lidar_lib_hm_tracker_bipartite_graph_matcher_test.cc
浏览文件 @
27ee9084
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*****************************************************************************/
#include <gtest/gtest.h>
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/common/graph/secure_matrix.h"
#include "modules/perception/lidar/lib/tracker/hm_tracker/gnn_bipartite_graph_matcher.h"
#include "modules/perception/lidar/lib/tracker/hm_tracker/multi_hm_bipartite_graph_matcher.h"
...
...
modules/perception/map/hdmap/BUILD
浏览文件 @
27ee9084
...
...
@@ -13,7 +13,10 @@ cc_library(
deps
=
[
"//modules/perception/base:base_type"
,
"//modules/perception/base:point_cloud"
,
"//modules/perception/common/geometry:common"
,
"//modules/perception/lib/config_manager"
,
"//modules/perception/lib/singleton"
,
"//modules/perception/proto:perception_config_schema_proto"
,
],
)
...
...
@@ -24,8 +27,8 @@ cc_test(
"hdmap_input_test.cc"
,
],
deps
=
[
"@gtest//:main"
,
":hdmap_input"
,
"@gtest//:main"
,
],
)
...
...
modules/perception/map/hdmap/hdmap_input.cc
浏览文件 @
27ee9084
...
...
@@ -17,8 +17,11 @@
#include "modules/perception/map/hdmap/hdmap_input.h"
#include <algorithm>
// #include "modules/perception/base/log.h"
// #include "modules/perception/common/geometry/common.h"
#include <string>
#include <vector>
#include "cybertron/common/log.h"
#include "modules/perception/common/geometry/common.h"
// #include "hdmap_definitions.h" // NOLINT
// #include "hdmap_trajectory.h" // NOLINT
// #include "modules/perception/base/object_pool_types.h"
...
...
@@ -40,8 +43,8 @@ namespace map {
// using lib::ConfigManager;
// using base::PolygonDType;
using
base
::
RoadBoundary
;
using
base
::
PointD
;
using
base
::
RoadBoundary
;
// using base::PointDCloud;
// using base::PointDCloudPtr;
// HDMapInput
...
...
@@ -100,8 +103,7 @@ bool HDMapInput::InitHDMap() {
}
bool
HDMapInput
::
GetRoiHDMapStruct
(
const
base
::
PointD
&
pointd
,
const
double
distance
,
const
base
::
PointD
&
pointd
,
const
double
distance
,
std
::
shared_ptr
<
base
::
HdmapStruct
>
hdmap_struct_prt
)
{
// lib::MutexLock lock(&mutex_);
// CHECK_NOTNULL(hdmap_.get());
...
...
modules/perception/map/hdmap/hdmap_input_test.cc
浏览文件 @
27ee9084
...
...
@@ -14,11 +14,15 @@
* limitations under the License.
*****************************************************************************/
#include "modules/perception/map/hdmap/hdmap_input.h"
#include <gflags/gflags.h>
#include <gtest/gtest.h>
// #include "modules/perception/base/log.h"
// #include "modules/perception/lib/config_manager/config_manager.h"
#include "modules/perception/map/hdmap/hdmap_input.h"
#include "cybertron/common/log.h"
#include "modules/perception/lib/config_manager/config_manager.h"
namespace
apollo
{
namespace
perception
{
namespace
lib
{
...
...
@@ -32,13 +36,13 @@ namespace map {
class
HDMapInputTest
:
public
testing
::
Test
{
protected:
virtual
void
SetUp
()
{
// char* cybertron_path = "CYBERTRON_PATH=";
// putenv(cybertron_path);
// char* module_path = "MODULE_PATH=";
// putenv(module_path);
// lib::FLAGS_config_manager_path = "./map_test_data/hdmap/conf";
// config_manager_ = lib::Singleton<ConfigManager>::get_instance();
// ASSERT_TRUE(config_manager_ != NULL);
// char* cybertron_path = "CYBERTRON_PATH=";
// putenv(cybertron_path);
// char* module_path = "MODULE_PATH=";
// putenv(module_path);
// lib::FLAGS_config_manager_path = "./map_test_data/hdmap/conf";
// config_manager_ = lib::Singleton<ConfigManager>::get_instance();
// ASSERT_TRUE(config_manager_ != NULL);
}
protected:
...
...
modules/perception/onboard/msg_buffer/msg_buffer.h
浏览文件 @
27ee9084
...
...
@@ -25,7 +25,7 @@
#include "cybertron/component/component.h"
#include "float.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
namespace
apollo
{
namespace
perception
{
...
...
modules/perception/onboard/msg_serializer/msg_serializer.cc
浏览文件 @
27ee9084
...
...
@@ -16,7 +16,7 @@
#include "modules/perception/onboard/msg_serializer/msg_serializer.h"
#include "modules/perception/onboard/common_flags/common_flags.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/lib/utils/time_util.h"
namespace
apollo
{
...
...
modules/perception/onboard/transform_wrapper/transform_wrapper.cc
浏览文件 @
27ee9084
...
...
@@ -15,7 +15,7 @@
*****************************************************************************/
#include "modules/perception/onboard/transform_wrapper/transform_wrapper.h"
#include "
modules/perception/base
/log.h"
#include "
cybertron/common
/log.h"
#include "modules/perception/common/sensor_manager/sensor_manager.h"
namespace
apollo
{
...
...
modules/perception/proto/BUILD
浏览文件 @
27ee9084
...
...
@@ -16,10 +16,10 @@ proto_library(
"traffic_light_detection.proto"
,
],
deps
=
[
"//modules/map/proto:map_proto_lib"
,
"//modules/common/proto:error_code_proto_lib"
,
"//modules/common/proto:geometry_proto_lib"
,
"//modules/common/proto:header_proto_lib"
,
"//modules/map/proto:map_proto_lib"
,
],
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录