Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for rel-1.16.0 #5959

Merged
merged 6 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions docs/Versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ Changes to the semantics of an operator or function MUST be introduced in a new
> step (1).
> 4. Register the new operator in the corresponding `operator_sets`
> header file.
> 5. Add a version adapter to `convert.h` so that the version
> converter can upgrade the old version of the operator to the new
> 5. Add a version adapter to `convert.h` so that the version
> converter can upgrade the old version of the operator to the new
> one. This can be a `CompatibleAdapter` in case operators following
> the old schema are still valid under the new one (which is usually
> the old schema are still valid under the new one (which is usually
> true).
> 6. A version adapter to downgrade the new operator to the older version
> can also be added to `convert.h` but it's not mandatory.
Expand Down Expand Up @@ -189,6 +189,7 @@ ONNX version|IR version|Opset version ai.onnx|Opset version ai.onnx.ml|Opset ver
1.14.0|9|19|3|1
1.14.1|9|19|3|1
1.15.0|9|20|4|1
1.16.0|10|21|5|1

A programmatically accessible version of the above table is available [here](../onnx/helper.py). Limited version number
information is also maintained in [version.h](../onnx/common/version.h) and [schema.h](../onnx/defs/schema.h).
Expand Down
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion onnx/common/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
namespace ONNX_NAMESPACE {

// Represents the most recent release version. Updated with every release.
constexpr const char* LAST_RELEASE_VERSION = "1.15.0";
constexpr const char* LAST_RELEASE_VERSION = "1.16.0";

} // namespace ONNX_NAMESPACE
2 changes: 1 addition & 1 deletion onnx/defs/schema.h
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ class OpSchemaRegistry final : public ISchemaRegistry {
// the max version above in a *release* version of ONNX. But in other
// versions, the max version may be ahead of the last-release-version.
last_release_version_map_[ONNX_DOMAIN] = 21;
last_release_version_map_[AI_ONNX_ML_DOMAIN] = 4;
last_release_version_map_[AI_ONNX_ML_DOMAIN] = 5;
last_release_version_map_[AI_ONNX_TRAINING_DOMAIN] = 1;
last_release_version_map_[AI_ONNX_PREVIEW_TRAINING_DOMAIN] = 1;
}
Expand Down
2 changes: 1 addition & 1 deletion onnx/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
("1.14.0", 9, 19, 3, 1),
("1.14.1", 9, 19, 3, 1),
("1.15.0", 9, 20, 4, 1),
("1.16.0", 9, 20, 5, 1),
("1.16.0", 10, 21, 5, 1),
]

VersionMapType = Dict[Tuple[str, int], int]
Expand Down
2 changes: 2 additions & 0 deletions onnx/test/helper_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,11 +406,13 @@ def test(opset_versions: List[Tuple[str, int]], ir_version: int) -> None:
test([("", 18)], 8)
test([("", 19)], 9)
test([("", 20)], 9)
test([("", 21)], 10)
# standard opset can be referred to using empty-string or "ai.onnx"
test([("ai.onnx", 9)], 4)
test([("ai.onnx.ml", 2)], 6)
test([("ai.onnx.ml", 3)], 8)
test([("ai.onnx.ml", 4)], 9)
test([("ai.onnx.ml", 5)], 10)
test([("ai.onnx.training", 1)], 7)
# helper should pick *max* IR version required from all opsets specified.
test([("", 10), ("ai.onnx.ml", 2)], 6)
Expand Down