Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
a22763b6
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mindspore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
a22763b6
编写于
6月 14, 2020
作者:
H
hesham
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Bug in CIFAR after removing GetMutabble buffer
Fixes # I1KIPC
上级
05eeedec
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
2 deletion
+37
-2
mindspore/ccsrc/dataset/engine/datasetops/source/cifar_op.cc
mindspore/ccsrc/dataset/engine/datasetops/source/cifar_op.cc
+7
-2
tests/ut/python/dataset/test_cifarop.py
tests/ut/python/dataset/test_cifarop.py
+30
-0
未找到文件。
mindspore/ccsrc/dataset/engine/datasetops/source/cifar_op.cc
浏览文件 @
a22763b6
...
...
@@ -367,9 +367,14 @@ Status CifarOp::ParseCifarData() {
TensorShape
({
kCifarImageHeight
,
kCifarImageWidth
,
kCifarImageChannel
}),
data_schema_
->
column
(
0
).
type
()));
auto
itr
=
image_tensor
->
begin
<
uint8_t
>
();
for
(;
itr
!=
image_tensor
->
end
<
uint8_t
>
();
itr
++
)
{
*
itr
=
block
[
cur_block_index
++
];
uint32_t
total_pix
=
kCifarImageHeight
*
kCifarImageWidth
;
for
(
int
pix
=
0
;
pix
<
total_pix
;
++
pix
)
{
for
(
int
ch
=
0
;
ch
<
kCifarImageChannel
;
++
ch
)
{
*
itr
=
block
[
cur_block_index
+
ch
*
total_pix
+
pix
];
itr
++
;
}
}
cur_block_index
+=
total_pix
*
kCifarImageChannel
;
cifar_image_label_pairs_
.
emplace_back
(
std
::
make_pair
(
image_tensor
,
labels
));
}
RETURN_IF_NOT_OK
(
cifar_raw_data_block_
->
PopFront
(
&
block
));
...
...
tests/ut/python/dataset/test_cifarop.py
浏览文件 @
a22763b6
...
...
@@ -12,6 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ==============================================================================
import
os
import
numpy
as
np
import
mindspore.dataset
as
ds
from
mindspore
import
log
as
logger
...
...
@@ -26,6 +30,20 @@ DATA_DIR_10 = "../data/dataset/testCifar10Data"
DATA_DIR_100
=
"../data/dataset/testCifar100Data"
def
load_cifar
(
path
):
raw
=
np
.
empty
(
0
,
dtype
=
np
.
uint8
)
for
file_name
in
os
.
listdir
(
path
):
if
file_name
.
endswith
(
".bin"
):
with
open
(
os
.
path
.
join
(
path
,
file_name
),
mode
=
'rb'
)
as
file
:
raw
=
np
.
append
(
raw
,
np
.
fromfile
(
file
,
dtype
=
np
.
uint8
),
axis
=
0
)
raw
=
raw
.
reshape
(
-
1
,
3073
)
labels
=
raw
[:,
0
]
images
=
raw
[:,
1
:]
images
=
images
.
reshape
(
-
1
,
3
,
32
,
32
)
images
=
images
.
transpose
(
0
,
2
,
3
,
1
)
return
images
,
labels
def
test_case_dataset_cifar10
():
"""
dataset parameter
...
...
@@ -56,6 +74,18 @@ def test_case_dataset_cifar100():
assert
num_iter
==
100
def
test_reading_cifar10
():
"""
Validate CIFAR10 image readings
"""
data1
=
ds
.
Cifar10Dataset
(
DATA_DIR_10
,
100
,
shuffle
=
False
)
images
,
labels
=
load_cifar
(
DATA_DIR_10
)
for
i
,
d
in
enumerate
(
data1
.
create_dict_iterator
()):
np
.
testing
.
assert_array_equal
(
d
[
"image"
],
images
[
i
])
np
.
testing
.
assert_array_equal
(
d
[
"label"
],
labels
[
i
])
if
__name__
==
'__main__'
:
test_case_dataset_cifar10
()
test_case_dataset_cifar100
()
test_reading_cifar10
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录