saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-30 20:18:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebase rel-1.17.3 (#20006)

Browse source 
### Description

the release branch `rel-1.17.3` is created based on `rel-1.17.2` last
week. However, there are latest code change merged into `rel-1.17.2`:
#19897. The branch `rel-1.17.3` is protected so no push or delete can be
performed on it.

This PR cherry-picks the commit 633c22f based on 6bc6adc to make sure
the base of `rel-1.17.3` matches `rel-1.17.2`.

@snnn @pranavsharma This operation will ensure the code base contains
same code, but the git history will not be exactly same. If you want it
to be exactly same, I need your help to do a git rebase or delete and
recreate the branch.

Co-authored-by: Rachel Guo <35738743+YUNQIUGUO@users.noreply.github.com>
Co-authored-by: rachguo <rachguo@rachguos-Mini.attlocal.net>
Co-authored-by: George Wu <jywu@microsoft.com>
This commit is contained in:
Yulong Wang 2024-03-21 18:08:11 -07:00 committed by GitHub
parent 6bc6adc658
commit dbf1a8cd39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
onnxruntime/core/session/onnxruntime_c_api.cc
View file

@ -2724,6 +2724,7 @@ static constexpr OrtApi ort_api_1_to_17 = {
&OrtApis::SetDeterministicCompute,
&OrtApis::KernelContext_ParallelFor,
&OrtApis::SessionOptionsAppendExecutionProvider_OpenVINO_V2,
// End of Version 17 - DO NOT MODIFY ABOVE (see above text for more information)
};
// OrtApiBase can never change as there is no way to know what version of OrtApiBase is returned by OrtGetApiBase.
@ -2753,7 +2754,7 @@ static_assert(offsetof(OrtApi, ReleaseCANNProviderOptions) / sizeof(void*) == 22
static_assert(offsetof(OrtApi, GetSessionConfigEntry) / sizeof(void*) == 238, "Size of version 14 API cannot change");
static_assert(offsetof(OrtApi, GetBuildInfoString) / sizeof(void*) == 254, "Size of version 15 API cannot change");
static_assert(offsetof(OrtApi, KernelContext_GetResource) / sizeof(void*) == 265, "Size of version 16 API cannot change");
static_assert(offsetof(OrtApi, SetUserLoggingFunction) / sizeof(void*) == 266, "Size of version 17 API cannot change");
static_assert(offsetof(OrtApi, SessionOptionsAppendExecutionProvider_OpenVINO_V2) / sizeof(void*) == 275, "Size of version 17 API cannot change");
// So that nobody forgets to finish an API version, this check will serve as a reminder:
static_assert(std::string_view(ORT_VERSION) == "1.17.2",

7
onnxruntime/test/providers/cpu/model_tests.cc
View file

@ -601,6 +601,7 @@ static ORT_STRING_VIEW provider_name_dml = ORT_TSTR("dml");
std::vector<std::basic_string<ORTCHAR_T>> paths;
for (std::pair<ORT_STRING_VIEW, std::vector<ORT_STRING_VIEW>> kvp : provider_names) {
const ORT_STRING_VIEW provider_name = kvp.first;
// Setup ONNX node tests. The test data is preloaded on our CI build machines.
#if !defined(_WIN32)
ORT_STRING_VIEW node_test_root_path = ORT_TSTR("/data/onnx");
@ -608,7 +609,10 @@ static ORT_STRING_VIEW provider_name_dml = ORT_TSTR("dml");
ORT_STRING_VIEW node_test_root_path = ORT_TSTR("c:\\local\\data\\onnx");
#endif
for (auto p : kvp.second) {
paths.push_back(ConcatPathComponent(node_test_root_path, p));
// tensorrt ep isn't expected to pass all onnx node tests. exclude and run model tests only.
if (provider_name != provider_name_tensorrt) {
paths.push_back(ConcatPathComponent(node_test_root_path, p));
}
}
// Same as the above, except this one is for large models
@ -627,7 +631,6 @@ static ORT_STRING_VIEW provider_name_dml = ORT_TSTR("dml");
}
#endif
ORT_STRING_VIEW provider_name = kvp.first;
std::unordered_set<std::basic_string<ORTCHAR_T>> all_disabled_tests(std::begin(immutable_broken_tests),
std::end(immutable_broken_tests));
if (provider_name == provider_name_cuda) {