saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-24 02:47:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve consistency. Update some comments.

Browse source
This commit is contained in:
Scott McKay 2024-12-23 19:31:21 +10:00
parent dece8b8e6a
commit 351d12df9e
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/onnxruntime/core/session/onnxruntime_c_api.h
View file

@ -5304,7 +5304,7 @@ struct OrtModelBuilderApi {
*
* \since Version 1.21.
*/
ORT_API2_STATUS(ApplyModelToSession, _In_ OrtSession* session, _In_ OrtModel* model);
ORT_API2_STATUS(ApplyModelToModelBuilderSession, _In_ OrtSession* session, _In_ OrtModel* model);
/** \brief Finalize the Model Builder session.
*

2
include/onnxruntime/core/session/onnxruntime_cxx_inline.h
View file

@ -1159,7 +1159,7 @@ inline void SessionImpl<T>::SetEpDynamicOptions(const char* const* keys, const c
template <typename T>
inline void SessionImpl<T>::FinalizeModelBuilderSession(const ModelBuilderAPI::Model& model, const SessionOptions& options,
OrtPrepackedWeightsContainer* prepacked_weights_container) {
ThrowOnError(GetModelBuilderApi().ApplyModelToSession(this->p_, model));
ThrowOnError(GetModelBuilderApi().ApplyModelToModelBuilderSession(this->p_, model));
ThrowOnError(GetModelBuilderApi().FinalizeModelBuilderSession(this->p_, options, prepacked_weights_container));
}

2
onnxruntime/core/session/model_builder_api.h
View file

@ -51,7 +51,7 @@ ORT_API_STATUS_IMPL(CreateModelBuilderSessionFromArray, _In_ const OrtEnv* env,
_In_ const OrtSessionOptions* options,
_Outptr_ OrtSession** out);
ORT_API_STATUS_IMPL(ApplyModelToSession, _In_ OrtSession* session, _In_ OrtModel* model);
ORT_API_STATUS_IMPL(ApplyModelToModelBuilderSession, _In_ OrtSession* session, _In_ OrtModel* model);
ORT_API_STATUS_IMPL(FinalizeModelBuilderSession, _In_ OrtSession* session, _In_ const OrtSessionOptions* options,
_Inout_ OrtPrepackedWeightsContainer* prepacked_weights_container);

9
onnxruntime/core/session/model_builder_c_api.cc
View file

@ -243,8 +243,8 @@ ORT_API_STATUS_IMPL(OrtModelBuilderAPI::CreateSessionFromModel, _In_ const OrtEn
API_IMPL_END
}
ORT_API_STATUS_IMPL(OrtModelBuilderAPI::CreateModelBuilderSession, _In_ const OrtEnv* env, _In_ const ORTCHAR_T* model_path,
_In_ const OrtSessionOptions* options,
ORT_API_STATUS_IMPL(OrtModelBuilderAPI::CreateModelBuilderSession,
_In_ const OrtEnv* env, _In_ const ORTCHAR_T* model_path, _In_ const OrtSessionOptions* options,
_Outptr_ OrtSession** out) {
API_IMPL_BEGIN
std::unique_ptr<onnxruntime::InferenceSession> session;
@ -288,7 +288,8 @@ ORT_API_STATUS_IMPL(OrtModelBuilderAPI::CreateModelBuilderSessionFromArray, _In_
API_IMPL_END
}
ORT_API_STATUS_IMPL(OrtModelBuilderAPI::ApplyModelToSession, _In_ OrtSession* session, _In_ OrtModel* model) {
ORT_API_STATUS_IMPL(OrtModelBuilderAPI::ApplyModelToModelBuilderSession,
_In_ OrtSession* session, _In_ OrtModel* model) {
API_IMPL_BEGIN
auto sess = reinterpret_cast<onnxruntime::InferenceSession*>(session);
ORT_API_RETURN_IF_STATUS_NOT_OK(sess->ApplyUpdates(*model));
@ -332,7 +333,7 @@ static constexpr OrtModelBuilderApi ort_graph_api = {
&OrtModelBuilderAPI::CreateModelBuilderSession,
&OrtModelBuilderAPI::CreateModelBuilderSessionFromArray,
&OrtModelBuilderAPI::ApplyModelToSession,
&OrtModelBuilderAPI::ApplyModelToModelBuilderSession,
&OrtModelBuilderAPI::FinalizeModelBuilderSession,
};

4
onnxruntime/test/shared_lib/test_model_builder_api.cc
View file

@ -341,7 +341,7 @@ TEST(ModelBuilderAPITest, BasicModelEdit_CxxApi) {
SessionOptions so;
// Set this to save the model if you want to debug.
so.SetOptimizedModelFilePath(ORT_TSTR("model_builder_output.onnx"));
// so.SetOptimizedModelFilePath(ORT_TSTR("model_builder_edited.onnx"));
Session session = Session::CreateModelBuilderSession(*ort_env, TSTR("testdata/mnist.onnx"), so);
@ -351,7 +351,7 @@ TEST(ModelBuilderAPITest, BasicModelEdit_CxxApi) {
// the original graph is unchanged. nodes can be added before/after it. initializers can be added.
// new nodes must conform to the original domain:opset of the model.
// additional operator domain:opset pairs can be added.
std::vector<ModelBuilderAPI::Model::DomainOpsetPair> opsets;
std::vector<ModelBuilderAPI::Model::DomainOpsetPair> opsets; // no additional opsets required
ModelBuilderAPI::Model model(opsets);
std::vector<std::string> input_names = session.GetInputNames();