Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION_NUMBER
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.25.0
1.26.0
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static NativeTrainingMethods()
DOrtGetApi OrtGetApi = (DOrtGetApi)Marshal.GetDelegateForFunctionPointer(NativeMethods.OrtGetApiBase().GetApi, typeof(DOrtGetApi));
#endif

const uint ORT_API_VERSION = 23;
const uint ORT_API_VERSION = 26;
#if NETSTANDARD2_0
IntPtr ortApiPtr = OrtGetApi(ORT_API_VERSION);
api_ = (OrtApi)Marshal.PtrToStructure(ortApiPtr, typeof(OrtApi));
Expand Down
2 changes: 1 addition & 1 deletion docs/Versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ npm --version # Should be v8.0 or newer

The script does **not** update the value of `ORT_API_VERSION` in [include/onnxruntime/core/session/onnxruntime_c_api.h](../include/onnxruntime/core/session/onnxruntime_c_api.h).

The value should be set to the second component of the version string. E.g., `25` for version `1.25.0`.
The value should be set to the second component of the version string. E.g., `26` for version `1.26.0`.

5. **Review all changes**

Expand Down
5 changes: 5 additions & 0 deletions docs/python/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ For more information on ONNX Runtime, please see `aka.ms/onnxruntime <https://ak
Changes
-------

1.26.0
^^^^^^

Release Notes : https://github.com/Microsoft/onnxruntime/releases/tag/v1.26.0

1.25.0
^^^^^^

Expand Down
2 changes: 1 addition & 1 deletion include/onnxruntime/core/session/onnxruntime_c_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 25
#define ORT_API_VERSION 26

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion js/common/lib/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
// This file is generated by /js/scripts/update-version.ts
// Do not modify file content manually.

export const version = '1.25.0';
export const version = '1.26.0';
4 changes: 2 additions & 2 deletions js/common/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"license": "MIT",
"type": "module",
"name": "onnxruntime-common",
"version": "1.25.0",
"version": "1.26.0",
"repository": {
"url": "https://github.com/Microsoft/onnxruntime.git",
"type": "git"
Expand Down
2 changes: 1 addition & 1 deletion js/node/lib/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
// This file is generated by /js/scripts/update-version.ts
// Do not modify file content manually.

export const version = '1.25.0';
export const version = '1.26.0';
6 changes: 3 additions & 3 deletions js/node/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
6
]
},
"version": "1.25.0",
"version": "1.26.0",
"dependencies": {
"adm-zip": "^0.5.16",
"global-agent": "^4.1.3",
Expand Down
2 changes: 1 addition & 1 deletion js/node/script/install-metadata-versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
// This file is generated by /js/scripts/update-version.ts
// Do not modify file content manually.

module.exports = { nuget: [{ feed: 'nuget', version: '1.25.0' }] };
module.exports = { nuget: [{ feed: 'nuget', version: '1.26.0' }] };
2 changes: 1 addition & 1 deletion js/react_native/lib/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
// This file is generated by /js/scripts/update-version.ts
// Do not modify file content manually.

export const version = '1.25.0';
export const version = '1.26.0';
6 changes: 3 additions & 3 deletions js/react_native/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/react_native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"registry": "https://registry.npmjs.org/"
},
"source": "lib/index",
"version": "1.25.0",
"version": "1.26.0",
"main": "dist/commonjs/index",
"homepage": "https://github.com/microsoft/onnxruntime/blob/main/js/react_native/README.md",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion js/web/lib/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
// This file is generated by /js/scripts/update-version.ts
// Do not modify file content manually.

export const version = '1.25.0';
export const version = '1.26.0';
6 changes: 3 additions & 3 deletions js/web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "git"
},
"author": "fs-eire",
"version": "1.25.0",
"version": "1.26.0",
"jsdelivr": "dist/ort.min.js",
"dependencies": {
"flatbuffers": "^25.1.24",
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import contextlib

__version__ = "1.25.0"
__version__ = "1.26.0"
__author__ = "Microsoft"

# we need to do device version validation (for example to check Cuda version for an onnxruntime-training package).
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/session/interop_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ static constexpr OrtInteropApi ort_interop_api = {
static_assert(offsetof(OrtInteropApi, SignalSemaphore) / sizeof(void*) == 10,
"Size of version 24 Api cannot change"); // initial version in ORT 1.24
static_assert(offsetof(OrtInteropApi, DeinitGraphicsInteropForEpDevice) / sizeof(void*) == 12,
"Graphics interop functions at slots 11 and 12");
"Size of version 25 API cannot change");

ORT_API(const OrtInteropApi*, OrtInteropAPI::GetInteropApi) {
return &ort_interop_api;
Expand Down
8 changes: 4 additions & 4 deletions onnxruntime/core/session/onnxruntime_c_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4256,7 +4256,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_25 = {
static constexpr OrtApi ort_api_1_to_26 = {
// 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)
Expand Down Expand Up @@ -4803,11 +4803,11 @@ static_assert(offsetof(OrtApi, GetTensorElementTypeAndShapeDataReference) / size
static_assert(offsetof(OrtApi, KernelInfoGetAttributeArray_string) / sizeof(void*) == 417, "Size of version 25 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.25.0",
static_assert(std::string_view(ORT_VERSION) == "1.26.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_25 above:
// 2. If there were any APIs added to ort_api_1_to_26 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
//
Expand All @@ -4819,7 +4819,7 @@ static_assert(std::string_view(ORT_VERSION) == "1.25.0",

ORT_API(const OrtApi*, OrtApis::GetApi, uint32_t version) {
if (version >= 1 && version <= ORT_API_VERSION)
return &ort_api_1_to_25;
return &ort_api_1_to_26;

fprintf(stderr,
"The requested API version [%u] is not available, only API versions [1, %u] are supported in this build."
Expand Down
12 changes: 6 additions & 6 deletions samples/cxx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ samples/cxx/
Download and extract an ONNX Runtime release archive. For example:

```
tar -xf onnxruntime-win-x64-1.25.0.zip
tar -xf onnxruntime-win-x64-1.26.0.zip
```

This creates a directory like `onnxruntime-win-x64-1.25.0/` containing `include/` and `lib/` subdirectories.
This creates a directory like `onnxruntime-win-x64-1.26.0/` containing `include/` and `lib/` subdirectories.

### 2. [Optional] Generate the ONNX model

Expand All @@ -50,16 +50,16 @@ From the `samples/cxx` directory:
**Windows:**
```
cmake -S . -B build ^
-DORT_HEADER_DIR:PATH=path\to\onnxruntime-win-x64-1.25.0\include ^
-DORT_LIBRARY_DIR:PATH=path\to\onnxruntime-win-x64-1.25.0\lib
-DORT_HEADER_DIR:PATH=path\to\onnxruntime-win-x64-1.26.0\include ^
-DORT_LIBRARY_DIR:PATH=path\to\onnxruntime-win-x64-1.26.0\lib
cmake --build build --config Release
```

**Linux / macOS:**
```
cmake -S . -B build \
-DORT_HEADER_DIR:PATH=path/to/onnxruntime-linux-x64-1.25.0/include \
-DORT_LIBRARY_DIR:PATH=path/to/onnxruntime-linux-x64-1.25.0/lib
-DORT_HEADER_DIR:PATH=path/to/onnxruntime-linux-x64-1.26.0/include \
-DORT_LIBRARY_DIR:PATH=path/to/onnxruntime-linux-x64-1.26.0/lib
cmake --build build --config Release
```

Expand Down
Loading