From 50faab308b7df1ba293e17e4373c78e6c325db55 Mon Sep 17 00:00:00 2001 From: Scott McKay Date: Sat, 12 Oct 2019 06:11:29 +1000 Subject: [PATCH] Remove 'Ort' prefix from OrtAddFreeDimensionOverride for consistency. (#2099) --- include/onnxruntime/core/session/onnxruntime_c_api.h | 4 ++-- onnxruntime/core/session/abi_session_options.cc | 2 +- onnxruntime/core/session/onnxruntime_c_api.cc | 2 +- onnxruntime/core/session/ort_apis.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/onnxruntime/core/session/onnxruntime_c_api.h b/include/onnxruntime/core/session/onnxruntime_c_api.h index 2238d3ec58..2c632a6914 100644 --- a/include/onnxruntime/core/session/onnxruntime_c_api.h +++ b/include/onnxruntime/core/session/onnxruntime_c_api.h @@ -527,8 +527,8 @@ struct OrtApi { // Override symbolic dimensions with actual values if known at session initialization time to enable // optimizations that can take advantage of fixed values (such as memory planning, etc) - OrtStatus*(ORT_API_CALL* OrtAddFreeDimensionOverride)(_Inout_ OrtSessionOptions* options, - _In_ const char* symbolic_dim, _In_ int64_t dim_override)NO_EXCEPTION; + OrtStatus*(ORT_API_CALL* AddFreeDimensionOverride)(_Inout_ OrtSessionOptions* options, + _In_ const char* symbolic_dim, _In_ int64_t dim_override)NO_EXCEPTION; /** * APIs to support non-tensor types - map and sequence. diff --git a/onnxruntime/core/session/abi_session_options.cc b/onnxruntime/core/session/abi_session_options.cc index 2df36ba1a9..7f24a9c1e1 100644 --- a/onnxruntime/core/session/abi_session_options.cc +++ b/onnxruntime/core/session/abi_session_options.cc @@ -144,7 +144,7 @@ ORT_API_STATUS_IMPL(OrtApis::SetInterOpNumThreads, _In_ OrtSessionOptions* optio return nullptr; } -ORT_API_STATUS_IMPL(OrtApis::OrtAddFreeDimensionOverride, _Inout_ OrtSessionOptions* options, +ORT_API_STATUS_IMPL(OrtApis::AddFreeDimensionOverride, _Inout_ OrtSessionOptions* options, _In_ const char* symbolic_dim, _In_ int64_t dim_override) { options->value.free_dimension_overrides.push_back(onnxruntime::FreeDimensionOverride{symbolic_dim, dim_override}); return nullptr; diff --git a/onnxruntime/core/session/onnxruntime_c_api.cc b/onnxruntime/core/session/onnxruntime_c_api.cc index 08cbe5f8f8..a52184fb9a 100644 --- a/onnxruntime/core/session/onnxruntime_c_api.cc +++ b/onnxruntime/core/session/onnxruntime_c_api.cc @@ -1325,7 +1325,7 @@ static constexpr OrtApi ort_api_1 = { &OrtApis::AllocatorFree, &OrtApis::AllocatorGetInfo, &OrtApis::GetAllocatorWithDefaultOptions, - &OrtApis::OrtAddFreeDimensionOverride, + &OrtApis::AddFreeDimensionOverride, &OrtApis::GetValue, &OrtApis::GetValueCount, &OrtApis::CreateValue, diff --git a/onnxruntime/core/session/ort_apis.h b/onnxruntime/core/session/ort_apis.h index b77010910f..07e09fdcb7 100644 --- a/onnxruntime/core/session/ort_apis.h +++ b/onnxruntime/core/session/ort_apis.h @@ -108,7 +108,7 @@ ORT_API_STATUS_IMPL(GetTensorShapeElementCount, _In_ const OrtTensorTypeAndShape ORT_API_STATUS_IMPL(GetTensorTypeAndShape, _In_ const OrtValue* value, _Outptr_ OrtTensorTypeAndShapeInfo** out); ORT_API_STATUS_IMPL(GetTypeInfo, _In_ const OrtValue* value, _Outptr_ OrtTypeInfo** out); ORT_API_STATUS_IMPL(GetValueType, _In_ const OrtValue* value, _Out_ enum ONNXType* out); -ORT_API_STATUS_IMPL(OrtAddFreeDimensionOverride, _Inout_ OrtSessionOptions* options, _In_ const char* symbolic_dim, _In_ int64_t dim_override); +ORT_API_STATUS_IMPL(AddFreeDimensionOverride, _Inout_ OrtSessionOptions* options, _In_ const char* symbolic_dim, _In_ int64_t dim_override); ORT_API_STATUS_IMPL(CreateMemoryInfo, _In_ const char* name1, enum OrtAllocatorType type, int id1, enum OrtMemType mem_type1, _Outptr_ OrtMemoryInfo** out); ORT_API_STATUS_IMPL(CreateCpuMemoryInfo, enum OrtAllocatorType type, enum OrtMemType mem_type1, _Outptr_ OrtMemoryInfo** out)