From 292674a4bd5146a816ad59e711f3661dab7502fd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 11:39:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm b/iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm
index a3a8867..b4ddf01 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm
@@ -94,39 +94,17 @@
cout << "ConvertPydictToJhmap error" << endl;
throw "函数返回值异常!";
}
- /*delete pModule;
- pModule = nullptr;
- delete pModule;
-
- delete pFunc;
- pFunc = nullptr;
- delete pFunc;
-
+ cout << "clear_py_memory" << endl;
+ Py_XDECREF(pFunc);
#{foreach} ($column in [1..$entity.dataLength])
- delete[] data_${column};
- data_${column} = nullptr;
- delete data_${column};
-
+ Py_XDECREF(data_${column});
#{end}
#{if}($entity.model==1)
- delete model_path;
- model_path = nullptr;
- delete model_path;
+ Py_XDECREF(model_path);
#{end}
-
- delete settings_1;
- settings_1 = nullptr;
- delete settings_1;
-
- delete[] pArg;
- pArg = nullptr;
- delete pArg;
-
- Py_DECREF(pReturn);
- Py_DECREF(pFunc);
- Py_DECREF(pModule);
- Py_CLEAR(pModule);*/
-
+ Py_XDECREF(settings_1);
+ Py_XDECREF(pArg);
+ Py_XDECREF(pReturn);
return result;
}
catch (const char* msg)
--
Gitblit v1.9.3