Browse Source

fix bug

tags/v1.5.0-rc1
shenwei41 4 years ago
parent
commit
780a7efae2
3 changed files with 10 additions and 6 deletions
  1. +6
    -3
      mindspore/ccsrc/minddata/dataset/api/execute.cc
  2. +1
    -1
      mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.cc
  3. +3
    -2
      mindspore/dataset/vision/c_transforms.py

+ 6
- 3
mindspore/ccsrc/minddata/dataset/api/execute.cc View File

@@ -266,15 +266,18 @@ Status Execute::operator()(const mindspore::MSTensor &input, mindspore::MSTensor

// Apply transforms on tensor
for (auto &t : transforms) {
std::shared_ptr<dataset::Tensor> de_output;
Status rc_ = t->Compute(de_tensor, &de_output);
TensorRow de_tensor_row;
TensorRow de_output_row;
de_tensor_row.push_back(de_tensor);
de_output_row.resize(1);
Status rc_ = t->Compute(de_tensor_row, &de_output_row);
if (rc_.IsError()) {
MS_LOG(ERROR) << rc_;
return rc_;
}

// For next transform
de_tensor = std::move(de_output);
de_tensor = std::move(de_output_row[0]);
}

// Convert dataset::Tensor to mindspore::Tensor


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

@@ -136,7 +136,7 @@ Status RandomCropOp::Compute(const TensorRow &input, TensorRow *output) {
&padded_image_h, &crop_further));
if (!crop_further) {
(*output)[i] = pad_image;
return Status::OK();
continue;
}
if (i == 0) {
GenRandomXY(&x, &y, padded_image_w, padded_image_h);


+ 3
- 2
mindspore/dataset/vision/c_transforms.py View File

@@ -301,12 +301,13 @@ class ConvertColor(ImageTensorOperation):
- ConvertMode.COLOR_RGBA2GRAY, Convert RGBA image to GRAY image.

Examples:
>>> import mindspore.dataset.vision.utils as mode
>>> # Convert RGB images to GRAY images
>>> convert_op = c_vision.ConvertColor(ConvertMode.COLOR_RGB2GRAY)
>>> convert_op = c_vision.ConvertColor(mode.ConvertMode.COLOR_RGB2GRAY)
>>> image_folder_dataset = image_folder_dataset.map(operations=convert_op,
... input_columns=["image"])
>>> # Convert RGB images to BGR images
>>> convert_op = c_vision.ConvertColor(ConvertMode.COLOR_RGB2BGR)
>>> convert_op = c_vision.ConvertColor(mode.ConvertMode.COLOR_RGB2BGR)
>>> image_folder_dataset_1 = image_folder_dataset_1.map(operations=convert_op,
... input_columns=["image"])
"""


Loading…
Cancel
Save