Browse Source

!26454 add header file master

Merge pull request !26454 from 刘勇琪/master
tags/v1.6.0
i-robot Gitee 4 years ago
parent
commit
f23e93ec63
34 changed files with 118 additions and 18 deletions
  1. +2
    -0
      mindspore/ccsrc/minddata/dataset/engine/cache/perf/cache_pipeline_run.cc
  2. +2
    -0
      mindspore/ccsrc/minddata/dataset/engine/consumers/pull_based_tree_consumer.cc
  3. +4
    -0
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc
  4. +2
    -0
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc
  5. +1
    -0
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.cc
  6. +3
    -0
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/mind_record_sampler.cc
  7. +3
    -0
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/python_sampler.cc
  8. +3
    -0
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/random_sampler.cc
  9. +2
    -0
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.cc
  10. +4
    -0
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/subset_sampler.cc
  11. +4
    -1
      mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/clue_node.cc
  12. +4
    -1
      mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/csv_node.cc
  13. +3
    -0
      mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc
  14. +4
    -1
      mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/text_file_node.cc
  15. +3
    -0
      mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/zip_node.cc
  16. +4
    -0
      mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.cc
  17. +4
    -1
      mindspore/ccsrc/minddata/dataset/engine/opt/post/auto_worker_pass.cc
  18. +4
    -1
      mindspore/ccsrc/minddata/dataset/engine/opt/pre/deep_copy_pass.cc
  19. +4
    -1
      mindspore/ccsrc/minddata/dataset/engine/opt/pre/input_validation_pass.cc
  20. +4
    -1
      mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.cc
  21. +3
    -0
      mindspore/ccsrc/minddata/dataset/kernels/data/concatenate_op.cc
  22. +1
    -0
      mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box.cc
  23. +5
    -2
      mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box_augment_op.cc
  24. +5
    -2
      mindspore/ccsrc/minddata/dataset/kernels/image/cutmix_batch_op.cc
  25. +4
    -1
      mindspore/ccsrc/minddata/dataset/kernels/image/mixup_batch_op.cc
  26. +3
    -1
      mindspore/ccsrc/minddata/dataset/kernels/image/random_affine_op.cc
  27. +5
    -2
      mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc
  28. +3
    -0
      mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_with_bbox_op.cc
  29. +5
    -1
      mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc
  30. +4
    -0
      mindspore/ccsrc/minddata/dataset/kernels/image/uniform_aug_op.cc
  31. +8
    -2
      mindspore/ccsrc/minddata/dataset/plugin/plugin_loader.cc
  32. +2
    -0
      mindspore/ccsrc/minddata/dataset/text/kernels/ngram_op.cc
  33. +3
    -0
      mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc
  34. +3
    -0
      mindspore/ccsrc/minddata/dataset/text/kernels/unicode_char_tokenizer_op.cc

+ 2
- 0
mindspore/ccsrc/minddata/dataset/engine/cache/perf/cache_pipeline_run.cc View File

@@ -16,6 +16,8 @@

#include "minddata/dataset/engine/cache/perf/cache_pipeline_run.h"

#include <algorithm>

#include "minddata/dataset/core/tensor.h"
#include "minddata/dataset/engine/data_schema.h"
#include "minddata/dataset/util/random.h"


+ 2
- 0
mindspore/ccsrc/minddata/dataset/engine/consumers/pull_based_tree_consumer.cc View File

@@ -16,6 +16,8 @@

#include "minddata/dataset/engine/consumers/pull_based_tree_consumer.h"

#include <algorithm>

