Skip to content

Commit acf98d6

Browse files
authored
Revert opset 25 version bump (onnx#7441)
Fixes onnx#7439 v1.20.0 is not introducing opset25 Signed-off-by: Ti-Tai Wang <titaiwang@microsoft.com>
1 parent 7d4494c commit acf98d6

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

onnx/defs/operator_sets.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,17 +1396,6 @@ class OpSet_Onnx_ver24 {
13961396
}
13971397
};
13981398

1399-
// Forward declarations for ai.onnx version 25
1400-
1401-
// Iterate over schema from ai.onnx version 25
1402-
class OpSet_Onnx_ver25 {
1403-
public:
1404-
static void ForEachSchema(const std::function<void(OpSchema&&)>& fn) {
1405-
// TODO: Remove after introducing the first schema to opset 25
1406-
(void)fn;
1407-
}
1408-
};
1409-
14101399
inline void RegisterOnnxOperatorSetSchema() {
14111400
RegisterOpSetSchema<OpSet_Onnx_ver1>();
14121401
RegisterOpSetSchema<OpSet_Onnx_ver2>();
@@ -1432,7 +1421,6 @@ inline void RegisterOnnxOperatorSetSchema() {
14321421
RegisterOpSetSchema<OpSet_Onnx_ver22>();
14331422
RegisterOpSetSchema<OpSet_Onnx_ver23>();
14341423
RegisterOpSetSchema<OpSet_Onnx_ver24>();
1435-
RegisterOpSetSchema<OpSet_Onnx_ver25>();
14361424
// 0 means all versions of ONNX schema have been loaded
14371425
OpSchemaRegistry::Instance()->SetLoadedSchemaVersion(0);
14381426
}
@@ -1442,7 +1430,6 @@ inline void RegisterOnnxOperatorSetSchema(int target_version, bool fail_duplicat
14421430
// These calls for schema registration here are required to be in descending order for this to work correctly
14431431
//
14441432
// Version-specific registration sees duplicate schema version request as error if fail_duplicate_schema
1445-
RegisterOpSetSchema<OpSet_Onnx_ver25>(target_version, fail_duplicate_schema);
14461433
RegisterOpSetSchema<OpSet_Onnx_ver24>(target_version, fail_duplicate_schema);
14471434
RegisterOpSetSchema<OpSet_Onnx_ver23>(target_version, fail_duplicate_schema);
14481435
RegisterOpSetSchema<OpSet_Onnx_ver22>(target_version, fail_duplicate_schema);

onnx/defs/schema.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ class OpSchemaRegistry final : public ISchemaRegistry {
908908
// Increase the highest version when you make BC-breaking changes to the
909909
// operator schema on specific domain. Update the lowest version when it's
910910
// determined to remove too old version history.
911-
map_[ONNX_DOMAIN] = std::make_pair(1, 25);
911+
map_[ONNX_DOMAIN] = std::make_pair(1, 24);
912912
map_[AI_ONNX_ML_DOMAIN] = std::make_pair(1, 5);
913913
map_[AI_ONNX_TRAINING_DOMAIN] = std::make_pair(1, 1);
914914
// ONNX's preview domain contains operators subject to change, so

0 commit comments

Comments
 (0)