Commit Graph

54 Commits

Author SHA1 Message Date
Eric Zhang 809e1d5086 added python api based on cpp api
1st draft of python iterator

Added Cifar10 and Cifar100 pybind port

Change pybind to use IR for Skip and Manifest

Signed-off-by: alex-yuyue <yue.yu1@huawei.com>

DatasetNode as a base for all IR nodes

namespace change

Fix the namespace issue and make ut tests work

Signed-off-by: alex-yuyue <yue.yu1@huawei.com>

Add VOCDataset

!63 Added RandomDataset
* Added RandomDataset

add imagefolder ir

Pybind switch: CelebA and UT

!61 CLUE example with class definition
* Merge branch 'python-api' of gitee.com:ezphlow/mindspore into clue_class_pybind
* Passing testcases
* Added CLUE, not working

add ManifestDataset IR

Signed-off-by: alex-yuyue <yue.yu1@huawei.com>

Update Coco & VOC & TFReader, Update clang-format, Reorder
datasets_binding

!69 Add Generator and move c_dataset.Iterator to dataset.Iterator
* Add GeneratorDataset to c_dataset
* Add GeneratorDataset to c_dataset

!67 Moving c_datasets and adding sampler wrapper
* Need to add create() method in datasets.py
* migration from c_dataset to dataset part 1

!71 Fix indent error
* Fix indentation error

!72 Fix c_api tests cases
* Fix c_api tests cases

!73 Added CSV Dataset
* Added CSVDataset

pybind switch: Take and CelebA fixes

!75 move c_dataset functionality to datasets
* Fixed existing testcases
* Added working clue and imagefolder
* Added sampler conversion from pybind
* Added sampler creation

!77 Add Python API tree
* Python API tree

add minddataset

TextFileDataset pybind

Rename to skip test_concat.py and test_minddataset_exception.py

!80 Add batch IR to python-api branch, most test cases work
* staging III
* staging, add pybind

Enable more c_api take and CelebA tests; delete util_c_api

!84 Schema changes in datasets.py
* Schema changes

!85 Remove input_indexes from sub-classes
* remove input_index from each subclass

!83 Remove C datasets
* Removed c_dataset package
* Remove c_datasets

!82  pybind switch: shuffle
* pybind switch: shuffle

!86 Add build_vocab
* Add build_vocab

Rebase with upstream/master
_shuffle conflict
BatchNode error

!88 Fix rebase problem
* fix rebase problem

Enable more unit tests; code typo/nit fixes

!91 Fix python vocag hang
* Fix python vocab hang

!89 Added BucketBatchByLength Pybind switch
* Added BucketBatchByLength

Update and enable more tet_c_api_*.py tests

!95 Add BuildSentencePeiceVocab
* - Add BuildSentencePeiceVocab

!96 Fix more tests
* - Fix some tests

- Enable more test_c_api_*
- Add syncwait

!99 pybind switch for device op
* pybind switch for device op

!93 Add getters to python API
* Add getters to python API

!101 Validate tree, error if graph
* - Add sync wait

!103 TFrecord/Random Datasets schema problem
* - TfRecord/Random schem aproblem

!102 Added filter pybind switch
* Added Filter pybind switch

!104 Fix num_samples
* - TfRecord/Random schem aproblem

!105 Fix to_device hang
* Fix to_device hang

!94 Adds Cache support for CLUE dataset
* Added cache for all dataset ops
* format change
* Added CLUE cache support
* Added Cache conversion

Add save pybind

fix compile err

init modify concat_node

!107 Fix some tests cases
* Fix tests cases

Enable and fix more tests

!109 pybind switch for get dataset size
* pybind_get_dataset_size

some check-code fixes for pylint, cpplint and clang-format

!113 Add callback
* revert
* dataset_sz 1 line
* fix typo
* get callback to work

!114 Make Android compile clean
* Make Android Compile Clean

Fix build issues due to rebase

!115 Fix more tests
* Fix tests cases
* !93 Add getters to python API

fix test_profiling.py

!116 fix get dataset size
* fix get dataset size

!117 GetColumnNames pybind switch
* Added GetColumnNames pybind switch

code-check fixes: clangformat, cppcheck, cpplint, pylint

Delete duplicate test_c_api_*.py files; more lint fixes

!121 Fix cpp tests
* Remove extra call to getNext in cpp tests

!122 Fix Schema with Generator
* Fix Schema with Generator

