diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-05-26 15:26:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-26 15:26:31 +0200 |
commit | 41a6f322b4244eb1eb300b3b754d7970c3deb732 (patch) | |
tree | 6032ac8b3deddaaf6a48fcc57cf2590c461a5c8c | |
parent | a19e2325ed17b25df740b223d96eeea14f895e70 (diff) | |
parent | c7d738acb70c80f37804608ec2bb45fcf46748de (diff) |
Merge pull request #17988 from vespa-engine/havardpe/disable-onnx-arena
disable use of arena allocator
-rw-r--r-- | eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp | 7 | ||||
-rw-r--r-- | eval/src/vespa/eval/onnx/onnx_wrapper.cpp | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp b/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp index 9b44dd7519e..54f958f8111 100644 --- a/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp +++ b/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp @@ -436,4 +436,11 @@ TEST(OnnxTest, inspect_float_to_int8_conversion) { //------------------------------------------------------------------------- } +TEST(OnnxTest, default_allocator_type) { + Ort::AllocatorWithDefaultOptions default_alloc; + OrtAllocatorType res = Invalid; + Ort::ThrowOnError(Ort::GetApi().MemoryInfoGetType(default_alloc.GetInfo(), &res)); + fprintf(stderr, "default allocator type: %d\n", int(res)); +} + GTEST_MAIN_RUN_ALL_TESTS() diff --git a/eval/src/vespa/eval/onnx/onnx_wrapper.cpp b/eval/src/vespa/eval/onnx/onnx_wrapper.cpp index 3a593f491d8..f848c421c9d 100644 --- a/eval/src/vespa/eval/onnx/onnx_wrapper.cpp +++ b/eval/src/vespa/eval/onnx/onnx_wrapper.cpp @@ -414,7 +414,7 @@ struct Onnx::EvalContext::SelectConvertResult { Onnx::EvalContext::EvalContext(const Onnx &model, const WireInfo &wire_info) : _model(model), _wire_info(wire_info), - _cpu_memory(Ort::MemoryInfo::CreateCpu(OrtArenaAllocator, OrtMemTypeDefault)), + _cpu_memory(Ort::MemoryInfo::CreateCpu(OrtDeviceAllocator, OrtMemTypeDefault)), _param_values(), _result_values(), _results(), @@ -535,6 +535,7 @@ Onnx::Onnx(const vespalib::string &model_file, Optimize optimize) _options.SetIntraOpNumThreads(1); _options.SetInterOpNumThreads(1); _options.SetGraphOptimizationLevel(convert_optimize(optimize)); + _options.DisableCpuMemArena(); _session = Ort::Session(_shared.env(), model_file.c_str(), _options); extract_meta_data(); } |