From: Dou Xinpeng <redacted>
Date: Wed, 25 Sep 2024 03:30:38 +0000 (+0800)
Subject: cann: fix crash when llama-bench is running on multiple cann devices (#9627)
X-Git-Tag: upstream/0.0.4488~665
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=904837e0cb2f5f01bf5d5901b7aa57a026860ae4;p=pkg%2Fggml%2Fsources%2Fllama.cpp

cann: fix crash when llama-bench is running on multiple cann devices (#9627)
---

diff --git a/ggml/src/ggml-cann/common.h b/ggml/src/ggml-cann/common.h
index e6a57010..edfa4961 100644
--- a/ggml/src/ggml-cann/common.h
+++ b/ggml/src/ggml-cann/common.h
@@ -227,6 +227,7 @@ struct ggml_backend_cann_context {
      * @brief Destructor for cleaning up resources.
      */
     ~ggml_backend_cann_context() {
+        ggml_cann_set_device(device);
         if (copy_event != nullptr) {
             ACL_CHECK(aclrtDestroyEvent(copy_event));
         }