diff --git a/node/script/build.ts b/node/script/build.ts index 3453bda398a1c..95dacd076d3a3 100644 --- a/node/script/build.ts +++ b/node/script/build.ts @@ -41,7 +41,7 @@ const args = [ 'cmake-js', (REBUILD ? 'reconfigure' : 'configure'), `--arch=${ARCH}`, - '--CDnapi_build_version=3', + '--CDnapi_build_version=6', `--CDCMAKE_BUILD_TYPE=${CONFIG}`, ]; if (ONNXRUNTIME_BUILD_DIR && typeof ONNXRUNTIME_BUILD_DIR === 'string') { diff --git a/node/src/inference_session_wrap.cc b/node/src/inference_session_wrap.cc index 78f32ec09250b..9f235d29d20b7 100644 --- a/node/src/inference_session_wrap.cc +++ b/node/src/inference_session_wrap.cc @@ -10,13 +10,16 @@ #include "tensor_helper.h" Napi::FunctionReference InferenceSessionWrap::constructor; -Ort::Env *InferenceSessionWrap::ortEnv; Napi::Object InferenceSessionWrap::Init(Napi::Env env, Napi::Object exports) { // create ONNX runtime env Ort::InitApi(); - ortEnv = new Ort::Env{ORT_LOGGING_LEVEL_WARNING, "onnxruntime-node"}; - + ORT_NAPI_THROW_ERROR_IF( + Ort::Global::api_ == nullptr, env, + "Failed to initialize ONNX Runtime API. It could happen when this nodejs binding was built with a higher version " + "ONNX Runtime but now runs with a lower version ONNX Runtime DLL(or shared library)."); + auto ortEnv = new Ort::Env{ORT_LOGGING_LEVEL_WARNING, "onnxruntime-node"}; + env.SetInstanceData(ortEnv); // initialize binding Napi::HandleScope scope(env); @@ -28,7 +31,6 @@ Napi::Object InferenceSessionWrap::Init(Napi::Env env, Napi::Object exports) { constructor = Napi::Persistent(func); constructor.SuppressDestruct(); - exports.Set("InferenceSession", func); return exports; } @@ -54,7 +56,7 @@ Napi::Value InferenceSessionWrap::LoadModel(const Napi::CallbackInfo &info) { Napi::String value = info[0].As(); ParseSessionOptions(info[1].As(), sessionOptions); - this->session_.reset(new Ort::Session(OrtEnv(), + this->session_.reset(new Ort::Session(*env.GetInstanceData(), #ifdef _WIN32 reinterpret_cast(value.Utf16Value().c_str()), #else @@ -69,8 +71,9 @@ Napi::Value InferenceSessionWrap::LoadModel(const Napi::CallbackInfo &info) { int64_t bytesLength = info[2].As().Int64Value(); ParseSessionOptions(info[1].As(), sessionOptions); - this->session_.reset( - new Ort::Session(OrtEnv(), reinterpret_cast(buffer) + bytesOffset, bytesLength, sessionOptions)); + this->session_.reset(new Ort::Session(*env.GetInstanceData(), + reinterpret_cast(buffer) + bytesOffset, bytesLength, + sessionOptions)); } else { ORT_NAPI_THROW_TYPEERROR( env, diff --git a/node/src/inference_session_wrap.h b/node/src/inference_session_wrap.h index 8298819288947..1a51a70a836cf 100644 --- a/node/src/inference_session_wrap.h +++ b/node/src/inference_session_wrap.h @@ -54,10 +54,6 @@ class InferenceSessionWrap : public Napi::ObjectWrap { // persistent constructor static Napi::FunctionReference constructor; - // global env - static Ort::Env *ortEnv; - static Ort::Env &OrtEnv() { return *ortEnv; } - // session objects bool initialized_; std::unique_ptr session_;