vilc
/
mindspore2022
forked from huawei/mindspore2022
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!31712 clean code 

Merge pull request !31712 from r1chardf1d0/clean2
This commit is contained in:
i-robot 2022-03-23 02:07:48 +00:00 committed by Gitee
parent 0b3227f158 0d3d3c2a7f
commit 26340b8959
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mindspore/ccsrc/plugin/device/cpu/kernel/custom/julia_api.h
View File

@ -98,6 +98,9 @@ typedef struct _jl_array_t jl_array_t;
*/
class JuliaAPI {
public:
JuliaAPI(const JuliaAPI &) = delete;
JuliaAPI &operator=(const JuliaAPI &) = delete;
static JuliaAPI *GetInstance() {
static JuliaAPI julia_api;
return &julia_api;
@ -161,30 +164,34 @@ class JuliaAPI {
}
private:
JuliaAPI() { clear(); }
JuliaAPI() { Clear(); }
~JuliaAPI() {
#if !defined(_WIN32) && !defined(_WIN64)
if (handle_ != nullptr) {
// ready to break the loop in the julia thread
stop_ = true;
// notify loop continue, which will stop the loop, then julia thread finished.
c_.notify_one();
// join the julia thread
if (t_.joinable()) {
try {
t_.join();
} catch (const std::exception &e) {
MS_LOG(ERROR) << "Try to join the julia thread failed! Error message is " << e.what();
}
try {
FinishJuliaThread();
} catch (...) {
// exit
}
#if !defined(_WIN32) && !defined(_WIN64)
// close the handle of julia shared library
(void)dlclose(handle_);
}
clear();
#endif
}
Clear();
}
void clear() {
void FinishJuliaThread() {
// ready to break the loop in the julia thread
stop_ = true;
// notify loop continue, which will stop the loop, then julia thread finished.
c_.notify_one();
// join the julia thread
if (t_.joinable()) {
t_.join();
}
}
void Clear() noexcept {
handle_ = nullptr;
jl_eval_string_ = nullptr;
jl_get_global_ = nullptr;
@ -259,7 +266,7 @@ class JuliaAPI {
return suc;
}
void ErrorMsg(jl_value_t *ex) {
void ErrorMsg(jl_value_t *ex) const {
auto errtype = JlTypeOfStr(ex);
MS_LOG(ERROR) << "Got a julia error! Err type: " << errtype;
jl_module_t *base = reinterpret_cast<jl_module_t *>(JlEvalString("Main.Base"));