[incubator-mxnet] branch v1.8.x updated: remove cleanup on side threads (#19557)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

manuseth pushed a commit to branch v1.8.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/v1.8.x by this push:
     new 7df16cb  remove cleanup on side threads (#19557)
7df16cb is described below

commit 7df16cba2fbb58dbb9f104168c82cb7379f14e38
Author: waytrue17 <52...@users.noreply.github.com>
AuthorDate: Wed Nov 18 16:08:10 2020 -0800

    remove cleanup on side threads (#19557)
    
    Co-authored-by: Wei Chu <we...@amazon.com>
---
 src/engine/naive_engine.cc              | 3 ---
 src/engine/threaded_engine_perdevice.cc | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/src/engine/naive_engine.cc b/src/engine/naive_engine.cc
index d98f77d..8a1c22e 100644
--- a/src/engine/naive_engine.cc
+++ b/src/engine/naive_engine.cc
@@ -74,14 +74,11 @@ class NaiveEngine final : public Engine {
     LOG(INFO) << "Engine shutdown";
     for (size_t i = 0; i < streams_.size(); ++i) {
       if (streams_[i] != nullptr) {
-        // Catch exception for CUDA driver shutdown
-        MSHADOW_CATCH_ERROR(mshadow::DeleteStream(streams_[i]));
         streams_[i] = nullptr;
       }
     }
     for (size_t i = 0; i < aux_streams_.size(); ++i) {
       if (aux_streams_[i] != nullptr) {
-        delete aux_streams_[i];
         aux_streams_[i] = nullptr;
       }
     }
diff --git a/src/engine/threaded_engine_perdevice.cc b/src/engine/threaded_engine_perdevice.cc
index 2184d78..440d290 100644
--- a/src/engine/threaded_engine_perdevice.cc
+++ b/src/engine/threaded_engine_perdevice.cc
@@ -271,10 +271,6 @@ class ThreadedEnginePerDevice : public ThreadedEngine {
     while (task_queue->Pop(&opr_block)) {
       this->ExecuteOprBlock(run_ctx, opr_block);
     }
-    // Catch exception for CUDA driver shutdown
-    MSHADOW_CATCH_ERROR(mshadow::DeleteStream<gpu>(stream));
-    if (aux_stream != nullptr)
-      delete aux_stream;
 #else
     ready_event->signal();
 #endif