Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
e625b328
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
e625b328
编写于
6月 15, 2023
作者:
D
dizcza
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[opencv 3.x] back-ported tbb support ubuntu 22.04
上级
dc378837
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
13 deletion
+8
-13
3rdparty/tbb/CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
+1
-1
cmake/OpenCVDetectTBB.cmake
cmake/OpenCVDetectTBB.cmake
+5
-4
cmake/OpenCVFindMKL.cmake
cmake/OpenCVFindMKL.cmake
+2
-7
modules/core/src/parallel.cpp
modules/core/src/parallel.cpp
+0
-1
未找到文件。
3rdparty/tbb/CMakeLists.txt
浏览文件 @
e625b328
...
@@ -170,4 +170,4 @@ ocv_install_target(tbb EXPORT OpenCVModules
...
@@ -170,4 +170,4 @@ ocv_install_target(tbb EXPORT OpenCVModules
ocv_install_3rdparty_licenses
(
tbb
"
${
tbb_src_dir
}
/LICENSE"
"
${
tbb_src_dir
}
/README"
)
ocv_install_3rdparty_licenses
(
tbb
"
${
tbb_src_dir
}
/LICENSE"
"
${
tbb_src_dir
}
/README"
)
ocv_tbb_read_version
(
"
${
tbb_src_dir
}
/include"
)
ocv_tbb_read_version
(
"
${
tbb_src_dir
}
/include"
tbb
)
cmake/OpenCVDetectTBB.cmake
浏览文件 @
e625b328
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
# - "tbb" target exists and added to OPENCV_LINKER_LIBS
# - "tbb" target exists and added to OPENCV_LINKER_LIBS
function
(
ocv_tbb_cmake_guess _found
)
function
(
ocv_tbb_cmake_guess _found
)
find_package
(
TBB QUIET COMPONENTS tbb PATHS
"$ENV{TBBROOT}/cmake"
)
find_package
(
TBB QUIET COMPONENTS tbb PATHS
"$ENV{TBBROOT}/cmake"
"$ENV{TBBROOT}/lib/cmake/tbb"
)
if
(
TBB_FOUND
)
if
(
TBB_FOUND
)
if
(
NOT TARGET TBB::tbb
)
if
(
NOT TARGET TBB::tbb
)
message
(
WARNING
"No TBB::tbb target found!"
)
message
(
WARNING
"No TBB::tbb target found!"
)
...
@@ -28,11 +28,11 @@ function(ocv_tbb_cmake_guess _found)
...
@@ -28,11 +28,11 @@ function(ocv_tbb_cmake_guess _found)
get_target_property
(
_lib TBB::tbb IMPORTED_LOCATION_RELEASE
)
get_target_property
(
_lib TBB::tbb IMPORTED_LOCATION_RELEASE
)
message
(
STATUS
"Found TBB (cmake):
${
_lib
}
"
)
message
(
STATUS
"Found TBB (cmake):
${
_lib
}
"
)
get_target_property
(
_inc TBB::tbb INTERFACE_INCLUDE_DIRECTORIES
)
get_target_property
(
_inc TBB::tbb INTERFACE_INCLUDE_DIRECTORIES
)
ocv_tbb_read_version
(
"
${
_inc
}
"
)
add_library
(
tbb INTERFACE IMPORTED
)
add_library
(
tbb INTERFACE IMPORTED
)
set_target_properties
(
tbb PROPERTIES
set_target_properties
(
tbb PROPERTIES
INTERFACE_LINK_LIBRARIES TBB::tbb
INTERFACE_LINK_LIBRARIES TBB::tbb
)
)
ocv_tbb_read_version
(
"
${
_inc
}
"
tbb
)
set
(
${
_found
}
TRUE PARENT_SCOPE
)
set
(
${
_found
}
TRUE PARENT_SCOPE
)
endif
()
endif
()
endfunction
()
endfunction
()
...
@@ -66,7 +66,6 @@ function(ocv_tbb_env_guess _found)
...
@@ -66,7 +66,6 @@ function(ocv_tbb_env_guess _found)
find_library
(
TBB_ENV_LIB_DEBUG NAMES
"tbb_debug"
)
find_library
(
TBB_ENV_LIB_DEBUG NAMES
"tbb_debug"
)
if
(
TBB_ENV_INCLUDE
AND
(
TBB_ENV_LIB OR TBB_ENV_LIB_DEBUG
))
if
(
TBB_ENV_INCLUDE
AND
(
TBB_ENV_LIB OR TBB_ENV_LIB_DEBUG
))
ocv_tbb_env_verify
()
ocv_tbb_env_verify
()
ocv_tbb_read_version
(
"
${
TBB_ENV_INCLUDE
}
"
)
add_library
(
tbb UNKNOWN IMPORTED
)
add_library
(
tbb UNKNOWN IMPORTED
)
set_target_properties
(
tbb PROPERTIES
set_target_properties
(
tbb PROPERTIES
IMPORTED_LOCATION
"
${
TBB_ENV_LIB
}
"
IMPORTED_LOCATION
"
${
TBB_ENV_LIB
}
"
...
@@ -82,12 +81,14 @@ function(ocv_tbb_env_guess _found)
...
@@ -82,12 +81,14 @@ function(ocv_tbb_env_guess _found)
get_filename_component
(
_dir
"
${
TBB_ENV_LIB
}
"
DIRECTORY
)
get_filename_component
(
_dir
"
${
TBB_ENV_LIB
}
"
DIRECTORY
)
set_target_properties
(
tbb PROPERTIES INTERFACE_LINK_LIBRARIES
"-L
${
_dir
}
"
)
set_target_properties
(
tbb PROPERTIES INTERFACE_LINK_LIBRARIES
"-L
${
_dir
}
"
)
endif
()
endif
()
ocv_tbb_read_version
(
"
${
TBB_ENV_INCLUDE
}
"
tbb
)
message
(
STATUS
"Found TBB (env):
${
TBB_ENV_LIB
}
"
)
message
(
STATUS
"Found TBB (env):
${
TBB_ENV_LIB
}
"
)
set
(
${
_found
}
TRUE PARENT_SCOPE
)
set
(
${
_found
}
TRUE PARENT_SCOPE
)
endif
()
endif
()
endfunction
()
endfunction
()
function
(
ocv_tbb_read_version _path
)
function
(
ocv_tbb_read_version _path _tgt
)
find_file
(
TBB_VER_FILE oneapi/tbb/version.h
"
${
_path
}
"
NO_DEFAULT_PATH CMAKE_FIND_ROOT_PATH_BOTH
)
find_file
(
TBB_VER_FILE tbb/tbb_stddef.h
"
${
_path
}
"
NO_DEFAULT_PATH CMAKE_FIND_ROOT_PATH_BOTH
)
find_file
(
TBB_VER_FILE tbb/tbb_stddef.h
"
${
_path
}
"
NO_DEFAULT_PATH CMAKE_FIND_ROOT_PATH_BOTH
)
ocv_parse_header
(
"
${
TBB_VER_FILE
}
"
TBB_VERSION_LINES TBB_VERSION_MAJOR TBB_VERSION_MINOR TBB_INTERFACE_VERSION CACHE
)
ocv_parse_header
(
"
${
TBB_VER_FILE
}
"
TBB_VERSION_LINES TBB_VERSION_MAJOR TBB_VERSION_MINOR TBB_INTERFACE_VERSION CACHE
)
endfunction
()
endfunction
()
...
...
cmake/OpenCVFindMKL.cmake
浏览文件 @
e625b328
...
@@ -118,16 +118,10 @@ if(MKL_USE_SINGLE_DYNAMIC_LIBRARY AND NOT (MKL_VERSION_STR VERSION_LESS "10.3.0"
...
@@ -118,16 +118,10 @@ if(MKL_USE_SINGLE_DYNAMIC_LIBRARY AND NOT (MKL_VERSION_STR VERSION_LESS "10.3.0"
elseif
(
NOT
(
MKL_VERSION_STR VERSION_LESS
"11.3.0"
))
elseif
(
NOT
(
MKL_VERSION_STR VERSION_LESS
"11.3.0"
))
foreach
(
MKL_ARCH
${
MKL_ARCH_LIST
}
)
list
(
APPEND mkl_lib_find_paths
${
MKL_ROOT_DIR
}
/../tbb/lib/
${
MKL_ARCH
}
)
endforeach
()
set
(
mkl_lib_list
"mkl_intel_
${
MKL_ARCH_SUFFIX
}
"
)
set
(
mkl_lib_list
"mkl_intel_
${
MKL_ARCH_SUFFIX
}
"
)
if
(
MKL_WITH_TBB
)
if
(
MKL_WITH_TBB
)
list
(
APPEND mkl_lib_list mkl_tbb_thread
tbb
)
list
(
APPEND mkl_lib_list mkl_tbb_thread
)
elseif
(
MKL_WITH_OPENMP
)
elseif
(
MKL_WITH_OPENMP
)
if
(
MSVC
)
if
(
MSVC
)
list
(
APPEND mkl_lib_list mkl_intel_thread libiomp5md
)
list
(
APPEND mkl_lib_list mkl_intel_thread libiomp5md
)
...
@@ -155,6 +149,7 @@ if(NOT MKL_LIBRARIES)
...
@@ -155,6 +149,7 @@ if(NOT MKL_LIBRARIES)
endif
()
endif
()
list
(
APPEND MKL_LIBRARIES
${${
lib_var_name
}}
)
list
(
APPEND MKL_LIBRARIES
${${
lib_var_name
}}
)
endforeach
()
endforeach
()
list
(
APPEND MKL_LIBRARIES
${
OPENCV_EXTRA_MKL_LIBRARIES
}
)
endif
()
endif
()
message
(
STATUS
"Found MKL
${
MKL_VERSION_STR
}
at:
${
MKL_ROOT_DIR
}
"
)
message
(
STATUS
"Found MKL
${
MKL_VERSION_STR
}
at:
${
MKL_ROOT_DIR
}
"
)
...
...
modules/core/src/parallel.cpp
浏览文件 @
e625b328
...
@@ -101,7 +101,6 @@
...
@@ -101,7 +101,6 @@
#endif
#endif
#include "tbb/tbb.h"
#include "tbb/tbb.h"
#include "tbb/task.h"
#include "tbb/task.h"
#include "tbb/tbb_stddef.h"
#if TBB_INTERFACE_VERSION >= 8000
#if TBB_INTERFACE_VERSION >= 8000
#include "tbb/task_arena.h"
#include "tbb/task_arena.h"
#endif
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录