Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Xts Acts
提交
2620890a
X
Xts Acts
项目概览
OpenHarmony
/
Xts Acts
1 年多 前同步成功
通知
9
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
Xts Acts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
2620890a
编写于
1月 03, 2023
作者:
T
tangshihua
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add mutex lock
Signed-off-by:
N
tangshihua
<
tangshihua@huawei.com
>
上级
50ffb56b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
4 deletion
+8
-4
ai/neural_network_runtime/common/mock_idevice.cpp
ai/neural_network_runtime/common/mock_idevice.cpp
+3
-0
ai/neural_network_runtime/common/mock_idevice.h
ai/neural_network_runtime/common/mock_idevice.h
+1
-1
ai/neural_network_runtime/common/nnrt_utils.cpp
ai/neural_network_runtime/common/nnrt_utils.cpp
+3
-1
ai/neural_network_runtime/stability/src/MultiThreadTest.cpp
ai/neural_network_runtime/stability/src/MultiThreadTest.cpp
+1
-2
未找到文件。
ai/neural_network_runtime/common/mock_idevice.cpp
浏览文件 @
2620890a
...
...
@@ -147,6 +147,7 @@ int32_t MockIDevice::IsModelCacheSupported(bool& isSupported)
int32_t
MockIDevice
::
AllocateBuffer
(
uint32_t
length
,
SharedBuffer
&
buffer
)
{
std
::
lock_guard
<
std
::
mutex
>
lock
(
m_mtx
);
sptr
<
Ashmem
>
ashptr
=
Ashmem
::
CreateAshmem
(
"allocateBuffer"
,
length
);
if
(
ashptr
==
nullptr
)
{
LOGE
(
"[NNRtTest] Create shared memory failed."
);
...
...
@@ -170,6 +171,7 @@ int32_t MockIDevice::AllocateBuffer(uint32_t length, SharedBuffer &buffer)
int32_t
MockIDevice
::
ReleaseBuffer
(
const
SharedBuffer
&
buffer
)
{
std
::
lock_guard
<
std
::
mutex
>
lock
(
m_mtx
);
auto
ash
=
m_ashmems
[
buffer
.
fd
];
ash
->
UnmapAshmem
();
return
HDF_SUCCESS
;
...
...
@@ -177,6 +179,7 @@ int32_t MockIDevice::ReleaseBuffer(const SharedBuffer &buffer)
int32_t
MockIDevice
::
MemoryCopy
(
float
*
data
,
uint32_t
length
)
{
std
::
lock_guard
<
std
::
mutex
>
lock
(
m_mtx
);
auto
memManager
=
NeuralNetworkRuntime
::
MemoryManager
::
GetInstance
();
auto
memAddress
=
memManager
->
MapMemory
(
m_bufferFd
,
length
);
if
(
memAddress
==
nullptr
)
{
...
...
ai/neural_network_runtime/common/mock_idevice.h
浏览文件 @
2620890a
...
...
@@ -97,7 +97,7 @@ private:
bool
m_priority
=
true
;
bool
m_cache
=
true
;
bool
m_dynamic
=
true
;
std
::
vector
<
bool
>
m_operations
{
true
}
;
std
::
mutex
m_mtx
;
};
class
MockIPreparedModel
:
public
IPreparedModel
{
...
...
ai/neural_network_runtime/common/nnrt_utils.cpp
浏览文件 @
2620890a
...
...
@@ -222,7 +222,9 @@ int ExecuteGraphMock(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs,
LOGE
(
"[NNRtTest] OH_NNExecutor_SetOutput failed! ret=%d
\n
"
,
ret
);
return
ret
;
}
ret
=
device
->
MemoryCopy
(
expect
,
operandTem
.
length
);
if
(
expect
!=
nullptr
){
ret
=
device
->
MemoryCopy
(
expect
,
operandTem
.
length
);
}
if
(
ret
!=
OH_NN_SUCCESS
)
{
LOGE
(
"[NNRtTest] device set expect output failed! ret=%d
\n
"
,
ret
);
return
ret
;
...
...
ai/neural_network_runtime/stability/src/MultiThreadTest.cpp
浏览文件 @
2620890a
...
...
@@ -48,8 +48,7 @@ void CompileModel(OH_NNCompilation *compilation, const OHNNCompileParam &compile
void
ExecuteModel
(
OH_NNExecutor
*
executor
,
const
OHNNGraphArgs
&
graphArgs
)
{
float
addExpectValue
[
4
]
=
{
0
,
1
,
2
,
3
};
ASSERT_EQ
(
OH_NN_SUCCESS
,
ExecuteGraphMock
(
executor
,
graphArgs
,
addExpectValue
));
ASSERT_EQ
(
OH_NN_SUCCESS
,
ExecuteGraphMock
(
executor
,
graphArgs
,
nullptr
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录