fix some cases of csv & mindrecord

!124 fix tfrecord get_dataset_size and add some UTs
* fix tfrecord get dataset size and add some ut for get_dataset_size

!125 getter separation
* Getter separation

!126 Fix sampler.GetNumSamples
* Fix sampler.GetNumSampler

!127 Assign runtime getter to each get function
* Assign runtime getter to each get function

Fix compile issues

!128 Match master code
* Match master code

!129 Cleanup DeviceOp/save code
* Cleanup ToDevice/Save code

!130 Add cache fix
* Added cache fix for map and image folder

!132 Fix testing team issues
* Pass queue_name from python to C++
* Add Schema.from_json

!131 Fix Cache op issues and delete de_pipeline
* Roll back C++ change
* Removed de_pipeline and passing all cache tests.
* fixed cache tests

!134 Cleanup datasets.py part1
* Cleanup dataset.py part1

!133 Updated validation for SentencePieceVocab.from_dataset
* Added type_check for column names in SentencePieceVocab.from_dataset

Rebase on master 181120 10:20

fix profiling

temporary solution of catching stauts from Node.Build()

!141 ToDevice Termination
* ToDevice termination

pylint fixes

!137 Fix test team issues and add some corresponding tests
* Fix test team issues and add some corresponding tests

!138 TreeGetter changes to use OptPass
* Getter changes to use OptPass (Zirui)

Rebase fix

!143 Fix cpplint issue
* Fix cpplint issue

pylint fixes in updated testcases

!145 Reset exceptions testcase
* reset exception test to master

!146 Fix Check_Pylint Error
* Fix Check_Pylint Error

!147 fix android
* fix android

!148 ToDevice changes
* Add ToDevice to the iterator List for cleanup at exit

!149 Pylint issue
* Add ToDevice to the iterator List for cleanup at exit

!150 Pylint 2
* Add ToDevice to the iterator List for cleanup at exit

!152 ExecutionTree error
* ET destructor error

!153 in getter_pass, only remove callback, without deleting map op
* getter pass no longer removes map

!156 early __del__ of iterator/to_device
* early __del__ of iterator

!155 Address review comments Eric 1
* Added one liner fix to validators.py
* roll back signature fix
* lint fix
* Eric Address comments 2
* C++ lint fix
* Address comments Eric 1

!158 Review rework for dataset bindings - part 1
* Reorder nodes repeat and rename
* Review rework for dataset bindings - part 1

