Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
6c051a55
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 10 个月
通知
995
Star
71100
Fork
55580
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
6c051a55
编写于
3月 16, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: don't add include <module>/src directory to avoid conflicts
during opencv_world builds
上级
22ecdd16
变更
28
隐藏空白更改
内联
并排
Showing
28 changed file
with
45 addition
and
46 deletion
+45
-46
cmake/OpenCVCompilerOptimizations.cmake
cmake/OpenCVCompilerOptimizations.cmake
+3
-3
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+0
-1
cmake/cl2cpp.cmake
cmake/cl2cpp.cmake
+1
-1
modules/core/src/logger.cpp
modules/core/src/logger.cpp
+1
-1
modules/core/src/trace.cpp
modules/core/src/trace.cpp
+1
-1
modules/core/src/utils/filesystem.cpp
modules/core/src/utils/filesystem.cpp
+1
-1
modules/dnn/src/layers/batch_norm_layer.cpp
modules/dnn/src/layers/batch_norm_layer.cpp
+2
-2
modules/dnn/src/layers/concat_layer.cpp
modules/dnn/src/layers/concat_layer.cpp
+2
-2
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/convolution_layer.cpp
+2
-2
modules/dnn/src/layers/detection_output_layer.cpp
modules/dnn/src/layers/detection_output_layer.cpp
+1
-1
modules/dnn/src/layers/elementwise_layers.cpp
modules/dnn/src/layers/elementwise_layers.cpp
+2
-2
modules/dnn/src/layers/eltwise_layer.cpp
modules/dnn/src/layers/eltwise_layer.cpp
+2
-2
modules/dnn/src/layers/flatten_layer.cpp
modules/dnn/src/layers/flatten_layer.cpp
+1
-1
modules/dnn/src/layers/fully_connected_layer.cpp
modules/dnn/src/layers/fully_connected_layer.cpp
+2
-2
modules/dnn/src/layers/layers_common.hpp
modules/dnn/src/layers/layers_common.hpp
+1
-1
modules/dnn/src/layers/lrn_layer.cpp
modules/dnn/src/layers/lrn_layer.cpp
+2
-2
modules/dnn/src/layers/max_unpooling_layer.cpp
modules/dnn/src/layers/max_unpooling_layer.cpp
+1
-1
modules/dnn/src/layers/padding_layer.cpp
modules/dnn/src/layers/padding_layer.cpp
+1
-1
modules/dnn/src/layers/permute_layer.cpp
modules/dnn/src/layers/permute_layer.cpp
+1
-1
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
+2
-2
modules/dnn/src/layers/prior_box_layer.cpp
modules/dnn/src/layers/prior_box_layer.cpp
+1
-1
modules/dnn/src/layers/region_layer.cpp
modules/dnn/src/layers/region_layer.cpp
+1
-1
modules/dnn/src/layers/reshape_layer.cpp
modules/dnn/src/layers/reshape_layer.cpp
+1
-1
modules/dnn/src/layers/scale_layer.cpp
modules/dnn/src/layers/scale_layer.cpp
+2
-2
modules/dnn/src/layers/shift_layer.cpp
modules/dnn/src/layers/shift_layer.cpp
+1
-1
modules/dnn/src/layers/softmax_layer.cpp
modules/dnn/src/layers/softmax_layer.cpp
+2
-2
modules/dnn/src/nms.cpp
modules/dnn/src/nms.cpp
+1
-1
modules/viz/src/precomp.hpp
modules/viz/src/precomp.hpp
+7
-7
未找到文件。
cmake/OpenCVCompilerOptimizations.cmake
浏览文件 @
6c051a55
...
...
@@ -743,11 +743,11 @@ endmacro()
macro
(
ocv_add_dispatched_file filename
)
if
(
NOT OPENCV_INITIAL_PASS
)
set
(
__codestr
"
#include
\"
precomp.hpp
\"
#include
\"
${
filename
}
.simd.hpp
\"
#include
\"
${
CMAKE_CURRENT_LIST_DIR
}
/src/
precomp.hpp
\"
#include
\"
${
CMAKE_CURRENT_LIST_DIR
}
/src/
${
filename
}
.simd.hpp
\"
"
)
set
(
__declarations_str
"#define CV_CPU_SIMD_FILENAME
\"
${
filename
}
.simd.hpp
\"
"
)
set
(
__declarations_str
"#define CV_CPU_SIMD_FILENAME
\"
${
CMAKE_CURRENT_LIST_DIR
}
/src/
${
filename
}
.simd.hpp
\"
"
)
set
(
__dispatch_modes
"BASELINE"
)
set
(
__optimizations
"
${
ARGN
}
"
)
...
...
cmake/OpenCVModule.cmake
浏览文件 @
6c051a55
...
...
@@ -700,7 +700,6 @@ endmacro()
macro
(
ocv_module_include_directories
)
ocv_target_include_directories
(
${
the_module
}
"
${
OPENCV_MODULE_
${
the_module
}
_LOCATION
}
/include"
"
${
OPENCV_MODULE_
${
the_module
}
_LOCATION
}
/src"
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
# for precompiled headers
)
ocv_target_include_modules
(
${
the_module
}
${
OPENCV_MODULE_
${
the_module
}
_DEPS
}
${
ARGN
}
)
...
...
cmake/cl2cpp.cmake
浏览文件 @
6c051a55
...
...
@@ -17,7 +17,7 @@ set(nested_namespace_end "}")
set
(
STR_CPP
"// This file is auto-generated. Do not edit!
#include
\"
precomp
.hpp
\"
#include
\"
opencv2/core
.hpp
\"
#include
\"
cvconfig.h
\"
#include
\"
${
OUTPUT_HPP_NAME
}
\"
...
...
modules/core/src/logger.cpp
浏览文件 @
6c051a55
...
...
@@ -2,7 +2,7 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
#include
<precomp.hpp>
#include
"precomp.hpp"
#include <opencv2/core/utils/configuration.private.hpp>
#include <opencv2/core/utils/logger.hpp>
...
...
modules/core/src/trace.cpp
浏览文件 @
6c051a55
...
...
@@ -2,7 +2,7 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
#include
<precomp.hpp>
#include
"precomp.hpp"
#include <opencv2/core/utils/trace.hpp>
#include <opencv2/core/utils/trace.private.hpp>
...
...
modules/core/src/utils/filesystem.cpp
浏览文件 @
6c051a55
...
...
@@ -2,7 +2,7 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
#include "precomp.hpp"
#include "
../
precomp.hpp"
#include <opencv2/core/utils/configuration.private.hpp>
...
...
modules/dnn/src/layers/batch_norm_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -10,8 +10,8 @@ Implementation of Batch Normalization layer.
*/
#include "../precomp.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#include <opencv2/dnn/shape_utils.hpp>
#ifdef HAVE_OPENCL
...
...
modules/dnn/src/layers/concat_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,8 +42,8 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#ifdef HAVE_OPENCL
#include "opencl_kernels_dnn.hpp"
...
...
modules/dnn/src/layers/convolution_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,8 +42,8 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#include "opencv2/core/hal/hal.hpp"
#include "opencv2/core/hal/intrin.hpp"
#include <iostream>
...
...
modules/dnn/src/layers/detection_output_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,7 +42,7 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_inf_engine.hpp"
#include <float.h>
#include <string>
#include "../nms.inl.hpp"
...
...
modules/dnn/src/layers/elementwise_layers.cpp
浏览文件 @
6c051a55
...
...
@@ -42,8 +42,8 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#include "opencv2/imgproc.hpp"
#include <opencv2/dnn/shape_utils.hpp>
#include <iostream>
...
...
modules/dnn/src/layers/eltwise_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,8 +42,8 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#ifdef HAVE_OPENCL
#include "opencl_kernels_dnn.hpp"
...
...
modules/dnn/src/layers/flatten_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,7 +42,7 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_inf_engine.hpp"
#include <float.h>
#include <algorithm>
#include <opencv2/dnn/shape_utils.hpp>
...
...
modules/dnn/src/layers/fully_connected_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,8 +42,8 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#include <opencv2/dnn/shape_utils.hpp>
#ifdef HAVE_OPENCL
...
...
modules/dnn/src/layers/layers_common.hpp
浏览文件 @
6c051a55
...
...
@@ -47,7 +47,7 @@
#define CV_CPU_OPTIMIZATION_DECLARATIONS_ONLY
// dispatched AVX/AVX2 optimizations
#include "
layers
/layers_common.simd.hpp"
#include "
.
/layers_common.simd.hpp"
#include "layers/layers_common.simd_declarations.hpp"
#undef CV_CPU_OPTIMIZATION_DECLARATIONS_ONLY
...
...
modules/dnn/src/layers/lrn_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,8 +42,8 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/dnn/shape_utils.hpp"
#include "opencv2/core/hal/hal.hpp"
...
...
modules/dnn/src/layers/max_unpooling_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -11,7 +11,7 @@ Implementation of Batch Normalization layer.
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "
../
op_halide.hpp"
#include <opencv2/dnn/shape_utils.hpp>
#include <iostream>
...
...
modules/dnn/src/layers/padding_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -11,7 +11,7 @@ Implementation of padding layer, which adds paddings to input blob.
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "
../
op_halide.hpp"
#include <vector>
namespace
cv
...
...
modules/dnn/src/layers/permute_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,7 +42,7 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_inf_engine.hpp"
#include <float.h>
#include <algorithm>
...
...
modules/dnn/src/layers/pooling_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -43,8 +43,8 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "opencv2/core/hal/intrin.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#include <float.h>
#include <algorithm>
using
std
::
max
;
...
...
modules/dnn/src/layers/prior_box_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,7 +42,7 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_inf_engine.hpp"
#include <float.h>
#include <algorithm>
#include <cmath>
...
...
modules/dnn/src/layers/region_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -43,7 +43,7 @@
#include "../precomp.hpp"
#include <opencv2/dnn/shape_utils.hpp>
#include <opencv2/dnn/all_layers.hpp>
#include "nms.inl.hpp"
#include "
../
nms.inl.hpp"
#ifdef HAVE_OPENCL
#include "opencl_kernels_dnn.hpp"
...
...
modules/dnn/src/layers/reshape_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,7 +42,7 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_inf_engine.hpp"
#include <opencv2/dnn/shape_utils.hpp>
namespace
cv
...
...
modules/dnn/src/layers/scale_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -11,8 +11,8 @@ Implementation of Scale layer.
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#include <opencv2/dnn/shape_utils.hpp>
namespace
cv
...
...
modules/dnn/src/layers/shift_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -10,7 +10,7 @@ Implementation of shift layer, which adds up const values to blob.
*/
#include "../precomp.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_inf_engine.hpp"
#include <opencv2/dnn/shape_utils.hpp>
namespace
cv
...
...
modules/dnn/src/layers/softmax_layer.cpp
浏览文件 @
6c051a55
...
...
@@ -42,8 +42,8 @@
#include "../precomp.hpp"
#include "layers_common.hpp"
#include "op_halide.hpp"
#include "op_inf_engine.hpp"
#include "
../
op_halide.hpp"
#include "
../
op_inf_engine.hpp"
#include <algorithm>
#include <stdlib.h>
using
std
::
max
;
...
...
modules/dnn/src/nms.cpp
浏览文件 @
6c051a55
...
...
@@ -6,7 +6,7 @@
// Third party copyrights are property of their respective owners.
#include "precomp.hpp"
#include
<nms.inl.hpp>
#include
"nms.inl.hpp"
namespace
cv
{
...
...
modules/viz/src/precomp.hpp
浏览文件 @
6c051a55
...
...
@@ -140,13 +140,13 @@
# include <io.h>
/* unlink */
#endif
#include
<vtk/vtkOBJWriter.h>
#include
<vtk/vtkXYZWriter.h>
#include
<vtk/vtkXYZReader.h>
#include
<vtk/vtkCloudMatSink.h>
#include
<vtk/vtkCloudMatSource.h>
#include
<vtk/vtkTrajectorySource.h>
#include
<vtk/vtkImageMatSource.h>
#include
"vtk/vtkOBJWriter.h"
#include
"vtk/vtkXYZWriter.h"
#include
"vtk/vtkXYZReader.h"
#include
"vtk/vtkCloudMatSink.h"
#include
"vtk/vtkCloudMatSource.h"
#include
"vtk/vtkTrajectorySource.h"
#include
"vtk/vtkImageMatSource.h"
#include <opencv2/core.hpp>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录