From 17144219e79af57d92c901686a72ccbeddf8eab1 Mon Sep 17 00:00:00 2001
From: xulei2020 <xulei83@huawei.com>
Date: Fri, 5 Mar 2021 09:56:33 +0800
Subject: [PATCH] fix MD log Bug

---
 .../ccsrc/minddata/dataset/engine/datasetops/batch_op.cc    | 5 +----
 .../minddata/dataset/engine/datasetops/device_queue_op.cc   | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc
index eb711b3344..7f1e8595e4 100644
--- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc
+++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc
@@ -387,10 +387,7 @@ Status BatchOp::InvokeBatchMapFunc(TensorTable *input, TensorTable *output, CBat
       for (size_t i = 0; i < ret_tuple.size(); i++) {
         TensorRow output_batch;
         // If user returns a type that is neither a list nor an array, issue a error msg.
-        if (py::isinstance<py::array>(ret_tuple[i])) {
-          MS_LOG(INFO) << "column: " << out_col_names_[i]
-                       << " returned by per_batch_map is a np.array. Please use list instead.";
-        } else if (!py::isinstance<py::list>(ret_tuple[i])) {
+        if (!py::isinstance<py::list>(ret_tuple[i])) {
           MS_LOG(ERROR) << "column: " << out_col_names_[i]
                         << " returned by per_batch_map is not a list, this could lead to conversion failure.";
         }
diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.cc
index 3176d1a445..ad6cd496ce 100644
--- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.cc
+++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.cc
@@ -409,6 +409,7 @@ Status DeviceQueueOp::PushDataToGPU() {
 }
 
 Status DeviceQueueOp::RetryPushData(unsigned int handle, const std::vector<DataItemGpu> &items) {
+  bool flagLog = false;
   while (!GpuBufferMgr::GetInstance().IsClosed() && !TaskManager::FindMe()->Interrupted()) {
     BlockQueueStatus_T ret = GpuBufferMgr::GetInstance().Push(handle, items, WAIT_TIME);
     if (ret) {
@@ -416,7 +417,10 @@ Status DeviceQueueOp::RetryPushData(unsigned int handle, const std::vector<DataI
         return Status(StatusCode::kMDUnexpectedError, __LINE__, __FILE__, "Invalid input data, please check it.");
       } else {
         if (!stop_send_) {
-          MS_LOG(DEBUG) << "Retry pushing data...";
+          if (!flagLog) {
+            MS_LOG(DEBUG) << "Retry pushing data...";
+            flagLog = true;
+          }
           continue;
         }
         break;