!154 Fixing minor problems in the comments (datasets.py, python_tree_consumer.cc, iterators_bindings.cc, and iterators.py)
* Fixing minor problems in the comments (datasets.py, python_tree_consum…

!157 add replace none
* Add replace_none to datasets.py, address comments in tests

Trying to resolve copy

Override the deepcopy method of deviceop

Create_ir_tree method

Create_ir_tree method 2

Create_ir_tree method 2

del to_device if already exists

del to_device if already exists

cache getters shapes and types

Added yolov3 relaxation, to be rolled back

Get shapes and types together

bypass yolo

NumWorkers for MapOp

revert Yolo

revert Thor

Print more info

Debug code: Update LOG INFO to LOG ERROR

do not remove epochctrl for getter pass

Remove repeat(1)

pritn batch size

add log to tree_consumer and device_queue op

Revert PR 8744

Signed-off-by: alex-yuyue <yue.yu1@huawei.com>

__del__ toDEvice

__del__ toDevice2

!165 add ifndef ENABLE_ANDROID to device queue print
* Add ifndef ENABLE_ANDROID to device queue print

revert some changes

!166 getter: get_data_info
* getter: get_data_info

!168 add back tree print
* revert info to warnning in one log
* add back the missed print tree log

Release GIL in GetDataInfo
2020-11-25 15:46:59 -05:00
liyong 48e688c166 add dynamic shape support 2020-11-24 12:13:18 +08:00
hesham 9e868d7633 Changes from python-api branch:
Fix bug in batch getDatasetSize
Add getDatasetSize support for generator_op.cc
Fix header guards of some files
2020-11-16 15:55:11 -05:00
Zirui Wu 3555d19b07 fix get num_class in imagefolder
address cmt

review cmts
2020-11-12 14:26:54 -05:00
Xiao Tianci 4a5e287b92 add filter c api and ut 2020-11-06 15:49:23 +08:00
hesham 5169fb4c42 Remove api namespace 2020-11-02 20:09:37 -05:00
xulei2020 90c1314ff1 add default for sentencepiece col_names processing and vocab_size must be provided 2020-10-28 14:50:52 +08:00
mindspore-ci-bot 1ee9c4d014 !6645 [MD] add unique op
Merge pull request !6645 from liyong126/md_unique_op
2020-10-22 14:43:37 +08:00
liyong fb2bd156c9 add unique op 2020-10-22 09:12:37 +08:00
anzhengqi 5cf079595e fix sink_size error 2020-10-21 22:19:56 +08:00
mindspore-ci-bot 48601f51b0 !7295 [MD] C++ api add MindDataset
Merge pull request !7295 from luoyang/c-api-pyfunc
2020-10-20 19:45:45 +08:00
luoyang 2dc8e5f421 [MD] C++ api add MindDataset 2020-10-20 16:12:49 +08:00
Eric 1f11ccce06 Removed log_adapter dependency for minddata lite
Brute force fix?

Added missing import

Added removal of new cache functionality

Fix batch

Remove crc and cache optimizer

Remove affine

Remove cut mix batch

Added securec.h

Removed unused crc import

Fixed minor arm64 compile issues for tensor ops

Removed excess code from de_tensor

Added vision import

remove random device ops

Removed commented line

Added extra layer to switch adapter logic

Added securec

Added float fix
2020-10-20 00:32:58 -04:00
mindspore-ci-bot 6f77ec45f1 !6905 [MD] Enable cache for more leaf datasets
Merge pull request !6905 from lixiachen/CacheOp_dev
2020-09-30 16:49:23 +08:00
Lixia Chen 477808e622 Enable cache for other leaf ops 2020-09-25 13:11:04 -04:00
mindspore-ci-bot 0d8015b043 !5300 [MD] Add nD Slice Support
Merge pull request !5300 from nhussain/slice_op
2020-09-25 20:38:19 +08:00
Eric 4828c29046 Added missing macro 2020-09-24 21:59:42 -04:00
mindspore-ci-bot 4c0b3c1bd3 !6017 per_batch_map needs to support x input columns and y output columns
Merge pull request !6017 from ZiruiWu/per_batch_map_multi_col
2020-09-25 04:08:01 +08:00
nhussain 77d507279c first working implementation
add string implementation, can handle partial string slices

finish core implementation, added Index object

fix up the logic

add in new SliceOption object, cleaning up tests
2020-09-24 15:39:28 -04:00
Lixia Chen 983827ec5c Rebase up to 88ded11f59 2020-09-24 14:09:08 -04:00
Zirui Wu 0cab373223 per_batch_map supports x num_columns to y num_columns
decided to use project after batch as well

per_batch_map 1->x colunm works

add more test case

add test cases, project after map

col order hahaah

fix ci

add test cases

addr review cmts

ci

fix build err

fix test case failure

ci
2020-09-24 12:01:22 -04:00
anzhengqi 8e1a2ef5ae stop send data to device after end of sequence 2020-09-15 15:02:37 +08:00
Zirui Wu d54ba374b9 order dict by column_id in create_dict_iterator()
fix CI
2020-09-11 15:33:47 -04:00
Zirui Wu 1bb93580dd Add usage flag to MNIST/CIFAR
ci fix 1

fix ci 2

fix ci 3

fix ci 4

fix ci 5

fix ci 6

fix ci 7

change var name in CelebA from dataset_type to usage

address review cmts

fix cpp ut fail

change mode to usage in VOCDataset

fix cmts

fix ci test case fail
2020-09-09 09:59:55 -04:00
mindspore-ci-bot c45f79d36b !5384 [MD]-Api changes
Merge pull request !5384 from nhussain/api_changes
2020-09-09 09:49:05 +08:00
Zirui Wu bde9f18f5a update lookup api to take in a type
ci

add test case

address some of the review cmts

address review cmts
2020-09-08 11:59:28 -04:00
nhussain 3bac9d3713 switch input columns and operation
change ImagefolderDV2 name

change ds.transforms.vision to ds.vision

change batch api to match map api more closely

compose op changes

test_pylint

remove compose op from vision, move to transform module, refactor map and batch to use column_order
2020-09-08 10:26:20 -04:00
mindspore-ci-bot d76ac7c6e8 !5648 GetColumnNames for Python
Merge pull request !5648 from MahdiRahmaniHanzaki/get-col-name
2020-09-03 22:37:42 +08:00
Mahdi 6e7aab8c4f Added GetColumnNames for Datasets 2020-09-02 17:12:48 -04:00
mindspore-ci-bot ecfe728963 !5085 Enable hostname parameter for DatasetCache
Merge pull request !5085 from lixiachen/cache_hostname
2020-09-02 04:56:06 +08:00
mahdi 84efa0b96b Added BucketBatchByLength for C API 2020-08-31 17:06:16 -04:00
islam_amin 94a4a3f20b changing affine and posterize apis 2020-08-26 10:51:54 -04:00
Lixia Chen 00ce7f7364 Add hostname to DatasetCache plus env override
Turn --stop into sync

Ignore the rc of shutdown
2020-08-24 10:45:22 -04:00
Zirui Wu 74c1e6da60 introducing pause and quit flags to DataBuffer
fix review cmts

fix ci

fix Ci

fixci

address ci

ci

- add timeout
- add more test cases

fix CI

address review cmts
2020-08-21 14:33:26 -04:00
mindspore-ci-bot 9a3baf4f6c !4314 [MD] remove defaults used in binding code, and remove bilinear resize op
Merge pull request !4314 from nhussain/clean_up_bindings
2020-08-20 22:16:56 +08:00
Jesse Lee 8a08d0c37b Phase 2 of CacheOp 2020-08-19 13:45:55 -04:00
Zirui Wu 78c1aa1d96 Implemented Callback for Dataset
implment pause in MapOp, added more to callback

add ds_callback

- Initial drop of Python DSCallback

- Pybind DSCallback

- Pybind DSCallback

added callback to mapOp

- de_pipeline DSCallback

- de_pipeline DSCallback

add test case, segfault for now

fix seg fault

- de_pipeline DSCallback

remove 1 line

update callback test case, now works

use builder class for mapOp callback

- de_pipeline DSCallback

- de_pipeline DSCallback

- de_pipeline DSCallback

better test case

minor fix

add comments and minor clean ups

get rid of nullptr in MapOp, use other flag instead

fix a bug ParseMapOp only takes 1 callback

- Added WaitedDSCalabck

refactor callback param

fix text case incorrect number

- added testing

fix cpp test case

- added testing

- revert back lenet changes

- cleanup test_callbacks.py

- cleanup test_callbacks.py

fix CI stage I

fix CI stage II

fix CI and update epoch counter

- add validation
- add more testing  test_callbacks.py

use random data op to do tests

adjust when to call EpochBegin/End

- add repeat with callback

- addressing reviewers' comments

- docstring and CI fixes

- docstring and CI fixes

- docstring and CI fixes

- rebase with upstream/master

fix cpp test case

fix review comments

addr review cmts, add test case
2020-08-19 12:31:04 -04:00
nhussain eb9a611041 remove old defaults 2020-08-19 10:11:19 -04:00
mindspore-ci-bot 256dccc651 !4498 Gnn data processing supports distributed scenarios
Merge pull request !4498 from heleiwang/gnn_distributed
2020-08-19 16:09:05 +08:00
heleiwang 8ee4d8e92d Gnn data processing supports distributed scenarios 2020-08-19 11:09:01 +08:00
nhussain 738ae2c78d change api to use std_vector
try to display image
2020-08-18 15:41:21 -04:00
islam_amin 979111d0ef Added Posterize Op 2020-08-18 13:55:47 -04:00
mindspore-ci-bot 113ff6ca24 !4367 CutMixBatch Augmentation Op
Merge pull request !4367 from MahdiRahmaniHanzaki/cutmix
2020-08-18 03:27:33 +08:00
mahdi 3ecc53fb4e Added CutMix 2020-08-17 13:01:47 -04:00
Alexey Shevlyakov 8526d5414d RandomColor 2020-08-13 16:10:21 -04:00
genglishuai 4d4df68d1e add DistributedSampler for Concat op 2020-08-13 22:52:02 +08:00
avakh 477528de7f random sharpness cpp op support 2020-08-11 15:30:40 -04:00
nhussain 7766efd58e add files 2020-08-11 11:54:14 -04:00
qianlong e9c4378ed8 add support of soft dvpp op 2020-08-11 15:46:07 +08:00
mindspore-ci-bot 266df56570 !4220 [MD] add num_samples support in minddataset pk sampler
Merge pull request !4220 from liyong126/minddataset_pk_num_samples
2020-08-11 11:22:28 +08:00