Browse Source

!27586 Repair the blank line problem in the master alarm

Merge pull request !27586 from 刘勇琪/master
tags/v1.6.0
i-robot Gitee 4 years ago
parent
commit
7c0af1dede
11 changed files with 1 additions and 12 deletions
  1. +0
    -1
      mindspore/ccsrc/minddata/dataset/audio/ir/kernels/flanger_ir.cc
  2. +0
    -1
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/fashion_mnist_op.cc
  3. +0
    -1
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc
  4. +0
    -3
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/photo_tour_op.cc
  5. +0
    -1
      mindspore/ccsrc/minddata/dataset/engine/datasetops/source/places365_op.cc
  6. +0
    -1
      mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/photo_tour_node.cc
  7. +0
    -1
      mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/qmnist_node.cc
  8. +0
    -1
      mindspore/ccsrc/minddata/dataset/engine/tree_modifier.cc
  9. +0
    -1
      mindspore/ccsrc/minddata/dataset/kernels/image/random_adjust_sharpness_op.cc
  10. +0
    -1
      mindspore/ccsrc/minddata/dataset/kernels/image/random_auto_contrast_op.cc
  11. +1
    -0
      mindspore/python/mindspore/dataset/engine/datasets.py

+ 0
- 1
mindspore/ccsrc/minddata/dataset/audio/ir/kernels/flanger_ir.cc View File

@@ -22,7 +22,6 @@
namespace mindspore {
namespace dataset {
namespace audio {
// FlangerOperation
FlangerOperation::FlangerOperation(int32_t sample_rate, float delay, float depth, float regen, float width, float speed,
float phase, Modulation modulation, Interpolation interpolation)


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

@@ -81,6 +81,5 @@ Status FashionMnistOp::CountTotalRows(const std::string &dir, const std::string

return Status::OK();
}

} // namespace dataset
} // namespace mindspore

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

@@ -313,6 +313,5 @@ Status ImageFolderOp::GetNumClasses(int64_t *num_classes) {
num_classes_ = *num_classes;
return Status::OK();
}

} // namespace dataset
} // namespace mindspore

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

@@ -30,7 +30,6 @@

namespace mindspore {
namespace dataset {

constexpr uint32_t kPatchNumPerRow = 16;
constexpr uint32_t kPatchNumPerCol = 16;
constexpr uint32_t kColPerPatch = 64;
@@ -68,7 +67,6 @@ Status PhotoTourOp::LoadTensorRow(row_id_type row_id, TensorRow *trow) {
(*trow) = TensorRow(row_id, {std::move(image)});
trow->setPath({image_names_[row_id / (kPatchNumPerRow * kPatchNumPerCol)],
std::to_string(row_id % (kPatchNumPerRow * kPatchNumPerCol))});

} else {
std::shared_ptr<Tensor> image1, image2, matches;
// make a copy of cached tensor
@@ -414,6 +412,5 @@ Status PhotoTourOp::ComputeColMap() {
}
return Status::OK();
}

} // namespace dataset
} // namespace mindspore

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

@@ -304,6 +304,5 @@ Status Places365Op::ComputeColMap() {
}
return Status::OK();
}

} // namespace dataset
} // namespace mindspore

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

@@ -26,7 +26,6 @@

namespace mindspore {
namespace dataset {

PhotoTourNode::PhotoTourNode(const std::string &dataset_dir, const std::string &name, const std::string &usage,
std::shared_ptr<SamplerObj> sampler, std::shared_ptr<DatasetCache> cache)
: MappableSourceNode(std::move(cache)), dataset_dir_(dataset_dir), name_(name), usage_(usage), sampler_(sampler) {}


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

@@ -29,7 +29,6 @@
namespace mindspore {
namespace dataset {
QMnistNode::QMnistNode(const std::string &dataset_dir, const std::string &usage, bool compat,
std::shared_ptr<SamplerObj> sampler, std::shared_ptr<DatasetCache> cache)
: MappableSourceNode(std::move(cache)),


+ 0
- 1
mindspore/ccsrc/minddata/dataset/engine/tree_modifier.cc View File

@@ -18,7 +18,6 @@

namespace mindspore {
namespace dataset {

Status AutotuneCallback::DSNStepBegin(const CallbackParam &cb_param) {
// check if the queue is empty, no need to wait until a change request is ready
if (!change_request_queue_->empty()) {


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

@@ -18,7 +18,6 @@

namespace mindspore {
namespace dataset {

const float RandomAdjustSharpnessOp::kDefProbability = 0.5;

Status RandomAdjustSharpnessOp::Compute(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor> *output) {


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

@@ -20,7 +20,6 @@

namespace mindspore {
namespace dataset {

const float RandomAutoContrastOp::kCutOff = 0.0;
const std::vector<uint32_t> RandomAutoContrastOp::kIgnore = {};
const float RandomAutoContrastOp::kDefProbability = 0.5;


+ 1
- 0
mindspore/python/mindspore/dataset/engine/datasets.py View File

@@ -88,6 +88,7 @@ except ModuleNotFoundError:
if platform.system().lower() == "darwin" and multiprocessing.get_start_method() != "fork":
multiprocessing.set_start_method("fork", True)


class Shuffle(str, Enum):
GLOBAL: str = "global"
FILES: str = "files"


Loading…
Cancel
Save