From b2d25bc87d67f5a55eaaaefc10096e761ce410ac Mon Sep 17 00:00:00 2001 From: wisse Date: Sun, 22 Dec 2024 10:48:06 +0000 Subject: [PATCH] Renamed all version getters #228 --- ops/abs/versions.go | 2 +- ops/acos/versions.go | 2 +- ops/acosh/versions.go | 2 +- ops/add/versions.go | 2 +- ops/and/versions.go | 2 +- ops/argmax/versions.go | 2 +- ops/asin/versions.go | 2 +- ops/asinh/versions.go | 2 +- ops/atan/versions.go | 2 +- ops/atanh/versions.go | 2 +- ops/cast/versions.go | 2 +- ops/concat/versions.go | 2 +- ops/constant/versions.go | 2 +- ops/constantofshape/versions.go | 2 +- ops/conv/versions.go | 2 +- ops/cos/versions.go | 2 +- ops/cosh/versions.go | 2 +- ops/div/versions.go | 2 +- ops/equal/versions.go | 2 +- ops/expand/versions.go | 2 +- ops/flatten/versions.go | 2 +- ops/gather/versions.go | 2 +- ops/gemm/versions.go | 2 +- ops/greater/versions.go | 2 +- ops/greaterorequal/versions.go | 2 +- ops/gru/gru.go | 4 +- ops/gru/versions.go | 2 +- ops/less/versions.go | 2 +- ops/lessorequal/versions.go | 2 +- ops/linearregressor/versions.go | 2 +- ops/logsoftmax/versions.go | 2 +- ops/lstm/lstm.go | 2 +- ops/lstm/versions.go | 2 +- ops/matmul/versions.go | 2 +- ops/mul/versions.go | 2 +- ops/not/versions.go | 2 +- ops/or/versions.go | 2 +- ops/prelu/versions.go | 2 +- ops/reducemax/versions.go | 2 +- ops/reducemin/versions.go | 2 +- ops/relu/versions.go | 2 +- ops/reshape/versions.go | 2 +- ops/rnn/rnn.go | 2 +- ops/rnn/versions.go | 2 +- ops/scaler/versions.go | 2 +- ops/shape/versions.go | 2 +- ops/sigmoid/versions.go | 2 +- ops/sin/versions.go | 2 +- ops/sinh/versions.go | 2 +- ops/slice/versions.go | 2 +- ops/softmax/versions.go | 2 +- ops/squeeze/versions.go | 2 +- ops/sub/versions.go | 2 +- ops/tan/versions.go | 2 +- ops/tanh/versions.go | 2 +- ops/transpose/versions.go | 2 +- ops/unsqueeze/versions.go | 2 +- ops/xor/versions.go | 2 +- opset.go | 110 ++++++++++++++++---------------- 59 files changed, 114 insertions(+), 114 deletions(-) diff --git a/ops/abs/versions.go b/ops/abs/versions.go index 545d455..6ef492b 100644 --- a/ops/abs/versions.go +++ b/ops/abs/versions.go @@ -9,6 +9,6 @@ var absVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newAbs, 13, absTypeConstraint), } -func GetAbsVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return absVersions } diff --git a/ops/acos/versions.go b/ops/acos/versions.go index 31d6092..798a505 100644 --- a/ops/acos/versions.go +++ b/ops/acos/versions.go @@ -8,6 +8,6 @@ var acosVersions = ops.OperatorVersions{ 7: newAcos, } -func GetAcosVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return acosVersions } diff --git a/ops/acosh/versions.go b/ops/acosh/versions.go index 0953e5d..487f4ab 100644 --- a/ops/acosh/versions.go +++ b/ops/acosh/versions.go @@ -8,6 +8,6 @@ var acoshVersions = ops.OperatorVersions{ 9: newAcosh, } -func GetAcoshVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return acoshVersions } diff --git a/ops/add/versions.go b/ops/add/versions.go index e0ff80f..3a588ee 100644 --- a/ops/add/versions.go +++ b/ops/add/versions.go @@ -9,6 +9,6 @@ var addVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newAdd, 13, addTypeConstraints), } -func GetAddVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return addVersions } diff --git a/ops/and/versions.go b/ops/and/versions.go index 111cba9..134da7f 100644 --- a/ops/and/versions.go +++ b/ops/and/versions.go @@ -8,6 +8,6 @@ var andVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newAnd, 7, andTypeConstraints), } -func GetAndVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return andVersions } diff --git a/ops/argmax/versions.go b/ops/argmax/versions.go index 7f4ac6d..0bca002 100644 --- a/ops/argmax/versions.go +++ b/ops/argmax/versions.go @@ -10,6 +10,6 @@ var argMaxVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newArgMax, 13, argMaxTypeConstraints), } -func GetArgMaxVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return argMaxVersions } diff --git a/ops/asin/versions.go b/ops/asin/versions.go index e8f7626..8dd028d 100644 --- a/ops/asin/versions.go +++ b/ops/asin/versions.go @@ -8,6 +8,6 @@ var asinVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newAsin, 7, asinTypeConstraints), } -func GetAsinVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return asinVersions } diff --git a/ops/asinh/versions.go b/ops/asinh/versions.go index 5c9588e..0039133 100644 --- a/ops/asinh/versions.go +++ b/ops/asinh/versions.go @@ -8,6 +8,6 @@ var asinhVersions = ops.OperatorVersions{ 9: ops.NewOperatorConstructor(newAsinh, 9, asinhTypeConstraints), } -func GetAsinhVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return asinhVersions } diff --git a/ops/atan/versions.go b/ops/atan/versions.go index af63f8a..5c68e20 100644 --- a/ops/atan/versions.go +++ b/ops/atan/versions.go @@ -8,6 +8,6 @@ var atanVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newAtan, 7, atanTypeConstraints), } -func GetAtanVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return atanVersions } diff --git a/ops/atanh/versions.go b/ops/atanh/versions.go index 1acf1b4..81e932b 100644 --- a/ops/atanh/versions.go +++ b/ops/atanh/versions.go @@ -8,6 +8,6 @@ var atanhVersions = ops.OperatorVersions{ 9: ops.NewOperatorConstructor(newAtanh, 9, atanhTypeConstraints), } -func GetAtanhVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return atanhVersions } diff --git a/ops/cast/versions.go b/ops/cast/versions.go index 9cbdf0b..3d71f0a 100644 --- a/ops/cast/versions.go +++ b/ops/cast/versions.go @@ -10,6 +10,6 @@ var castVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newCast, 13, castTypeConstraints), } -func GetCastVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return castVersions } diff --git a/ops/concat/versions.go b/ops/concat/versions.go index 5c46e48..8b53ae0 100644 --- a/ops/concat/versions.go +++ b/ops/concat/versions.go @@ -10,6 +10,6 @@ var concatVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newConcat, 13, concatTypeConstraints), } -func GetConcatVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return concatVersions } diff --git a/ops/constant/versions.go b/ops/constant/versions.go index f236ada..56c54d9 100644 --- a/ops/constant/versions.go +++ b/ops/constant/versions.go @@ -13,6 +13,6 @@ var constantVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newConstant, 13, [][]tensor.Dtype{}), } -func GetConstantVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return constantVersions } diff --git a/ops/constantofshape/versions.go b/ops/constantofshape/versions.go index 9f5f65c..4909181 100644 --- a/ops/constantofshape/versions.go +++ b/ops/constantofshape/versions.go @@ -8,6 +8,6 @@ var constantOfShapeVersions = ops.OperatorVersions{ 9: ops.NewOperatorConstructor(newConstantOfShape, 9, constantOfShapeTypeConstraints), } -func GetConstantOfShapeVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return constantOfShapeVersions } diff --git a/ops/conv/versions.go b/ops/conv/versions.go index 3f795e9..20fe109 100644 --- a/ops/conv/versions.go +++ b/ops/conv/versions.go @@ -9,6 +9,6 @@ var convVersions = ops.OperatorVersions{ 11: ops.NewOperatorConstructor(newConv, 11, convTypeConstraints), } -func GetConvVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return convVersions } diff --git a/ops/cos/versions.go b/ops/cos/versions.go index cbf8ebd..a8c05e6 100644 --- a/ops/cos/versions.go +++ b/ops/cos/versions.go @@ -8,6 +8,6 @@ var cosVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newCos, 7, cosTypeConstraints), } -func GetCosVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return cosVersions } diff --git a/ops/cosh/versions.go b/ops/cosh/versions.go index 334b4ea..a66c80a 100644 --- a/ops/cosh/versions.go +++ b/ops/cosh/versions.go @@ -8,6 +8,6 @@ var coshVersions = ops.OperatorVersions{ 9: ops.NewOperatorConstructor(newCosh, 9, coshTypeConstraints), } -func GetCoshVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return coshVersions } diff --git a/ops/div/versions.go b/ops/div/versions.go index 20b814e..cd1cb89 100644 --- a/ops/div/versions.go +++ b/ops/div/versions.go @@ -9,6 +9,6 @@ var divVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newDiv, 13, divTypeConstraints), } -func GetDivVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return divVersions } diff --git a/ops/equal/versions.go b/ops/equal/versions.go index 79de43c..c3da133 100644 --- a/ops/equal/versions.go +++ b/ops/equal/versions.go @@ -10,6 +10,6 @@ var equalVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newEqual, 13, equalTypeConstraints), } -func GetEqualVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return equalVersions } diff --git a/ops/expand/versions.go b/ops/expand/versions.go index ed20a18..ad44e73 100644 --- a/ops/expand/versions.go +++ b/ops/expand/versions.go @@ -8,6 +8,6 @@ var expandVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newExpand, 13, expandTypeConstraints), } -func GetExpandVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return expandVersions } diff --git a/ops/flatten/versions.go b/ops/flatten/versions.go index 9efd57f..cf9b886 100644 --- a/ops/flatten/versions.go +++ b/ops/flatten/versions.go @@ -12,6 +12,6 @@ var flattenVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newFlatten, 13, [][]tensor.Dtype{ops.AllTypes}), } -func GetFlattenVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return flattenVersions } diff --git a/ops/gather/versions.go b/ops/gather/versions.go index 671dc15..a28a170 100644 --- a/ops/gather/versions.go +++ b/ops/gather/versions.go @@ -8,6 +8,6 @@ var gatherVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newGather, 13, gatherTypeConstraints), } -func GetGatherVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return gatherVersions } diff --git a/ops/gemm/versions.go b/ops/gemm/versions.go index c21eea8..f2e4d31 100644 --- a/ops/gemm/versions.go +++ b/ops/gemm/versions.go @@ -20,6 +20,6 @@ var gemmVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newGemm, 13, gemmTypeConstraints), } -func GetGemmVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return gemmVersions } diff --git a/ops/greater/versions.go b/ops/greater/versions.go index 1f1194b..20570e5 100644 --- a/ops/greater/versions.go +++ b/ops/greater/versions.go @@ -8,6 +8,6 @@ var greaterVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newGreater, 13, greaterTypeConstraints), } -func GetGreaterVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return greaterVersions } diff --git a/ops/greaterorequal/versions.go b/ops/greaterorequal/versions.go index 35085ca..741e512 100644 --- a/ops/greaterorequal/versions.go +++ b/ops/greaterorequal/versions.go @@ -6,6 +6,6 @@ var greaterOrEqualVersions = ops.OperatorVersions{ 12: ops.NewOperatorConstructor(newGreaterOrEqual, 12, greaterOrEqualTypeConstraints), } -func GetGreaterOrEqualVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return greaterOrEqualVersions } diff --git a/ops/gru/gru.go b/ops/gru/gru.go index 01e3440..f5d97df 100644 --- a/ops/gru/gru.go +++ b/ops/gru/gru.go @@ -212,7 +212,7 @@ func (g *GRU) extractXt(X tensor.Tensor, t int) (tensor.Tensor, error) { func (g *GRU) gateCalculation( Xt, H, W, R, Wb, Rb tensor.Tensor, activation ops.Activation, ) (tensor.Tensor, error) { - gemm := gemm.GetGemmVersions()[13]() + gemm := gemm.GetVersions()[13]() err := gemm.Init( &onnx.NodeProto{ @@ -258,7 +258,7 @@ func (g *GRU) htCalculation( return g.gateCalculation(Xt, temp1, W, R, Wb, Rb, activation) } - gemm := gemm.GetGemmVersions()[13]() + gemm := gemm.GetVersions()[13]() err := gemm.Init( &onnx.NodeProto{ diff --git a/ops/gru/versions.go b/ops/gru/versions.go index 72d87f2..e157efa 100644 --- a/ops/gru/versions.go +++ b/ops/gru/versions.go @@ -6,6 +6,6 @@ var gruVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newGRU, 7, gruTypeConstraints), } -func GetGRUVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return gruVersions } diff --git a/ops/less/versions.go b/ops/less/versions.go index 8e9c3be..646c74d 100644 --- a/ops/less/versions.go +++ b/ops/less/versions.go @@ -8,6 +8,6 @@ var lessVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newLess, 13, lessTypeConstraints), } -func GetLessVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return lessVersions } diff --git a/ops/lessorequal/versions.go b/ops/lessorequal/versions.go index f70d30f..d96e86a 100644 --- a/ops/lessorequal/versions.go +++ b/ops/lessorequal/versions.go @@ -6,6 +6,6 @@ var lessOrEqualVersions = ops.OperatorVersions{ 12: ops.NewOperatorConstructor(newLessOrEqual, 12, lessOrEqualTypeConstraints), } -func GetLessOrEqualVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return lessOrEqualVersions } diff --git a/ops/linearregressor/versions.go b/ops/linearregressor/versions.go index 8808594..9d8e8b6 100644 --- a/ops/linearregressor/versions.go +++ b/ops/linearregressor/versions.go @@ -6,6 +6,6 @@ var linearRegressorVersions = ops.OperatorVersions{ 1: ops.NewOperatorConstructor(newLinearRegressor, 1, linearRegressorTypeConstraints), } -func GetLinearRegressorVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return linearRegressorVersions } diff --git a/ops/logsoftmax/versions.go b/ops/logsoftmax/versions.go index dd719bc..699b0a3 100644 --- a/ops/logsoftmax/versions.go +++ b/ops/logsoftmax/versions.go @@ -8,6 +8,6 @@ var logSoftmaxVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newLogSoftmax, 13, logSoftmaxTypeConstraints), } -func GetLogSoftmaxVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return logSoftmaxVersions } diff --git a/ops/lstm/lstm.go b/ops/lstm/lstm.go index 396d11a..f7bc057 100644 --- a/ops/lstm/lstm.go +++ b/ops/lstm/lstm.go @@ -278,7 +278,7 @@ func (l *LSTM) Apply(inputs []tensor.Tensor) ([]tensor.Tensor, error) { func (l *LSTM) gateCalculation( Xt, W, Wb, H, R, Rb, P, C tensor.Tensor, activation ops.Activation, ) (tensor.Tensor, error) { - gemm := gemm.GetGemmVersions()[13]() + gemm := gemm.GetVersions()[13]() err := gemm.Init( &onnx.NodeProto{ diff --git a/ops/lstm/versions.go b/ops/lstm/versions.go index da9eec0..8872f69 100644 --- a/ops/lstm/versions.go +++ b/ops/lstm/versions.go @@ -6,6 +6,6 @@ var lstmVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newLSTM, 7, lstmTypeConstraints), } -func GetLSTMVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return lstmVersions } diff --git a/ops/matmul/versions.go b/ops/matmul/versions.go index 11b5a51..57d00cb 100644 --- a/ops/matmul/versions.go +++ b/ops/matmul/versions.go @@ -8,6 +8,6 @@ var matMulVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newMatMul, 13, matmulTypeConstraints), } -func GetMatMulVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return matMulVersions } diff --git a/ops/mul/versions.go b/ops/mul/versions.go index 09bf698..2989254 100644 --- a/ops/mul/versions.go +++ b/ops/mul/versions.go @@ -7,6 +7,6 @@ var mulVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newMul, 13, mulTypeConstraints), } -func GetMulVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return mulVersions } diff --git a/ops/not/versions.go b/ops/not/versions.go index 0b6769b..84bf9bb 100644 --- a/ops/not/versions.go +++ b/ops/not/versions.go @@ -6,6 +6,6 @@ var notVersions = ops.OperatorVersions{ 1: ops.NewOperatorConstructor(newNot, 1, notTypeConstraints), } -func GetNotVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return notVersions } diff --git a/ops/or/versions.go b/ops/or/versions.go index f1c38d0..c836069 100644 --- a/ops/or/versions.go +++ b/ops/or/versions.go @@ -6,6 +6,6 @@ var orVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newOr, 7, orTypeConstraints), } -func GetOrVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return orVersions } diff --git a/ops/prelu/versions.go b/ops/prelu/versions.go index 4fe2bce..c40a0c7 100644 --- a/ops/prelu/versions.go +++ b/ops/prelu/versions.go @@ -10,6 +10,6 @@ var preluVersions = ops.OperatorVersions{ 9: ops.NewOperatorConstructor(newPRelu, 9, preluTypeConstraints), } -func GetPReluVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return preluVersions } diff --git a/ops/reducemax/versions.go b/ops/reducemax/versions.go index 64b9806..640a596 100644 --- a/ops/reducemax/versions.go +++ b/ops/reducemax/versions.go @@ -9,6 +9,6 @@ var reduceMaxVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newReduceMax, 13, reduceMaxTypeConstraints), } -func GetReduceMaxVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return reduceMaxVersions } diff --git a/ops/reducemin/versions.go b/ops/reducemin/versions.go index 9846f4e..1327bc5 100644 --- a/ops/reducemin/versions.go +++ b/ops/reducemin/versions.go @@ -9,6 +9,6 @@ var reduceMinVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newReduceMin, 13, reduceMinTypeConstraints), } -func GetReduceMinVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return reduceMinVersions } diff --git a/ops/relu/versions.go b/ops/relu/versions.go index 2ecb090..89f6f6e 100644 --- a/ops/relu/versions.go +++ b/ops/relu/versions.go @@ -7,6 +7,6 @@ var reluVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newRelu, 13, reluTypeConstraints), } -func GetReluVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return reluVersions } diff --git a/ops/reshape/versions.go b/ops/reshape/versions.go index 2985725..31e9e72 100644 --- a/ops/reshape/versions.go +++ b/ops/reshape/versions.go @@ -7,6 +7,6 @@ var reshapeVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newReshape, 13, reshapeTypeConstraints), } -func GetReshapeVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return reshapeVersions } diff --git a/ops/rnn/rnn.go b/ops/rnn/rnn.go index a3d9c13..2649e24 100644 --- a/ops/rnn/rnn.go +++ b/ops/rnn/rnn.go @@ -183,7 +183,7 @@ func (r *RNN) Apply(inputs []tensor.Tensor) ([]tensor.Tensor, error) { func (r *RNN) layerCalculation( Xt, H, Wi, Ri, Wbi, Rbi tensor.Tensor, activation ops.Activation, ) (tensor.Tensor, error) { - gemm := gemm.GetGemmVersions()[13]() + gemm := gemm.GetVersions()[13]() err := gemm.Init( &onnx.NodeProto{ diff --git a/ops/rnn/versions.go b/ops/rnn/versions.go index 3d607e2..dcea592 100644 --- a/ops/rnn/versions.go +++ b/ops/rnn/versions.go @@ -6,6 +6,6 @@ var rnnVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newRNN, 7, rnnTypeConstraints), } -func GetRNNVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return rnnVersions } diff --git a/ops/scaler/versions.go b/ops/scaler/versions.go index 73b0b94..159e7f2 100644 --- a/ops/scaler/versions.go +++ b/ops/scaler/versions.go @@ -6,6 +6,6 @@ var scalerVersions = ops.OperatorVersions{ 1: ops.NewOperatorConstructor(newScaler, 1, scalerTypeConstraints), } -func GetScalerVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return scalerVersions } diff --git a/ops/shape/versions.go b/ops/shape/versions.go index 9b140e0..33a0279 100644 --- a/ops/shape/versions.go +++ b/ops/shape/versions.go @@ -7,6 +7,6 @@ var shapeVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newShape, 13, shapeTypeConstraints), } -func GetShapeVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return shapeVersions } diff --git a/ops/sigmoid/versions.go b/ops/sigmoid/versions.go index 31e8cf6..82e480c 100644 --- a/ops/sigmoid/versions.go +++ b/ops/sigmoid/versions.go @@ -7,6 +7,6 @@ var sigmoidVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newSigmoid, 13, sigmoidTypeConstraints), } -func GetSigmoidVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return sigmoidVersions } diff --git a/ops/sin/versions.go b/ops/sin/versions.go index 2b52a9c..c11c005 100644 --- a/ops/sin/versions.go +++ b/ops/sin/versions.go @@ -6,6 +6,6 @@ var sinVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newSin, 7, sinTypeConstraints), } -func GetSinVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return sinVersions } diff --git a/ops/sinh/versions.go b/ops/sinh/versions.go index 44d9b61..0536bc1 100644 --- a/ops/sinh/versions.go +++ b/ops/sinh/versions.go @@ -6,6 +6,6 @@ var sinhVersions = ops.OperatorVersions{ 9: ops.NewOperatorConstructor(newSinh, 9, sinhTypeConstraints), } -func GetSinhVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return sinhVersions } diff --git a/ops/slice/versions.go b/ops/slice/versions.go index d52733f..26feea8 100644 --- a/ops/slice/versions.go +++ b/ops/slice/versions.go @@ -9,6 +9,6 @@ var sliceVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newSlice, 13, sliceTypeConstraints), } -func GetSliceVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return sliceVersions } diff --git a/ops/softmax/versions.go b/ops/softmax/versions.go index 2f95b4b..61e322a 100644 --- a/ops/softmax/versions.go +++ b/ops/softmax/versions.go @@ -8,6 +8,6 @@ var softmaxVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newSoftmax, 13, softmaxTypeConstraints), } -func GetSoftmaxVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return softmaxVersions } diff --git a/ops/squeeze/versions.go b/ops/squeeze/versions.go index 04a853a..c619e8d 100644 --- a/ops/squeeze/versions.go +++ b/ops/squeeze/versions.go @@ -8,6 +8,6 @@ var squeezeVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newSqueeze, 13, squeezeTypeConstraints), } -func GetSqueezeVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return squeezeVersions } diff --git a/ops/sub/versions.go b/ops/sub/versions.go index 9847251..64e5db8 100644 --- a/ops/sub/versions.go +++ b/ops/sub/versions.go @@ -7,6 +7,6 @@ var subVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newSub, 13, subTypeConstraints), } -func GetSubVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return subVersions } diff --git a/ops/tan/versions.go b/ops/tan/versions.go index da379e4..e0ab80b 100644 --- a/ops/tan/versions.go +++ b/ops/tan/versions.go @@ -6,6 +6,6 @@ var tanVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newTan, 7, tanTypeConstraints), } -func GetTanVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return tanVersions } diff --git a/ops/tanh/versions.go b/ops/tanh/versions.go index 80e39ea..d2d920f 100644 --- a/ops/tanh/versions.go +++ b/ops/tanh/versions.go @@ -7,6 +7,6 @@ var tanhVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newTanh, 13, tanhTypeConstraint), } -func GetTanhVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return tanhVersions } diff --git a/ops/transpose/versions.go b/ops/transpose/versions.go index fcd1cbf..e92b9cf 100644 --- a/ops/transpose/versions.go +++ b/ops/transpose/versions.go @@ -7,6 +7,6 @@ var transposeVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newTranspose, 13, transposeTypeConstraint), } -func GetTransposeVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return transposeVersions } diff --git a/ops/unsqueeze/versions.go b/ops/unsqueeze/versions.go index 08afd79..e9b795f 100644 --- a/ops/unsqueeze/versions.go +++ b/ops/unsqueeze/versions.go @@ -8,6 +8,6 @@ var unsqueezeVersions = ops.OperatorVersions{ 13: ops.NewOperatorConstructor(newUnsqueeze, 13, unsqueezeTypeConstraints), } -func GetUnsqueezeVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return unsqueezeVersions } diff --git a/ops/xor/versions.go b/ops/xor/versions.go index 872d440..5de02b5 100644 --- a/ops/xor/versions.go +++ b/ops/xor/versions.go @@ -6,6 +6,6 @@ var xorVersions = ops.OperatorVersions{ 7: ops.NewOperatorConstructor(newXor, 7, xorTypeConstraints), } -func GetXorVersions() ops.OperatorVersions { +func GetVersions() ops.OperatorVersions { return xorVersions } diff --git a/opset.go b/opset.go index 89c3dff..2437381 100644 --- a/opset.go +++ b/opset.go @@ -72,65 +72,65 @@ const ( type Opset map[string]func() ops.Operator var operators = map[string]ops.OperatorVersions{ - "Abs": abs.GetAbsVersions(), - "Acos": acos.GetAcosVersions(), - "Acosh": acosh.GetAcoshVersions(), - "Add": add.GetAddVersions(), - "And": and.GetAndVersions(), - "ArgMax": argmax.GetArgMaxVersions(), - "Asin": asin.GetAsinVersions(), - "Asinh": asinh.GetAsinhVersions(), - "Atan": atan.GetAtanVersions(), - "Atanh": atanh.GetAtanhVersions(), - "Cast": cast.GetCastVersions(), - "Concat": concat.GetConcatVersions(), - "Constant": constant.GetConstantVersions(), - "ConstantOfShape": constantofshape.GetConstantOfShapeVersions(), - "Conv": conv.GetConvVersions(), - "Cos": cos.GetCosVersions(), - "Cosh": cosh.GetCoshVersions(), - "Div": div.GetDivVersions(), - "Equal": equal.GetEqualVersions(), + "Abs": abs.GetVersions(), + "Acos": acos.GetVersions(), + "Acosh": acosh.GetVersions(), + "Add": add.GetVersions(), + "And": and.GetVersions(), + "ArgMax": argmax.GetVersions(), + "Asin": asin.GetVersions(), + "Asinh": asinh.GetVersions(), + "Atan": atan.GetVersions(), + "Atanh": atanh.GetVersions(), + "Cast": cast.GetVersions(), + "Concat": concat.GetVersions(), + "Constant": constant.GetVersions(), + "ConstantOfShape": constantofshape.GetVersions(), + "Conv": conv.GetVersions(), + "Cos": cos.GetVersions(), + "Cosh": cosh.GetVersions(), + "Div": div.GetVersions(), + "Equal": equal.GetVersions(), "Erf": erf.GetVersions(), - "Expand": expand.GetExpandVersions(), - "Flatten": flatten.GetFlattenVersions(), - "Gather": gather.GetGatherVersions(), - "Gemm": gemm.GetGemmVersions(), - "Greater": greater.GetGreaterVersions(), - "GreaterOrEqual": greaterorequal.GetGreaterOrEqualVersions(), - "GRU": gru.GetGRUVersions(), - "Less": less.GetLessVersions(), - "LessOrEqual": lessorequal.GetLessOrEqualVersions(), - "LinearRegressor": linearregressor.GetLinearRegressorVersions(), - "LogSoftmax": logsoftmax.GetLogSoftmaxVersions(), - "LSTM": lstm.GetLSTMVersions(), - "MatMul": matmul.GetMatMulVersions(), - "Mul": mul.GetMulVersions(), - "Not": not.GetNotVersions(), - "Or": or.GetOrVersions(), + "Expand": expand.GetVersions(), + "Flatten": flatten.GetVersions(), + "Gather": gather.GetVersions(), + "Gemm": gemm.GetVersions(), + "Greater": greater.GetVersions(), + "GreaterOrEqual": greaterorequal.GetVersions(), + "GRU": gru.GetVersions(), + "Less": less.GetVersions(), + "LessOrEqual": lessorequal.GetVersions(), + "LinearRegressor": linearregressor.GetVersions(), + "LogSoftmax": logsoftmax.GetVersions(), + "LSTM": lstm.GetVersions(), + "MatMul": matmul.GetVersions(), + "Mul": mul.GetVersions(), + "Not": not.GetVersions(), + "Or": or.GetVersions(), "Pow": pow.GetVersions(), - "PRelu": prelu.GetPReluVersions(), - "ReduceMax": reducemax.GetReduceMaxVersions(), + "PRelu": prelu.GetVersions(), + "ReduceMax": reducemax.GetVersions(), "ReduceMean": reducemean.GetVersions(), - "ReduceMin": reducemin.GetReduceMinVersions(), - "Relu": relu.GetReluVersions(), - "Reshape": reshape.GetReshapeVersions(), - "RNN": rnn.GetRNNVersions(), - "Scaler": scaler.GetScalerVersions(), - "Shape": shape.GetShapeVersions(), - "Sigmoid": sigmoid.GetSigmoidVersions(), - "Sin": sin.GetSinVersions(), - "Sinh": sinh.GetSinhVersions(), - "Slice": slice.GetSliceVersions(), - "Softmax": softmax.GetSoftmaxVersions(), + "ReduceMin": reducemin.GetVersions(), + "Relu": relu.GetVersions(), + "Reshape": reshape.GetVersions(), + "RNN": rnn.GetVersions(), + "Scaler": scaler.GetVersions(), + "Shape": shape.GetVersions(), + "Sigmoid": sigmoid.GetVersions(), + "Sin": sin.GetVersions(), + "Sinh": sinh.GetVersions(), + "Slice": slice.GetVersions(), + "Softmax": softmax.GetVersions(), "Sqrt": sqrt.GetVersions(), - "Squeeze": squeeze.GetSqueezeVersions(), - "Sub": sub.GetSubVersions(), - "Tan": tan.GetTanVersions(), - "Tanh": tanh.GetTanhVersions(), - "Transpose": transpose.GetTransposeVersions(), - "Unsqueeze": unsqueeze.GetUnsqueezeVersions(), - "Xor": xor.GetXorVersions(), + "Squeeze": squeeze.GetVersions(), + "Sub": sub.GetVersions(), + "Tan": tan.GetVersions(), + "Tanh": tanh.GetVersions(), + "Transpose": transpose.GetVersions(), + "Unsqueeze": unsqueeze.GetVersions(), + "Xor": xor.GetVersions(), } // GetClosestOperatorVersion resolves, given a certain opset version, the operator version that is closest