!936 delete unused change_mode_op

Merge pull request !936 from xiefangqi/br_del_changemode

mindspore/ccsrc/dataset/api/python_bindings.cc

@@ -19,9 +19,6 @@
 #include "dataset/kernels/no_op.h"
 #include "dataset/kernels/data/one_hot_op.h"
 #include "dataset/kernels/image/center_crop_op.h"
-#if !defined(_WIN32) && !defined(_WIN64)
-#include "dataset/kernels/image/change_mode_op.h"
-#endif
 #include "dataset/kernels/image/cut_out_op.h"
 #include "dataset/kernels/image/decode_op.h"
 #include "dataset/kernels/image/hwc_to_chw_op.h"
@@ -307,12 +304,6 @@ void bindTensorOps2(py::module *m) {
          py::arg("fillG") = RandomCropOp::kDefFillG, py::arg("fillB") = RandomCropOp::kDefFillB);
   (void)py::class_<HwcToChwOp, TensorOp, std::shared_ptr<HwcToChwOp>>(*m, "ChannelSwapOp").def(py::init<>());
 
-#if !defined(_WIN32) && !defined(_WIN64)
-  (void)py::class_<ChangeModeOp, TensorOp, std::shared_ptr<ChangeModeOp>>(
-    *m, "ChangeModeOp", "Tensor operation to change colors from BGR to RGB")
-    .def(py::init<>());
-#endif
-
   (void)py::class_<OneHotOp, TensorOp, std::shared_ptr<OneHotOp>>(
     *m, "OneHotOp", "Tensor operation to apply one hot encoding. Takes number of classes.")
     .def(py::init<int32_t>());

mindspore/ccsrc/dataset/kernels/image/CMakeLists.txt

-if (WIN32)
-  add_library(kernels-image OBJECT
-      center_crop_op.cc
-      cut_out_op.cc
-      decode_op.cc
-      hwc_to_chw_op.cc
-      image_utils.cc
-      normalize_op.cc
-      pad_op.cc
-      random_color_adjust_op.cc
-      random_crop_decode_resize_op.cc
-      random_crop_and_resize_op.cc
-      random_crop_op.cc
-      random_horizontal_flip_op.cc
-      random_resize_op.cc
-      random_rotation_op.cc
-      random_vertical_flip_op.cc
-      rescale_op.cc
-      resize_bilinear_op.cc
-      resize_op.cc
-      uniform_aug_op.cc
-      )
-else()
-  add_library(kernels-image OBJECT
-      center_crop_op.cc
-      change_mode_op.cc
-      cut_out_op.cc
-      decode_op.cc
-      hwc_to_chw_op.cc
-      image_utils.cc
-      normalize_op.cc
-      pad_op.cc
-      random_color_adjust_op.cc
-      random_crop_decode_resize_op.cc
-      random_crop_and_resize_op.cc
-      random_crop_op.cc
-      random_horizontal_flip_op.cc
-      random_resize_op.cc
-      random_rotation_op.cc
-      random_vertical_flip_op.cc
-      rescale_op.cc
-      resize_bilinear_op.cc
-      resize_op.cc
-      uniform_aug_op.cc
-      )
-endif()
\ No newline at end of file
+add_library(kernels-image OBJECT
+    center_crop_op.cc
+    cut_out_op.cc
+    decode_op.cc
+    hwc_to_chw_op.cc
+    image_utils.cc
+    normalize_op.cc
+    pad_op.cc
+    random_color_adjust_op.cc
+    random_crop_decode_resize_op.cc
+    random_crop_and_resize_op.cc
+    random_crop_op.cc
+    random_horizontal_flip_op.cc
+    random_resize_op.cc
+    random_rotation_op.cc
+    random_vertical_flip_op.cc
+    rescale_op.cc
+    resize_bilinear_op.cc
+    resize_op.cc
+    uniform_aug_op.cc
+    )

mindspore/ccsrc/dataset/kernels/image/change_mode_op.cc

-/**
- * Copyright 2019 Huawei Technologies Co., Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "dataset/kernels/image/change_mode_op.h"
-
-#include "dataset/core/cv_tensor.h"
-#include "dataset/kernels/image/image_utils.h"
-#include "dataset/util/status.h"
-
-namespace mindspore {
-namespace dataset {
-Status ChangeModeOp::Compute(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor> *output) {
-  IO_CHECK(input, output);
-  MS_LOG(INFO) << "WARN_DEPRECATED: ChangeModeOp is disabled, colour mode has NOT been changed.";
-  *output = input;
-  return Status::OK();
-}
-}  // namespace dataset
-}  // namespace mindspore

mindspore/ccsrc/dataset/kernels/image/change_mode_op.h

-/**
- * Copyright 2019 Huawei Technologies Co., Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef DATASET_KERNELS_IMAGE_CHANGE_MODE_OP_H_
-#define DATASET_KERNELS_IMAGE_CHANGE_MODE_OP_H_
-
-#include <memory>
-
-#include "dataset/core/tensor.h"
-#include "dataset/kernels/tensor_op.h"
-#include "dataset/util/status.h"
-
-namespace mindspore {
-namespace dataset {
-class ChangeModeOp : public TensorOp {
- public:
-  // Name: Print()
-  // Description: A function that prints info about the node
-  void Print(std::ostream &out) const override { out << "ChangeModeOp"; }
-
-  // Name: Compute()
-  // Description: The input second and last dimensions are swapped
-  // i.e. NHWC becomes NCHW
-  Status Compute(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor> *output) override;
-};
-}  // namespace dataset
-}  // namespace mindspore
-#endif  // DATASET_KERNELS_IMAGE_CHANGE_MODE_OP_H_

tests/ut/cpp/dataset/CMakeLists.txt

@@ -13,7 +13,6 @@ SET(DE_UT_SRCS
     arena_test.cc
     btree_test.cc
     center_crop_op_test.cc
-    change_mode_test.cc
     channel_swap_test.cc
     circular_pool_test.cc
     client_config_test.cc

tests/ut/cpp/dataset/change_mode_test.cc

-/**
- * Copyright 2019 Huawei Technologies Co., Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "common/common.h"
-#include "common/cvop_common.h"
-#include "dataset/kernels/image/change_mode_op.h"
-#include "utils/log_adapter.h"
-
-using namespace mindspore::dataset;
-using mindspore::MsLogLevel::INFO;
-using mindspore::ExceptionType::NoExceptionType;
-using mindspore::LogStream;
-
-class MindDataTestChangeModeOp : public UT::CVOP::CVOpCommon {
- public:
-  MindDataTestChangeModeOp() : CVOpCommon() {}
-};
-
-TEST_F(MindDataTestChangeModeOp, TestOp) {
-  MS_LOG(INFO) << "Doing MindDataTestChangeModeOp.";
-
-  // Creating a Tensor
-  TensorShape s = input_tensor_->shape();
-  int size_buffer = s[0] * s[1] * s[2];
-
-  std::unique_ptr<uchar[]> output_buffer(new uchar[size_buffer]);
-  std::shared_ptr<Tensor> output_tensor(new Tensor(s, DataType(DataType::DE_UINT8)));
-
-  std::unique_ptr<ChangeModeOp> op(new ChangeModeOp());
-  op->Compute(input_tensor_, &output_tensor);
-  EXPECT_TRUE(op->OneToOne());
-
-  // Saving
-  CheckImageShapeAndData(output_tensor, kChangeMode);
-
-  MS_LOG(INFO) << "MindDataTestChangeModeOp end.";
-}