Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
02936dcf
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
02936dcf
编写于
7月 02, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14926 from alalek:tbb_version_2019u8
上级
ff877af2
43e457c8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
75 deletion
+17
-75
3rdparty/tbb/CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
+17
-23
3rdparty/tbb/android_additional.h
3rdparty/tbb/android_additional.h
+0
-41
3rdparty/tbb/arm_linux_stub.cpp
3rdparty/tbb/arm_linux_stub.cpp
+0
-11
未找到文件。
3rdparty/tbb/CMakeLists.txt
浏览文件 @
02936dcf
...
...
@@ -5,19 +5,14 @@ if (WIN32 AND NOT ARM)
message
(
FATAL_ERROR
"BUILD_TBB option supports Windows on ARM only!
\n
Use regular official TBB build instead of the BUILD_TBB option!"
)
endif
()
set
(
tbb_filename
"2018_U1.tar.gz"
)
set
(
tbb_subdir
"tbb-2018_U1"
)
set
(
tbb_md5
"b2f2fa09adf44a22f4024049907f774b"
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4702
-Wshadow
-Wunused-parameter
-Wmissing-prototypes
# MacOSX
)
ocv_update
(
OPENCV_TBB_RELEASE
"2019_U8"
)
ocv_update
(
OPENCV_TBB_RELEASE_MD5
"7c371d0f62726154d2c568a85697a0ad"
)
ocv_update
(
OPENCV_TBB_FILENAME
"
${
OPENCV_TBB_RELEASE
}
.tar.gz"
)
ocv_update
(
OPENCV_TBB_SUBDIR
"tbb-
${
OPENCV_TBB_RELEASE
}
"
)
set
(
tbb_src_dir
"
${
OpenCV_BINARY_DIR
}
/3rdparty/tbb"
)
ocv_download
(
FILENAME
${
tbb_filename
}
HASH
${
tbb_md
5
}
ocv_download
(
FILENAME
${
OPENCV_TBB_FILENAME
}
HASH
${
OPENCV_TBB_RELEASE_MD
5
}
URL
"
${
OPENCV_TBB_URL
}
"
"$ENV{OPENCV_TBB_URL}"
...
...
@@ -29,7 +24,7 @@ ocv_download(FILENAME ${tbb_filename}
if
(
NOT res
)
return
()
endif
()
set
(
tbb_src_dir
"
${
tbb_src_dir
}
/
${
tbb_subdir
}
"
)
set
(
tbb_src_dir
"
${
tbb_src_dir
}
/
${
OPENCV_TBB_SUBDIR
}
"
)
ocv_include_directories
(
"
${
tbb_src_dir
}
/include"
"
${
tbb_src_dir
}
/src/"
...
...
@@ -82,18 +77,19 @@ endif()
if
(
ANDROID_COMPILER_IS_CLANG
)
add_definitions
(
-D__TBB_GCC_BUILTIN_ATOMICS_PRESENT=1
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wmissing-prototypes
)
endif
()
set
(
TBB_SOURCE_FILES
${
lib_srcs
}
${
lib_hdrs
}
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS
/wd4702
-Wshadow
-Wunused-parameter
-Wclass-memaccess
# TBB 2018 under GCC 8+
-Wimplicit-fallthrough
# TBB 2018 under GCC 7+
-Wmissing-prototypes
# MacOSX, Android/Clang
-Wundef -Wmissing-declarations
# TBB 2019
)
if
(
ARM AND NOT WIN32
)
if
(
NOT ANDROID
)
set
(
TBB_SOURCE_FILES
${
TBB_SOURCE_FILES
}
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/arm_linux_stub.cpp"
)
endif
()
set
(
TBB_SOURCE_FILES
${
TBB_SOURCE_FILES
}
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android_additional.h"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-include
\"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android_additional.h
\"
"
)
endif
()
set
(
TBB_SOURCE_FILES
${
lib_srcs
}
${
lib_hdrs
}
)
set
(
tbb_version_file
"version_string.ver"
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
tbb_version_file
}
.cmakein"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
tbb_version_file
}
"
@ONLY
)
...
...
@@ -122,8 +118,6 @@ else()
target_link_libraries
(
tbb c m dl
)
endif
()
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations
)
# filter out flags that are not handled well by the TBB code
foreach
(
var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG
)
string
(
REPLACE
"-Werror=non-virtual-dtor"
""
${
var
}
"
${${
var
}}
"
)
...
...
3rdparty/tbb/android_additional.h
已删除
100644 → 0
浏览文件 @
ff877af2
#include <cstdio>
static
inline
int
getPossibleCPUs
()
{
FILE
*
cpuPossible
=
fopen
(
"/sys/devices/system/cpu/possible"
,
"r"
);
if
(
!
cpuPossible
)
return
1
;
char
buf
[
2000
];
//big enough for 1000 CPUs in worst possible configuration
char
*
pbuf
=
fgets
(
buf
,
sizeof
(
buf
),
cpuPossible
);
fclose
(
cpuPossible
);
if
(
!
pbuf
)
return
1
;
//parse string of form "0-1,3,5-7,10,13-15"
int
cpusAvailable
=
0
;
while
(
*
pbuf
)
{
const
char
*
pos
=
pbuf
;
bool
range
=
false
;
while
(
*
pbuf
&&
*
pbuf
!=
','
)
{
if
(
*
pbuf
==
'-'
)
range
=
true
;
++
pbuf
;
}
if
(
*
pbuf
)
*
pbuf
++
=
0
;
if
(
!
range
)
++
cpusAvailable
;
else
{
int
rstart
=
0
,
rend
=
0
;
sscanf
(
pos
,
"%d-%d"
,
&
rstart
,
&
rend
);
cpusAvailable
+=
rend
-
rstart
+
1
;
}
}
return
cpusAvailable
?
cpusAvailable
:
1
;
}
#define __TBB_HardwareConcurrency() getPossibleCPUs()
3rdparty/tbb/arm_linux_stub.cpp
已删除
100644 → 0
浏览文件 @
ff877af2
#include "tbb/tbb_misc.h"
namespace
tbb
{
namespace
internal
{
void
affinity_helper
::
protect_affinity_mask
(
bool
)
{}
affinity_helper
::~
affinity_helper
()
{}
void
destroy_process_mask
()
{}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录