Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
6ca46afa
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,发现更多精彩内容 >>
提交
6ca46afa
编写于
2月 03, 2021
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19286 from diablodale:add-cuda-stream-constructor
上级
674ecc55
34c3f0f4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
54 addition
and
0 deletion
+54
-0
modules/core/include/opencv2/core/cuda.hpp
modules/core/include/opencv2/core/cuda.hpp
+12
-0
modules/core/src/cuda_stream.cpp
modules/core/src/cuda_stream.cpp
+19
-0
modules/core/test/test_cuda.cpp
modules/core/test/test_cuda.cpp
+21
-0
modules/python/test/test_cuda.py
modules/python/test/test_cuda.py
+2
-0
未找到文件。
modules/core/include/opencv2/core/cuda.hpp
浏览文件 @
6ca46afa
...
...
@@ -656,6 +656,18 @@ public:
//! creates a new asynchronous stream with custom allocator
CV_WRAP
Stream
(
const
Ptr
<
GpuMat
::
Allocator
>&
allocator
);
/** @brief creates a new Stream using the cudaFlags argument to determine the behaviors of the stream
@note The cudaFlags parameter is passed to the underlying api cudaStreamCreateWithFlags() and
supports the same parameter values.
@code
// creates an OpenCV cuda::Stream that manages an asynchronous, non-blocking,
// non-default CUDA stream
cv::cuda::Stream cvStream(cudaStreamNonBlocking);
@endcode
*/
CV_WRAP
Stream
(
const
size_t
cudaFlags
);
/** @brief Returns true if the current stream queue is finished. Otherwise, it returns false.
*/
CV_WRAP
bool
queryIfComplete
()
const
;
...
...
modules/core/src/cuda_stream.cpp
浏览文件 @
6ca46afa
...
...
@@ -41,6 +41,7 @@
//M*/
#include "precomp.hpp"
#include <cstdint>
using
namespace
cv
;
using
namespace
cv
::
cuda
;
...
...
@@ -293,6 +294,7 @@ public:
Impl
();
Impl
(
const
Ptr
<
GpuMat
::
Allocator
>&
allocator
);
Impl
(
const
unsigned
int
cudaFlags
);
explicit
Impl
(
cudaStream_t
stream
);
~
Impl
();
...
...
@@ -312,6 +314,13 @@ cv::cuda::Stream::Impl::Impl(const Ptr<GpuMat::Allocator>& allocator) : stream(0
ownStream
=
true
;
}
cv
::
cuda
::
Stream
::
Impl
::
Impl
(
const
unsigned
int
cudaFlags
)
:
stream
(
0
),
ownStream
(
false
)
{
cudaSafeCall
(
cudaStreamCreateWithFlags
(
&
stream
,
cudaFlags
));
ownStream
=
true
;
allocator
=
makePtr
<
StackAllocator
>
(
stream
);
}
cv
::
cuda
::
Stream
::
Impl
::
Impl
(
cudaStream_t
stream_
)
:
stream
(
stream_
),
ownStream
(
false
)
{
allocator
=
makePtr
<
StackAllocator
>
(
stream
);
...
...
@@ -450,6 +459,16 @@ cv::cuda::Stream::Stream(const Ptr<GpuMat::Allocator>& allocator)
#endif
}
cv
::
cuda
::
Stream
::
Stream
(
const
size_t
cudaFlags
)
{
#ifndef HAVE_CUDA
CV_UNUSED
(
cudaFlags
);
throw_no_cuda
();
#else
impl_
=
makePtr
<
Impl
>
(
cudaFlags
&
UINT_MAX
);
#endif
}
bool
cv
::
cuda
::
Stream
::
queryIfComplete
()
const
{
#ifndef HAVE_CUDA
...
...
modules/core/test/test_cuda.cpp
0 → 100755
浏览文件 @
6ca46afa
// This file is part of OpenCV project.
// 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.
#if defined(HAVE_CUDA)
#include "test_precomp.hpp"
#include <cuda_runtime.h>
#include "opencv2/core/cuda.hpp"
namespace
opencv_test
{
namespace
{
TEST
(
CUDA_Stream
,
construct_cudaFlags
)
{
cv
::
cuda
::
Stream
stream
(
cudaStreamNonBlocking
);
EXPECT_NE
(
stream
.
cudaPtr
(),
nullptr
);
}
}}
// namespace
#endif
modules/python/test/test_cuda.py
浏览文件 @
6ca46afa
...
...
@@ -33,6 +33,8 @@ class cuda_test(NewOpenCVTests):
self
.
assertTrue
(
cuMat
.
cudaPtr
()
!=
0
)
stream
=
cv
.
cuda_Stream
()
self
.
assertTrue
(
stream
.
cudaPtr
()
!=
0
)
asyncstream
=
cv
.
cuda_Stream
(
1
)
# cudaStreamNonBlocking
self
.
assertTrue
(
asyncstream
.
cudaPtr
()
!=
0
)
if
__name__
==
'__main__'
:
NewOpenCVTests
.
bootstrap
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录