Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
正统之独孤求败
mindspore
提交
913074e6
M
mindspore
项目概览
正统之独孤求败
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
0
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
913074e6
编写于
5月 13, 2020
作者:
C
Cathy Wong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cleanup dataset UT: resolve skipped test units
上级
6b686718
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
58 addition
and
28 deletion
+58
-28
tests/ut/data/dataset/golden/test_2ops_batch_repeat.npz
tests/ut/data/dataset/golden/test_2ops_batch_repeat.npz
+0
-0
tests/ut/data/dataset/golden/test_2ops_batch_shuffle.npz
tests/ut/data/dataset/golden/test_2ops_batch_shuffle.npz
+0
-0
tests/ut/data/dataset/golden/test_2ops_repeat_batch.npz
tests/ut/data/dataset/golden/test_2ops_repeat_batch.npz
+0
-0
tests/ut/data/dataset/golden/test_2ops_repeat_shuffle.npz
tests/ut/data/dataset/golden/test_2ops_repeat_shuffle.npz
+0
-0
tests/ut/data/dataset/golden/test_2ops_shuffle_batch.npz
tests/ut/data/dataset/golden/test_2ops_shuffle_batch.npz
+0
-0
tests/ut/data/dataset/golden/test_2ops_shuffle_repeat.npz
tests/ut/data/dataset/golden/test_2ops_shuffle_repeat.npz
+0
-0
tests/ut/python/dataset/test_2ops.py
tests/ut/python/dataset/test_2ops.py
+23
-14
tests/ut/python/dataset/test_exceptions.py
tests/ut/python/dataset/test_exceptions.py
+24
-11
tests/ut/python/dataset/test_tfreader_op.py
tests/ut/python/dataset/test_tfreader_op.py
+7
-0
tests/ut/python/dataset/test_zip.py
tests/ut/python/dataset/test_zip.py
+4
-3
未找到文件。
tests/ut/data/dataset/golden/test_
case_1_reverse_resul
t.npz
→
tests/ut/data/dataset/golden/test_
2ops_batch_repea
t.npz
浏览文件 @
913074e6
文件已移动
tests/ut/data/dataset/golden/test_
case_2_result
.npz
→
tests/ut/data/dataset/golden/test_
2ops_batch_shuffle
.npz
浏览文件 @
913074e6
文件已移动
tests/ut/data/dataset/golden/test_
case_1_result
.npz
→
tests/ut/data/dataset/golden/test_
2ops_repeat_batch
.npz
浏览文件 @
913074e6
文件已移动
tests/ut/data/dataset/golden/test_
case_0_result
.npz
→
tests/ut/data/dataset/golden/test_
2ops_repeat_shuffle
.npz
浏览文件 @
913074e6
文件已移动
tests/ut/data/dataset/golden/test_
case_2_reverse_result
.npz
→
tests/ut/data/dataset/golden/test_
2ops_shuffle_batch
.npz
浏览文件 @
913074e6
文件已移动
tests/ut/data/dataset/golden/test_
case_0_reverse_resul
t.npz
→
tests/ut/data/dataset/golden/test_
2ops_shuffle_repea
t.npz
浏览文件 @
913074e6
文件已移动
tests/ut/python/dataset/test_2ops.py
浏览文件 @
913074e6
...
...
@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ==============================================================================
from
util
import
save_and_check
import
mindspore.dataset
as
ds
from
mindspore
import
log
as
logger
from
util
import
save_and_check
DATA_DIR
=
[
"../data/dataset/testTFTestAllTypes/test.data"
]
SCHEMA_DIR
=
"../data/dataset/testTFTestAllTypes/datasetSchema.json"
...
...
@@ -24,7 +24,7 @@ COLUMNS = ["col_1d", "col_2d", "col_3d", "col_binary", "col_float",
GENERATE_GOLDEN
=
False
def
skip_test_case_0
():
def
test_2ops_repeat_shuffle
():
"""
Test Repeat then Shuffle
"""
...
...
@@ -43,11 +43,11 @@ def skip_test_case_0():
ds
.
config
.
set_seed
(
seed
)
data1
=
data1
.
shuffle
(
buffer_size
=
buffer_size
)
filename
=
"test_
case_0_result
.npz"
filename
=
"test_
2ops_repeat_shuffle
.npz"
save_and_check
(
data1
,
parameters
,
filename
,
generate_golden
=
GENERATE_GOLDEN
)
def
skip_test_
case_0_reverse
():
def
skip_test_
2ops_shuffle_repeat
():
"""
Test Shuffle then Repeat
"""
...
...
@@ -67,11 +67,11 @@ def skip_test_case_0_reverse():
data1
=
data1
.
shuffle
(
buffer_size
=
buffer_size
)
data1
=
data1
.
repeat
(
repeat_count
)
filename
=
"test_
case_0_reverse_resul
t.npz"
filename
=
"test_
2ops_shuffle_repea
t.npz"
save_and_check
(
data1
,
parameters
,
filename
,
generate_golden
=
GENERATE_GOLDEN
)
def
test_
case_1
():
def
test_
2ops_repeat_batch
():
"""
Test Repeat then Batch
"""
...
...
@@ -87,11 +87,11 @@ def test_case_1():
data1
=
data1
.
repeat
(
repeat_count
)
data1
=
data1
.
batch
(
batch_size
,
drop_remainder
=
True
)
filename
=
"test_
case_1_result
.npz"
filename
=
"test_
2ops_repeat_batch
.npz"
save_and_check
(
data1
,
parameters
,
filename
,
generate_golden
=
GENERATE_GOLDEN
)
def
test_
case_1_reverse
():
def
test_
2ops_batch_repeat
():
"""
Test Batch then Repeat
"""
...
...
@@ -107,11 +107,11 @@ def test_case_1_reverse():
data1
=
data1
.
batch
(
batch_size
,
drop_remainder
=
True
)
data1
=
data1
.
repeat
(
repeat_count
)
filename
=
"test_
case_1_reverse_resul
t.npz"
filename
=
"test_
2ops_batch_repea
t.npz"
save_and_check
(
data1
,
parameters
,
filename
,
generate_golden
=
GENERATE_GOLDEN
)
def
test_
case_2
():
def
test_
2ops_batch_shuffle
():
"""
Test Batch then Shuffle
"""
...
...
@@ -130,11 +130,11 @@ def test_case_2():
ds
.
config
.
set_seed
(
seed
)
data1
=
data1
.
shuffle
(
buffer_size
=
buffer_size
)
filename
=
"test_
case_2_result
.npz"
filename
=
"test_
2ops_batch_shuffle
.npz"
save_and_check
(
data1
,
parameters
,
filename
,
generate_golden
=
GENERATE_GOLDEN
)
def
test_
case_2_reverse
():
def
test_
2ops_shuffle_batch
():
"""
Test Shuffle then Batch
"""
...
...
@@ -153,5 +153,14 @@ def test_case_2_reverse():
data1
=
data1
.
shuffle
(
buffer_size
=
buffer_size
)
data1
=
data1
.
batch
(
batch_size
,
drop_remainder
=
True
)
filename
=
"test_
case_2_reverse_result
.npz"
filename
=
"test_
2ops_shuffle_batch
.npz"
save_and_check
(
data1
,
parameters
,
filename
,
generate_golden
=
GENERATE_GOLDEN
)
if
__name__
==
'__main__'
:
test_2ops_repeat_shuffle
()
#test_2ops_shuffle_repeat()
test_2ops_repeat_batch
()
test_2ops_batch_repeat
()
test_2ops_batch_shuffle
()
test_2ops_shuffle_batch
()
tests/ut/python/dataset/test_exceptions.py
浏览文件 @
913074e6
...
...
@@ -12,41 +12,54 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ==============================================================================
import
mindspore.dataset.transforms.vision.c_transforms
as
vision
import
pytest
import
mindspore.dataset
as
ds
import
mindspore.dataset.transforms.vision.c_transforms
as
vision
from
mindspore
import
log
as
logger
DATA_DIR
=
[
"../data/dataset/test_tf_file_3_images/train-0000-of-0001.data"
]
SCHEMA_DIR
=
"../data/dataset/test_tf_file_3_images/datasetSchema.json"
def
skip_test_exception
():
def
test_exception_01
():
"""
Test single exception with invalid input
"""
logger
.
info
(
"test_exception_01"
)
ds
.
config
.
set_num_parallel_workers
(
1
)
data
=
ds
.
TFRecordDataset
(
DATA_DIR
,
columns_list
=
[
"image"
])
data
=
data
.
map
(
input_columns
=
[
"image"
],
operations
=
vision
.
Resize
(
100
,
100
))
with
pytest
.
raises
(
RuntimeError
)
as
info
:
data
.
create_tuple_iterator
().
get_next
()
assert
"The shape size 1 of input tensor is invalid"
in
str
(
info
.
value
)
with
pytest
.
raises
(
ValueError
)
as
info
:
data
=
data
.
map
(
input_columns
=
[
"image"
],
operations
=
vision
.
Resize
(
100
,
100
))
assert
"Invalid interpolation mode."
in
str
(
info
.
value
)
def
test_sample_exception
():
def
test_exception_02
():
"""
Test multiple exceptions with invalid input
"""
logger
.
info
(
"test_exception_02"
)
num_samples
=
0
with
pytest
.
raises
(
ValueError
)
as
info
:
data
=
ds
.
TFRecordDataset
(
DATA_DIR
,
SCHEMA_DIR
,
columns_list
=
[
"image"
],
num_samples
=
num_samples
)
assert
"num_samples must be greater than 0"
in
str
(
info
.
value
)
num_samples
=
-
1
with
pytest
.
raises
(
ValueError
)
as
info
:
data
=
ds
.
TFRecordDataset
(
DATA_DIR
,
SCHEMA_DIR
,
columns_list
=
[
"image"
],
num_samples
=
num_samples
)
assert
"num_samples must be greater than 0"
in
str
(
info
.
value
)
num_samples
=
1
data
=
ds
.
TFRecordDataset
(
DATA_DIR
,
SCHEMA_DIR
,
columns_list
=
[
"image"
],
num_samples
=
num_samples
)
data
=
data
.
map
(
input_columns
=
[
"image"
],
operations
=
vision
.
Decode
())
data
=
data
.
map
(
input_columns
=
[
"image"
],
operations
=
vision
.
Resize
((
100
,
100
)))
# Confirm 1 sample in dataset
assert
sum
([
1
for
_
in
data
])
==
1
num_iters
=
0
for
item
in
data
.
create_dict_iterator
():
for
_
in
data
.
create_dict_iterator
():
num_iters
+=
1
assert
num_iters
==
1
if
__name__
==
'__main__'
:
test_exception
()
test_exception_01
()
test_exception_02
()
tests/ut/python/dataset/test_tfreader_op.py
浏览文件 @
913074e6
...
...
@@ -261,11 +261,18 @@ def test_case_invalid_files():
if
__name__
==
'__main__'
:
test_case_tf_shape
()
test_case_tf_read_all_dataset
()
test_case_num_samples
()
test_case_num_samples2
()
test_case_tf_shape_2
()
test_case_tf_file
()
test_case_tf_file_no_schema
()
test_case_tf_file_pad
()
test_tf_files
()
test_tf_record_schema
()
test_tf_record_shuffle
()
#test_tf_record_shard()
test_tf_shard_equal_rows
()
test_case_tf_file_no_schema_columns_list
()
test_tf_record_schema_columns_list
()
test_case_invalid_files
()
tests/ut/python/dataset/test_zip.py
浏览文件 @
913074e6
...
...
@@ -12,10 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ==============================================================================
from
util
import
save_and_check_dict
,
save_and_check_md5
import
mindspore.dataset
as
ds
from
mindspore
import
log
as
logger
from
util
import
save_and_check_dict
,
save_and_check_md5
import
mindspore.dataset
as
ds
# Dataset in DIR_1 has 5 rows and 5 columns
DATA_DIR_1
=
[
"../data/dataset/testTFBert5Rows1/5TFDatas.data"
]
...
...
@@ -147,7 +148,7 @@ def test_zip_exception_01():
logger
.
info
(
"Got an exception in DE: {}"
.
format
(
str
(
e
)))
def
skip_
test_zip_exception_02
():
def
test_zip_exception_02
():
"""
Test zip: zip datasets with duplicate column name
"""
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录