Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wjd2002
Ncnn
提交
1d0917c8
N
Ncnn
项目概览
wjd2002
/
Ncnn
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
N
Ncnn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
1d0917c8
编写于
7月 20, 2022
作者:
N
nihui
提交者:
GitHub
7月 20, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix build with very old gcc (#4048)
* clear bom marker, avoid vector data function
上级
e64245c4
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
13 addition
and
13 deletion
+13
-13
benchmark/benchncnn.cpp
benchmark/benchncnn.cpp
+1
-1
src/c_api.cpp
src/c_api.cpp
+2
-2
src/layer/roialign.cpp
src/layer/roialign.cpp
+1
-1
src/layer/x86/roialign_x86.cpp
src/layer/x86/roialign_x86.cpp
+1
-1
src/mat_pixel_affine.cpp
src/mat_pixel_affine.cpp
+1
-1
src/modelbin.cpp
src/modelbin.cpp
+5
-5
tools/plugin/ImageWatchNCNN.natvis
tools/plugin/ImageWatchNCNN.natvis
+1
-1
tools/plugin/ImageWatchNNIE.natvis
tools/plugin/ImageWatchNNIE.natvis
+1
-1
未找到文件。
benchmark/benchncnn.cpp
浏览文件 @
1d0917c8
// Tencent is pleased to support the open source community by making ncnn available.
// Tencent is pleased to support the open source community by making ncnn available.
//
//
// Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
// Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
//
//
...
...
src/c_api.cpp
浏览文件 @
1d0917c8
...
@@ -832,7 +832,7 @@ public:
...
@@ -832,7 +832,7 @@ public:
bottom_blobs0
[
i
]
=
(
ncnn_mat_t
)
&
bottom_blobs
[
i
];
bottom_blobs0
[
i
]
=
(
ncnn_mat_t
)
&
bottom_blobs
[
i
];
}
}
std
::
vector
<
ncnn_mat_t
>
top_blobs0
(
n2
,
(
ncnn_mat_t
)
0
);
std
::
vector
<
ncnn_mat_t
>
top_blobs0
(
n2
,
(
ncnn_mat_t
)
0
);
int
ret
=
layer
->
forward_n
(
layer
,
bottom_blobs0
.
data
(),
n
,
top_blobs0
.
data
()
,
n2
,
(
ncnn_option_t
)
&
opt
);
int
ret
=
layer
->
forward_n
(
layer
,
&
bottom_blobs0
[
0
],
n
,
&
top_blobs0
[
0
]
,
n2
,
(
ncnn_option_t
)
&
opt
);
for
(
int
i
=
0
;
i
<
n2
;
i
++
)
for
(
int
i
=
0
;
i
<
n2
;
i
++
)
{
{
top_blobs
[
i
]
=
*
(
Mat
*
)
top_blobs0
[
i
];
top_blobs
[
i
]
=
*
(
Mat
*
)
top_blobs0
[
i
];
...
@@ -858,7 +858,7 @@ public:
...
@@ -858,7 +858,7 @@ public:
{
{
bottom_top_blobs0
[
i
]
=
(
ncnn_mat_t
)
&
bottom_top_blobs
[
i
];
bottom_top_blobs0
[
i
]
=
(
ncnn_mat_t
)
&
bottom_top_blobs
[
i
];
}
}
return
layer
->
forward_inplace_n
(
layer
,
bottom_top_blobs0
.
data
()
,
n
,
(
ncnn_option_t
)
&
opt
);
return
layer
->
forward_inplace_n
(
layer
,
&
bottom_top_blobs0
[
0
]
,
n
,
(
ncnn_option_t
)
&
opt
);
}
}
virtual
int
forward_inplace
(
Mat
&
bottom_top_blob
,
const
Option
&
opt
)
const
virtual
int
forward_inplace
(
Mat
&
bottom_top_blob
,
const
Option
&
opt
)
const
...
...
src/layer/roialign.cpp
浏览文件 @
1d0917c8
// Tencent is pleased to support the open source community by making ncnn available.
// Tencent is pleased to support the open source community by making ncnn available.
//
//
// Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
// Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
//
//
...
...
src/layer/x86/roialign_x86.cpp
浏览文件 @
1d0917c8
// Tencent is pleased to support the open source community by making ncnn available.
// Tencent is pleased to support the open source community by making ncnn available.
//
//
// Copyright (C) 2020 THL A29 Limited, a Tencent company. All rights reserved.
// Copyright (C) 2020 THL A29 Limited, a Tencent company. All rights reserved.
//
//
...
...
src/mat_pixel_affine.cpp
浏览文件 @
1d0917c8
// Tencent is pleased to support the open source community by making ncnn available.
// Tencent is pleased to support the open source community by making ncnn available.
//
//
// Copyright (C) 2020 THL A29 Limited, a Tencent company. All rights reserved.
// Copyright (C) 2020 THL A29 Limited, a Tencent company. All rights reserved.
//
//
...
...
src/modelbin.cpp
浏览文件 @
1d0917c8
...
@@ -121,14 +121,14 @@ Mat ModelBinFromDataReader::load(int w, int type) const
...
@@ -121,14 +121,14 @@ Mat ModelBinFromDataReader::load(int w, int type) const
{
{
std
::
vector
<
unsigned
short
>
float16_weights
;
std
::
vector
<
unsigned
short
>
float16_weights
;
float16_weights
.
resize
(
align_data_size
);
float16_weights
.
resize
(
align_data_size
);
nread
=
d
->
dr
.
read
(
float16_weights
.
data
()
,
align_data_size
);
nread
=
d
->
dr
.
read
(
&
float16_weights
[
0
]
,
align_data_size
);
if
(
nread
!=
align_data_size
)
if
(
nread
!=
align_data_size
)
{
{
NCNN_LOGE
(
"ModelBin read float16_weights failed %zd"
,
nread
);
NCNN_LOGE
(
"ModelBin read float16_weights failed %zd"
,
nread
);
return
Mat
();
return
Mat
();
}
}
m
=
Mat
::
from_float16
(
float16_weights
.
data
()
,
w
);
m
=
Mat
::
from_float16
(
&
float16_weights
[
0
]
,
w
);
}
}
return
m
;
return
m
;
...
@@ -149,7 +149,7 @@ Mat ModelBinFromDataReader::load(int w, int type) const
...
@@ -149,7 +149,7 @@ Mat ModelBinFromDataReader::load(int w, int type) const
{
{
std
::
vector
<
signed
char
>
int8_weights
;
std
::
vector
<
signed
char
>
int8_weights
;
int8_weights
.
resize
(
align_data_size
);
int8_weights
.
resize
(
align_data_size
);
nread
=
d
->
dr
.
read
(
int8_weights
.
data
()
,
align_data_size
);
nread
=
d
->
dr
.
read
(
&
int8_weights
[
0
]
,
align_data_size
);
if
(
nread
!=
align_data_size
)
if
(
nread
!=
align_data_size
)
{
{
NCNN_LOGE
(
"ModelBin read int8_weights failed %zd"
,
nread
);
NCNN_LOGE
(
"ModelBin read int8_weights failed %zd"
,
nread
);
...
@@ -160,7 +160,7 @@ Mat ModelBinFromDataReader::load(int w, int type) const
...
@@ -160,7 +160,7 @@ Mat ModelBinFromDataReader::load(int w, int type) const
if
(
m
.
empty
())
if
(
m
.
empty
())
return
m
;
return
m
;
memcpy
(
m
.
data
,
int8_weights
.
data
()
,
w
);
memcpy
(
m
.
data
,
&
int8_weights
[
0
]
,
w
);
}
}
return
m
;
return
m
;
...
@@ -210,7 +210,7 @@ Mat ModelBinFromDataReader::load(int w, int type) const
...
@@ -210,7 +210,7 @@ Mat ModelBinFromDataReader::load(int w, int type) const
size_t
align_weight_data_size
=
alignSize
(
w
*
sizeof
(
unsigned
char
),
4
);
size_t
align_weight_data_size
=
alignSize
(
w
*
sizeof
(
unsigned
char
),
4
);
std
::
vector
<
unsigned
char
>
index_array
;
std
::
vector
<
unsigned
char
>
index_array
;
index_array
.
resize
(
align_weight_data_size
);
index_array
.
resize
(
align_weight_data_size
);
nread
=
d
->
dr
.
read
(
index_array
.
data
()
,
align_weight_data_size
);
nread
=
d
->
dr
.
read
(
&
index_array
[
0
]
,
align_weight_data_size
);
if
(
nread
!=
align_weight_data_size
)
if
(
nread
!=
align_weight_data_size
)
{
{
NCNN_LOGE
(
"ModelBin read index_array failed %zd"
,
nread
);
NCNN_LOGE
(
"ModelBin read index_array failed %zd"
,
nread
);
...
...
tools/plugin/ImageWatchNCNN.natvis
浏览文件 @
1d0917c8
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<AutoVisualizer
xmlns=
"http://schemas.microsoft.com/vstudio/debugger/natvis/2010"
>
<AutoVisualizer
xmlns=
"http://schemas.microsoft.com/vstudio/debugger/natvis/2010"
>
<UIVisualizer
ServiceId=
"{A452AFEA-3DF6-46BB-9177-C0B08F318025}"
Id=
"1"
MenuName=
"Add to Image Watch"
/>
<UIVisualizer
ServiceId=
"{A452AFEA-3DF6-46BB-9177-C0B08F318025}"
Id=
"1"
MenuName=
"Add to Image Watch"
/>
...
...
tools/plugin/ImageWatchNNIE.natvis
浏览文件 @
1d0917c8
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<AutoVisualizer
xmlns=
"http://schemas.microsoft.com/vstudio/debugger/natvis/2010"
>
<AutoVisualizer
xmlns=
"http://schemas.microsoft.com/vstudio/debugger/natvis/2010"
>
<UIVisualizer
ServiceId=
"{A452AFEA-3DF6-46BB-9177-C0B08F318025}"
Id=
"1"
MenuName=
"Add to Image Watch"
/>
<UIVisualizer
ServiceId=
"{A452AFEA-3DF6-46BB-9177-C0B08F318025}"
Id=
"1"
MenuName=
"Add to Image Watch"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录