This is an automated email from the ASF dual-hosted git repository.
jevans pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.x by this push:
new da5c279 delete stream (#20973)
da5c279 is described below
commit da5c2790712f8528d263d880780f75519910667d
Author: waytrue17 <[email protected]>
AuthorDate: Wed Mar 23 11:02:40 2022 -0700
delete stream (#20973)
Co-authored-by: Wei Chu <[email protected]>
---
src/engine/naive_engine.cc | 3 +++
src/engine/threaded_engine_perdevice.cc | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/src/engine/naive_engine.cc b/src/engine/naive_engine.cc
index d216bcf..34860db 100644
--- a/src/engine/naive_engine.cc
+++ b/src/engine/naive_engine.cc
@@ -74,11 +74,14 @@ 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 440d290..2184d78 100644
--- a/src/engine/threaded_engine_perdevice.cc
+++ b/src/engine/threaded_engine_perdevice.cc
@@ -271,6 +271,10 @@ 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
