Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
5658ba00
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,发现更多精彩内容 >>
提交
5658ba00
编写于
4月 28, 2014
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
icv: update package
上级
dacf63a8
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
44 addition
and
63 deletion
+44
-63
3rdparty/ippicv/.gitignore
3rdparty/ippicv/.gitignore
+1
-3
3rdparty/ippicv/downloader.cmake
3rdparty/ippicv/downloader.cmake
+22
-16
cmake/OpenCVFindIPP.cmake
cmake/OpenCVFindIPP.cmake
+12
-35
modules/core/include/opencv2/core/private.hpp
modules/core/include/opencv2/core/private.hpp
+2
-6
modules/core/src/dxt.cpp
modules/core/src/dxt.cpp
+1
-1
modules/imgproc/src/deriv.cpp
modules/imgproc/src/deriv.cpp
+5
-1
modules/imgproc/src/smooth.cpp
modules/imgproc/src/smooth.cpp
+1
-1
未找到文件。
3rdparty/ippicv/.gitignore
浏览文件 @
5658ba00
downloads/
macosx/
linux/
windows/
unpack/
3rdparty/ippicv/downloader.cmake
浏览文件 @
5658ba00
...
...
@@ -8,22 +8,26 @@
function
(
_icv_downloader
)
# Define actual ICV versions
if
(
APPLE
)
set
(
OPENCV_ICV_PACKAGE_NAME
"ippicv_macosx
.tar.
gz"
)
set
(
OPENCV_ICV_PACKAGE_HASH
"
d489e447906de7808a9a9d7e3f225f7a
"
)
set
(
OPENCV_ICV_PACKAGE_NAME
"ippicv_macosx
_20140429.t
gz"
)
set
(
OPENCV_ICV_PACKAGE_HASH
"
f2195a60829899983acd4a45794e1717
"
)
set
(
OPENCV_ICV_PLATFORM
"macosx"
)
set
(
OPENCV_ICV_PACKAGE_SUBDIR
"/ippicv_osx"
)
elseif
(
UNIX AND NOT ANDROID
)
set
(
OPENCV_ICV_PACKAGE_NAME
"ippicv_linux
.tar.
gz"
)
set
(
OPENCV_ICV_PACKAGE_HASH
"
42798c6cd6348bd40e74c425dc23338a
"
)
set
(
OPENCV_ICV_PACKAGE_NAME
"ippicv_linux
_20140429.t
gz"
)
set
(
OPENCV_ICV_PACKAGE_HASH
"
f6481b8695a56ad27a84db1e44ea0f00
"
)
set
(
OPENCV_ICV_PLATFORM
"linux"
)
set
(
OPENCV_ICV_PACKAGE_SUBDIR
"/ippicv_lnx"
)
elseif
(
WIN32 AND NOT ARM
)
set
(
OPENCV_ICV_PACKAGE_NAME
"ippicv_windows.zip"
)
set
(
OPENCV_ICV_PACKAGE_HASH
"
2715f39ae65dc09bae3648bffe538706
"
)
set
(
OPENCV_ICV_PACKAGE_NAME
"ippicv_windows
_20140429
.zip"
)
set
(
OPENCV_ICV_PACKAGE_HASH
"
b5028a92224ec1fbc554010c52eb3ec8
"
)
set
(
OPENCV_ICV_PLATFORM
"windows"
)
set
(
OPENCV_ICV_PACKAGE_SUBDIR
"/ippicv_win"
)
else
()
return
()
# Not supported
endif
()
set
(
OPENCV_ICV_PATH
"
${
CMAKE_CURRENT_LIST_DIR
}
/
${
OPENCV_ICV_PLATFORM
}
"
)
set
(
OPENCV_ICV_UNPACK_PATH
"
${
CMAKE_CURRENT_LIST_DIR
}
/unpack"
)
set
(
OPENCV_ICV_PATH
"
${
OPENCV_ICV_UNPACK_PATH
}${
OPENCV_ICV_PACKAGE_SUBDIR
}
"
)
if
(
DEFINED OPENCV_ICV_PACKAGE_DOWNLOADED
AND OPENCV_ICV_PACKAGE_DOWNLOADED STREQUAL OPENCV_ICV_PACKAGE_HASH
...
...
@@ -32,9 +36,9 @@ function(_icv_downloader)
set
(
OPENCV_ICV_PATH
"
${
OPENCV_ICV_PATH
}
"
PARENT_SCOPE
)
return
()
else
()
if
(
EXISTS
${
OPENCV_ICV_PATH
}
)
message
(
STATUS
"ICV: Removing previous unpacked package:
${
OPENCV_ICV_PATH
}
"
)
file
(
REMOVE_RECURSE
${
OPENCV_ICV_PATH
}
)
if
(
EXISTS
${
OPENCV_ICV_
UNPACK_
PATH
}
)
message
(
STATUS
"ICV: Removing previous unpacked package:
${
OPENCV_ICV_
UNPACK_
PATH
}
"
)
file
(
REMOVE_RECURSE
${
OPENCV_ICV_
UNPACK_
PATH
}
)
endif
()
endif
()
unset
(
OPENCV_ICV_PACKAGE_DOWNLOADED CACHE
)
...
...
@@ -78,19 +82,21 @@ function(_icv_downloader)
endif
()
ocv_assert
(
EXISTS
"
${
OPENCV_ICV_PACKAGE_ARCHIVE
}
"
)
ocv_assert
(
NOT EXISTS
"
${
OPENCV_ICV_PATH
}
"
)
file
(
MAKE_DIRECTORY
${
OPENCV_ICV_PATH
}
)
ocv_assert
(
EXISTS
"
${
OPENCV_ICV_PATH
}
"
)
ocv_assert
(
NOT EXISTS
"
${
OPENCV_ICV_
UNPACK_
PATH
}
"
)
file
(
MAKE_DIRECTORY
${
OPENCV_ICV_
UNPACK_
PATH
}
)
ocv_assert
(
EXISTS
"
${
OPENCV_ICV_
UNPACK_
PATH
}
"
)
message
(
STATUS
"ICV: Unpacking
${
OPENCV_ICV_PACKAGE_NAME
}
to
${
OPENCV_ICV_PATH
}
..."
)
message
(
STATUS
"ICV: Unpacking
${
OPENCV_ICV_PACKAGE_NAME
}
to
${
OPENCV_ICV_
UNPACK_
PATH
}
..."
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E tar xz
"
${
OPENCV_ICV_PACKAGE_ARCHIVE
}
"
WORKING_DIRECTORY
"
${
OPENCV_ICV_PATH
}
"
WORKING_DIRECTORY
"
${
OPENCV_ICV_
UNPACK_
PATH
}
"
RESULT_VARIABLE __result
)
if
(
NOT __result EQUAL 0
)
message
(
FATAL_ERROR
"ICV: Failed to unpack ICV package from
${
OPENCV_ICV_PACKAGE_ARCHIVE
}
to
${
OPENCV_ICV_PATH
}
with error
${
__result
}
"
)
message
(
FATAL_ERROR
"ICV: Failed to unpack ICV package from
${
OPENCV_ICV_PACKAGE_ARCHIVE
}
to
${
OPENCV_ICV_
UNPACK_
PATH
}
with error
${
__result
}
"
)
endif
()
ocv_assert
(
EXISTS
"
${
OPENCV_ICV_PATH
}
"
)
set
(
OPENCV_ICV_PACKAGE_DOWNLOADED
"
${
OPENCV_ICV_PACKAGE_HASH
}
"
CACHE INTERNAL
"ICV package hash"
)
message
(
STATUS
"ICV: Package successfully downloaded"
)
...
...
cmake/OpenCVFindIPP.cmake
浏览文件 @
5658ba00
...
...
@@ -35,7 +35,7 @@ unset(IPP_VERSION_MINOR)
unset
(
IPP_VERSION_BUILD
)
set
(
IPP_LIB_PREFIX
${
CMAKE_STATIC_LIBRARY_PREFIX
}
)
set
(
IPP_LIB_SUFFIX
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
set
(
IPP_LIB_SUFFIX
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
set
(
IPP_X64 0
)
if
(
CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8
)
...
...
@@ -88,23 +88,18 @@ macro(ipp_detect_version)
set
(
IPP_INCLUDE_DIRS
${
IPP_ROOT_DIR
}
/include
)
set
(
__msg
)
if
(
EXISTS
${
IPP_ROOT_DIR
}
/i
ppicv
.h
)
if
(
EXISTS
${
IPP_ROOT_DIR
}
/i
nclude/ippicv_redefs
.h
)
set
(
__msg
" (ICV version)"
)
set
(
HAVE_IPP_ICV_ONLY 1
)
if
(
EXISTS
${
IPP_ROOT_DIR
}
/ippversion.h
)
_ipp_not_supported
(
"Can't resolve IPP directory:
${
IPP_ROOT_DIR
}
"
)
else
()
ipp_get_version
(
${
IPP_ROOT_DIR
}
/ippicv.h
)
endif
()
ocv_assert
(
IPP_VERSION_STR VERSION_GREATER
"8.0"
)
set
(
IPP_INCLUDE_DIRS
${
IPP_ROOT_DIR
}
/
)
elseif
(
EXISTS
${
IPP_ROOT_DIR
}
/include/ipp.h
)
ipp_get_version
(
${
IPP_ROOT_DIR
}
/include/ippversion.h
)
ocv_assert
(
IPP_VERSION_STR VERSION_GREATER
"1.0"
)
# nothing
else
()
_ipp_not_supported
(
"Can't resolve IPP directory:
${
IPP_ROOT_DIR
}
"
)
endif
()
ipp_get_version
(
${
IPP_INCLUDE_DIRS
}
/ippversion.h
)
ocv_assert
(
IPP_VERSION_STR VERSION_GREATER
"1.0"
)
message
(
STATUS
"found IPP
${
__msg
}
:
${
_MAJOR
}
.
${
_MINOR
}
.
${
_BUILD
}
[
${
IPP_VERSION_STR
}
]"
)
message
(
STATUS
"at:
${
IPP_ROOT_DIR
}
"
)
...
...
@@ -113,11 +108,6 @@ macro(ipp_detect_version)
endif
()
set
(
HAVE_IPP 1
)
if
(
EXISTS
${
IPP_INCLUDE_DIRS
}
/ipp_redefine.h
)
set
(
HAVE_IPP_REDEFINE 1
)
else
()
unset
(
HAVE_IPP_REDEFINE
)
endif
()
macro
(
_ipp_set_library_dir DIR
)
if
(
NOT EXISTS
${
DIR
}
)
...
...
@@ -126,32 +116,19 @@ macro(ipp_detect_version)
set
(
IPP_LIBRARY_DIR
${
DIR
}
)
endmacro
()
if
(
NOT HAVE_IPP_ICV_ONLY
)
if
(
APPLE
)
_ipp_set_library_dir
(
${
IPP_ROOT_DIR
}
/lib
)
elseif
(
IPP_X64
)
_ipp_set_library_dir
(
${
IPP_ROOT_DIR
}
/lib/intel64
)
else
()
_ipp_set_library_dir
(
${
IPP_ROOT_DIR
}
/lib/ia32
)
endif
()
if
(
APPLE
)
_ipp_set_library_dir
(
${
IPP_ROOT_DIR
}
/lib
)
elseif
(
IPP_X64
)
_ipp_set_library_dir
(
${
IPP_ROOT_DIR
}
/lib/intel64
)
else
()
if
(
EXISTS
${
IPP_ROOT_DIR
}
/lib
)
set
(
IPP_LIBRARY_DIR
${
IPP_ROOT_DIR
}
/lib
)
else
()
_ipp_not_supported
(
"IPP
${
IPP_VERSION_STR
}
at
${
IPP_ROOT_DIR
}
is not supported"
)
endif
()
if
(
IPP_X64
)
_ipp_set_library_dir
(
${
IPP_LIBRARY_DIR
}
/intel64
)
else
()
_ipp_set_library_dir
(
${
IPP_LIBRARY_DIR
}
/ia32
)
endif
()
_ipp_set_library_dir
(
${
IPP_ROOT_DIR
}
/lib/ia32
)
endif
()
macro
(
_ipp_add_library name
)
if
(
EXISTS
${
IPP_LIBRARY_DIR
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
)
list
(
APPEND IPP_LIBRARIES
${
IPP_LIBRARY_DIR
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
)
else
()
message
(
STATUS
"Can't find IPP library:
${
name
}
"
)
message
(
STATUS
"Can't find IPP library:
${
name
}
at
${
IPP_LIBRARY_DIR
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
"
)
endif
()
endmacro
()
...
...
modules/core/include/opencv2/core/private.hpp
浏览文件 @
5658ba00
...
...
@@ -210,12 +210,8 @@ CV_EXPORTS void scalarToRawData(const cv::Scalar& s, void* buf, int type, int un
\****************************************************************************************/
#ifdef HAVE_IPP
# ifdef HAVE_IPP_ICV_ONLY
# include "ipp_redefine.h"
# include "ippicv.h"
# else
# include "ipp.h"
# endif
# include "ipp.h"
# define IPP_VERSION_X100 (IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR)
#define IPP_ALIGN 32 // required for AVX optimization
...
...
modules/core/src/dxt.cpp
浏览文件 @
5658ba00
...
...
@@ -53,7 +53,7 @@ namespace cv
# pragma warning(disable: 4748)
#endif
#if IPP_VERSION_X100 >= 701
#if IPP_VERSION_X100 >= 701
&& !defined(HAVE_IPP_ICV_ONLY)
#define USE_IPP_DFT 1
#else
#undef USE_IPP_DFT
...
...
modules/imgproc/src/deriv.cpp
浏览文件 @
5658ba00
...
...
@@ -193,7 +193,7 @@ namespace cv
static
bool
IPPDerivScharr
(
InputArray
_src
,
OutputArray
_dst
,
int
ddepth
,
int
dx
,
int
dy
,
double
scale
,
double
delta
,
int
borderType
)
{
#if defined(HAVE_IPP_ICV_ONLY)
_src
;
_dst
;
ddepth
;
dx
;
dy
;
scale
;
delta
;
borderType
;
(
void
)
_src
;
(
void
)
_dst
;
(
void
)
ddepth
;
(
void
)
dx
;
(
void
)
dy
;
(
void
)
scale
;
(
void
)
delta
;
(
void
)
borderType
;
return
false
;
#else
if
((
0
>
dx
)
||
(
0
>
dy
)
||
(
1
!=
dx
+
dy
))
...
...
@@ -460,6 +460,9 @@ static bool IPPDerivSobel(InputArray _src, OutputArray _dst, int ddepth, int dx,
return
true
;
}
#if defined(HAVE_IPP_ICV_ONLY)
return
false
;
#else
if
((
dx
==
2
)
&&
(
dy
==
0
))
{
if
(
0
>
ippiFilterSobelVertSecondGetBufferSize_8u16s_C1R
(
ippiSize
(
src
.
cols
,
src
.
rows
),
(
IppiMaskSize
)(
ksize
*
10
+
ksize
),
&
bufSize
))
...
...
@@ -485,6 +488,7 @@ static bool IPPDerivSobel(InputArray _src, OutputArray _dst, int ddepth, int dx,
IPP_RETURN_ERROR
return
true
;
}
#endif
}
if
(
src
.
type
()
==
CV_32F
&&
dst
.
type
()
==
CV_32F
)
...
...
modules/imgproc/src/smooth.cpp
浏览文件 @
5658ba00
...
...
@@ -2274,7 +2274,7 @@ private:
float
*
space_weight
,
*
color_weight
;
};
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
&& !defined(HAVE_IPP_ICV_ONLY)
class
IPPBilateralFilter_8u_Invoker
:
public
ParallelLoopBody
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录