bumps up version in main from 1.20 -> 1.21 (#22482)
Bump up version in main from 1.20.0 to 1.21.0 since the release branch has been cut.
This commit is contained in:
Родитель
55c584954c
Коммит
e5c2e50849
|
@ -1 +1 @@
|
|||
1.20.0
|
||||
1.21.0
|
||||
|
|
|
@ -76,7 +76,7 @@ namespace Microsoft.ML.OnnxRuntime
|
|||
DOrtGetApi OrtGetApi = (DOrtGetApi)Marshal.GetDelegateForFunctionPointer(NativeMethods.OrtGetApiBase().GetApi, typeof(DOrtGetApi));
|
||||
#endif
|
||||
|
||||
const uint ORT_API_VERSION = 20;
|
||||
const uint ORT_API_VERSION = 21;
|
||||
#if NETSTANDARD2_0
|
||||
IntPtr ortApiPtr = OrtGetApi(ORT_API_VERSION);
|
||||
api_ = (OrtApi)Marshal.PtrToStructure(ortApiPtr, typeof(OrtApi));
|
||||
|
|
|
@ -8,6 +8,11 @@ For more information on ONNX Runtime, please see `aka.ms/onnxruntime <https://ak
|
|||
Changes
|
||||
-------
|
||||
|
||||
1.21.0
|
||||
^^^^^^
|
||||
|
||||
Release Notes : https://github.com/Microsoft/onnxruntime/releases/tag/v1.21.0
|
||||
|
||||
1.20.0
|
||||
^^^^^^
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
*
|
||||
* This value is used by some API functions to behave as this version of the header expects.
|
||||
*/
|
||||
#define ORT_API_VERSION 20
|
||||
#define ORT_API_VERSION 21
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
// This file is generated by /js/scripts/update-version.ts
|
||||
// Do not modify file content manually.
|
||||
|
||||
export const version = '1.20.0';
|
||||
export const version = '1.21.0';
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "onnxruntime-common",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "onnxruntime-common",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"typedoc": "^0.25.7"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"license": "MIT",
|
||||
"type": "module",
|
||||
"name": "onnxruntime-common",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"repository": {
|
||||
"url": "https://github.com/Microsoft/onnxruntime.git",
|
||||
"type": "git"
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
// This file is generated by /js/scripts/update-version.ts
|
||||
// Do not modify file content manually.
|
||||
|
||||
export const version = '1.20.0';
|
||||
export const version = '1.21.0';
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "onnxruntime-node",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "onnxruntime-node",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"os": [
|
||||
|
@ -29,7 +29,7 @@
|
|||
},
|
||||
"../common": {
|
||||
"name": "onnxruntime-common",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"typedoc": "^0.25.7"
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
3
|
||||
]
|
||||
},
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"dependencies": {
|
||||
"onnxruntime-common": "file:../common",
|
||||
"tar": "^7.0.1"
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
// This file is generated by /js/scripts/update-version.ts
|
||||
// Do not modify file content manually.
|
||||
|
||||
export const version = '1.20.0';
|
||||
export const version = '1.21.0';
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
"registry": "https://registry.npmjs.org/"
|
||||
},
|
||||
"source": "lib/index",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"main": "dist/commonjs/index",
|
||||
"homepage": "https://github.com/microsoft/onnxruntime/blob/main/js/react_native/README.md",
|
||||
"files": [
|
||||
|
|
|
@ -5254,7 +5254,7 @@ onetime@^5.1.0, onetime@^5.1.2:
|
|||
mimic-fn "^2.1.0"
|
||||
|
||||
"onnxruntime-common@file:../common":
|
||||
version "1.20.0"
|
||||
version "1.21.0"
|
||||
|
||||
open@^6.2.0:
|
||||
version "6.4.0"
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
// This file is generated by /js/scripts/update-version.ts
|
||||
// Do not modify file content manually.
|
||||
|
||||
export const version = '1.20.0';
|
||||
export const version = '1.21.0';
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "onnxruntime-web",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "onnxruntime-web",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"flatbuffers": "^1.12.0",
|
||||
|
@ -51,7 +51,7 @@
|
|||
},
|
||||
"../common": {
|
||||
"name": "onnxruntime-common",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"typedoc": "^0.25.7"
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
"type": "git"
|
||||
},
|
||||
"author": "fs-eire",
|
||||
"version": "1.20.0",
|
||||
"version": "1.21.0",
|
||||
"jsdelivr": "dist/ort.min.js",
|
||||
"dependencies": {
|
||||
"flatbuffers": "^1.12.0",
|
||||
|
|
|
@ -7,7 +7,7 @@ ONNX Runtime is a performance-focused scoring engine for Open Neural Network Exc
|
|||
For more information on ONNX Runtime, please see `aka.ms/onnxruntime <https://aka.ms/onnxruntime/>`_
|
||||
or the `Github project <https://github.com/microsoft/onnxruntime/>`_.
|
||||
"""
|
||||
__version__ = "1.20.0"
|
||||
__version__ = "1.21.0"
|
||||
__author__ = "Microsoft"
|
||||
|
||||
# we need to do device version validation (for example to check Cuda version for an onnxruntime-training package).
|
||||
|
|
|
@ -2469,7 +2469,7 @@ Second example, if we wanted to add and remove some members, we'd do this:
|
|||
In GetApi we now make it return ort_api_3 for version 3.
|
||||
*/
|
||||
|
||||
static constexpr OrtApi ort_api_1_to_20 = {
|
||||
static constexpr OrtApi ort_api_1_to_21 = {
|
||||
// NOTE: The ordering of these fields MUST not change after that version has shipped since existing binaries depend on this ordering.
|
||||
|
||||
// Shipped as version 1 - DO NOT MODIFY (see above text for more information)
|
||||
|
@ -2842,16 +2842,16 @@ static_assert(offsetof(OrtApi, SessionOptionsAppendExecutionProvider_OpenVINO_V2
|
|||
static_assert(offsetof(OrtApi, AddExternalInitializersFromFilesInMemory) / sizeof(void*) == 279, "Size of version 18 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.20.0",
|
||||
static_assert(std::string_view(ORT_VERSION) == "1.21.0",
|
||||
"ORT_Version change detected, please follow below steps to ensure OrtApi is updated properly");
|
||||
// 1. Update the hardcoded version string in above static_assert to silence it
|
||||
// 2. If there were any APIs added to ort_api_1_to_20 above:
|
||||
// 2. If there were any APIs added to ort_api_1_to_21 above:
|
||||
// a. Add the 'End of version #' markers (pattern above should be obvious)
|
||||
// b. Add a static_assert in the directly above list of version sizes to ensure nobody adds any more functions to the just shipped API version
|
||||
|
||||
ORT_API(const OrtApi*, OrtApis::GetApi, uint32_t version) {
|
||||
if (version >= 1 && version <= ORT_API_VERSION)
|
||||
return &ort_api_1_to_20;
|
||||
return &ort_api_1_to_21;
|
||||
|
||||
fprintf(stderr,
|
||||
"The requested API version [%u] is not available, only API versions [1, %u] are supported in this build."
|
||||
|
|
Загрузка…
Ссылка в новой задаче