namespace mindspore::dataset {
PullBasedIteratorConsumer::PullBasedIteratorConsumer() { tree_adapter_lite_ = std::make_unique<TreeAdapterLite>(); }



+ 4
- 0
mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc View File

@@ -13,8 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/engine/datasetops/source/image_folder_op.h"

#include <fstream>
#include <unordered_set>

#include "utils/ms_utils.h"
#include "minddata/dataset/core/config_manager.h"
#include "minddata/dataset/core/tensor_shape.h"


+ 2
- 0
mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc View File

@@ -13,10 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/engine/datasetops/source/manifest_op.h"

#include <algorithm>
#include <fstream>
#include <set>
#include <nlohmann/json.hpp>

#include "utils/file_utils.h"


+ 1
- 0
mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.cc View File

@@ -15,6 +15,7 @@
*/
#include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h"

#include <algorithm>
#include <limits>
#include <memory>



+ 3
- 0
mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/mind_record_sampler.cc View File

@@ -13,8 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/engine/datasetops/source/sampler/mind_record_sampler.h"

#include <algorithm>

#include "minddata/mindrecord/include/shard_reader.h"

namespace mindspore {


+ 3
- 0
mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/python_sampler.cc View File

@@ -13,8 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/engine/datasetops/source/sampler/python_sampler.h"

#include <utility>

namespace mindspore {
namespace dataset {



+ 3
- 0
mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/random_sampler.cc View File

@@ -13,10 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h"

#include <algorithm>
#include <limits>
#include <memory>

#include "minddata/dataset/util/random.h"

namespace mindspore {


+ 2
- 0
mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.cc View File

@@ -13,8 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h"

#include <algorithm>
#include <memory>
#include <vector>



+ 4
- 0
mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/subset_sampler.cc View File

@@ -13,8 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/engine/datasetops/source/sampler/subset_sampler.h"

#include <algorithm>
#include <string>

namespace mindspore {
namespace dataset {
// Constructor.


+ 4
- 1
mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/clue_node.cc View File

@@ -16,9 +16,12 @@

#include "minddata/dataset/engine/ir/datasetops/source/clue_node.h"

#include "minddata/dataset/engine/datasetops/source/clue_op.h"
#include <algorithm>
#include <utility>

#include "minddata/dataset/engine/datasetops/source/clue_op.h"
#include "minddata/dataset/util/status.h"

namespace mindspore {
namespace dataset {



+ 4
- 1
mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/csv_node.cc View File

@@ -16,9 +16,12 @@

#include "minddata/dataset/engine/ir/datasetops/source/csv_node.h"

#include "minddata/dataset/engine/datasetops/source/csv_op.h"
#include <algorithm>
#include <utility>

#include "minddata/dataset/engine/datasetops/source/csv_op.h"
#include "minddata/dataset/util/status.h"

namespace mindspore {
namespace dataset {



+ 3
- 0
mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc View File

@@ -16,6 +16,9 @@

#include "minddata/dataset/engine/ir/datasetops/source/minddata_node.h"

#include <stack>
#include <utility>

#include "minddata/dataset/engine/datasetops/source/mindrecord_op.h"
#include "minddata/dataset/engine/datasetops/source/sampler/mind_record_sampler.h"
#include "minddata/dataset/engine/ir/datasetops/cache_lookup_node.h"


+ 4
- 1
mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/text_file_node.cc View File

@@ -16,9 +16,12 @@

#include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"

#include "minddata/dataset/engine/datasetops/source/text_file_op.h"
#include <algorithm>
#include <utility>

#include "minddata/dataset/engine/datasetops/source/text_file_op.h"
#include "minddata/dataset/util/status.h"

namespace mindspore {
namespace dataset {



+ 3
- 0
mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/zip_node.cc View File

@@ -16,9 +16,12 @@

#include "minddata/dataset/engine/ir/datasetops/zip_node.h"

#include <algorithm>

#include "minddata/dataset/engine/datasetops/zip_op.h"
#include "minddata/dataset/engine/opt/pass.h"
#include "minddata/dataset/util/status.h"

namespace mindspore {
namespace dataset {



+ 4
- 0
mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.cc View File

@@ -13,8 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.h"

#include <string>
#include <vector>

#include "minddata/dataset/engine/ir/datasetops/map_node.h"
#include "minddata/dataset/kernels/image/random_crop_and_resize_op.h"
#include "minddata/dataset/kernels/image/random_crop_decode_resize_op.h"


+ 4
- 1
mindspore/ccsrc/minddata/dataset/engine/opt/post/auto_worker_pass.cc View File

@@ -14,10 +14,13 @@
* limitations under the License.
*/

#include "minddata/dataset/engine/opt/post/auto_worker_pass.h"

#include <algorithm>

#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
#include "minddata/dataset/engine/ir/datasetops/dataset_node.h"
#include "minddata/dataset/engine/ir/datasetops/map_node.h"
#include "minddata/dataset/engine/opt/post/auto_worker_pass.h"

namespace mindspore {
namespace dataset {


+ 4
- 1
mindspore/ccsrc/minddata/dataset/engine/opt/pre/deep_copy_pass.cc View File

@@ -14,9 +14,12 @@
* limitations under the License.
*/

#include "minddata/dataset/include/dataset/datasets.h"
#include "minddata/dataset/engine/opt/pre/deep_copy_pass.h"

#include <string>

#include "minddata/dataset/engine/ir/datasetops/root_node.h"
#include "minddata/dataset/include/dataset/datasets.h"

namespace mindspore {
namespace dataset {


+ 4
- 1
mindspore/ccsrc/minddata/dataset/engine/opt/pre/input_validation_pass.cc View File

@@ -14,9 +14,12 @@
* limitations under the License.
*/

#include "minddata/dataset/include/dataset/datasets.h"
#include "minddata/dataset/engine/opt/pre/input_validation_pass.h"

#include <string>

#include "minddata/dataset/include/dataset/datasets.h"

namespace mindspore {
namespace dataset {



+ 4
- 1
mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.cc View File

@@ -13,10 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/engine/perf/connector_size.h"
#include <fstream>
#include <algorithm>
#include <fstream>
#include <memory>

#include "minddata/dataset/core/config_manager.h"
#include "minddata/dataset/engine/execution_tree.h"
#include "minddata/dataset/util/path.h"


+ 3
- 0
mindspore/ccsrc/minddata/dataset/kernels/data/concatenate_op.cc View File

@@ -13,8 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/kernels/data/concatenate_op.h"

#include <limits>

#include "minddata/dataset/core/tensor.h"
#include "minddata/dataset/kernels/data/data_utils.h"
#include "minddata/dataset/kernels/tensor_op.h"


+ 1
- 0
mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box.cc View File

@@ -17,6 +17,7 @@
#include "minddata/dataset/kernels/image/bounding_box.h"

#include <algorithm>
#include <limits>
#include <vector>

namespace mindspore {


+ 5
- 2
mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box_augment_op.cc View File

@@ -15,10 +15,13 @@
*/

#include "minddata/dataset/kernels/image/bounding_box_augment_op.h"

#include <utility>

#include "minddata/dataset/core/cv_tensor.h"
#include "minddata/dataset/kernels/image/bounding_box.h"
#include "minddata/dataset/kernels/image/resize_op.h"
#include "minddata/dataset/kernels/image/image_utils.h"
#include "minddata/dataset/core/cv_tensor.h"
#include "minddata/dataset/kernels/image/resize_op.h"

namespace mindspore {
namespace dataset {


+ 5
- 2
mindspore/ccsrc/minddata/dataset/kernels/image/cutmix_batch_op.cc View File

@@ -14,12 +14,15 @@
* limitations under the License.
*/

#include "minddata/dataset/kernels/image/cutmix_batch_op.h"

#include <limits>
#include <string>
#include <utility>

#include "minddata/dataset/core/cv_tensor.h"
#include "minddata/dataset/kernels/image/image_utils.h"
#include "minddata/dataset/kernels/image/cutmix_batch_op.h"
#include "minddata/dataset/kernels/data/data_utils.h"
#include "minddata/dataset/kernels/image/image_utils.h"
#include "minddata/dataset/util/random.h"
#include "minddata/dataset/util/status.h"



+ 4
- 1
mindspore/ccsrc/minddata/dataset/kernels/image/mixup_batch_op.cc View File

@@ -14,10 +14,13 @@
* limitations under the License.
*/

#include "minddata/dataset/kernels/image/mixup_batch_op.h"

#include <limits>
#include <string>
#include <utility>

#include "minddata/dataset/core/cv_tensor.h"
#include "minddata/dataset/kernels/image/mixup_batch_op.h"
#include "minddata/dataset/kernels/data/data_utils.h"
#include "minddata/dataset/util/random.h"
#include "minddata/dataset/util/status.h"


+ 3
- 1
mindspore/ccsrc/minddata/dataset/kernels/image/random_affine_op.cc View File

@@ -13,10 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <cmath>

#include "minddata/dataset/kernels/image/random_affine_op.h"

#include <cmath>
#include <limits>

#include "minddata/dataset/kernels/image/math_utils.h"
#include "minddata/dataset/util/random.h"



+ 5
- 2
mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc View File

@@ -14,10 +14,13 @@
* limitations under the License.
*/

#include "minddata/dataset/util/status.h"
#include "minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h"

#include <utility>

#include "minddata/dataset/kernels/image/bounding_box.h"
#include "minddata/dataset/kernels/image/image_utils.h"
#include "minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h"
#include "minddata/dataset/util/status.h"

namespace mindspore {
namespace dataset {


+ 3
- 0
mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_with_bbox_op.cc View File

@@ -15,6 +15,9 @@
*/

#include "minddata/dataset/kernels/image/random_crop_with_bbox_op.h"

#include <utility>

#include "minddata/dataset/kernels/image/bounding_box.h"
#include "minddata/dataset/kernels/image/image_utils.h"
#include "minddata/dataset/util/status.h"


+ 5
- 1
mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc View File

@@ -13,11 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h"

#include <utility>

#include "minddata/dataset/core/cv_tensor.h"
#include "minddata/dataset/kernels/image/bounding_box.h"
#include "minddata/dataset/kernels/image/image_utils.h"
#include "minddata/dataset/util/status.h"
#include "minddata/dataset/core/cv_tensor.h"

namespace mindspore {
namespace dataset {


+ 4
- 0
mindspore/ccsrc/minddata/dataset/kernels/image/uniform_aug_op.cc View File

@@ -13,7 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/kernels/image/uniform_aug_op.h"

#include <utility>

#include "minddata/dataset/util/random.h"

namespace mindspore {


+ 8
- 2
mindspore/ccsrc/minddata/dataset/plugin/plugin_loader.cc View File

@@ -13,10 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <numeric>
#include "minddata/dataset/plugin/plugin_loader.h"
#include "minddata/dataset/plugin/shared_lib_util.h"

#include <algorithm>
#include <numeric>
#include <set>
#include <vector>

#include "mindspore/core/utils/log_adapter.h"
#include "minddata/dataset/plugin/shared_lib_util.h"

namespace mindspore {
namespace dataset {


+ 2
- 0
mindspore/ccsrc/minddata/dataset/text/kernels/ngram_op.cc View File

@@ -16,6 +16,8 @@

#include "minddata/dataset/text/kernels/ngram_op.h"

#include <algorithm>

namespace mindspore {
namespace dataset {



+ 3
- 0
mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc View File

@@ -16,6 +16,9 @@

#include "minddata/dataset/text/kernels/to_number_op.h"

#include <algorithm>
#include <limits>

#include "minddata/dataset/core/data_type.h"
#include "minddata/dataset/core/tensor.h"
#include "minddata/dataset/core/tensor_shape.h"


+ 3
- 0
mindspore/ccsrc/minddata/dataset/text/kernels/unicode_char_tokenizer_op.cc View File

@@ -13,9 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "minddata/dataset/text/kernels/unicode_char_tokenizer_op.h"

#include <memory>
#include <string_view>
#include <utility>
#include <vector>

#include "cppjieba/Unicode.hpp"


Loading…
Cancel
Save