[incubator-mxnet] branch v1.9.x updated: Remove cleanup on side threads (#19378) (#20917)

[je...@apache.org]

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

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


The following commit(s) were added to refs/heads/v1.9.x by this push:
     new 8041c0d  Remove cleanup on side threads (#19378) (#20917)
8041c0d is described below

commit 8041c0da75cd146ebd578c7bee13af25dc231a98
Author: Joe Evans <jo...@gmail.com>
AuthorDate: Mon Feb 28 21:09:35 2022 -0800

    Remove cleanup on side threads (#19378) (#20917)
    
    * Remove cleanup on side threads
    
    * removed comment
    
    Co-authored-by: Przemyslaw Tredak <pt...@nvidia.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 e7412fa..2cc28a3 100644
--- a/src/engine/naive_engine.cc
+++ b/src/engine/naive_engine.cc
@@ -73,14 +73,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 c59a06b..dfdb6d1 100644
--- a/src/engine/threaded_engine_perdevice.cc
+++ b/src/engine/threaded_engine_perdevice.cc
@@ -270,10 +270,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