From 1cb0747c9dd4207d67405925e7de151dbbd3e2fd Mon Sep 17 00:00:00 2001 From: Zeeshan Siddiqui Date: Tue, 17 Mar 2020 18:50:27 -0700 Subject: [PATCH] Change type of label tensor to int32/int64 in SoftmaxCrossEntropyLoss spec. --- docs/Changelog.md | 4 +++- docs/Operators.md | 4 +++- .../model.onnx | Bin 165 -> 165 bytes .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes .../model.onnx | Bin 176 -> 176 bytes .../test_data_set_0/input_1.pb | Bin 59 -> 35 bytes .../model.onnx | Bin 1327 -> 1327 bytes .../test_data_set_0/input_1.pb | Bin 59 -> 35 bytes .../model.onnx | Bin 1277 -> 1277 bytes .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes .../model.onnx | Bin 192 -> 192 bytes .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes .../model.onnx | Bin 1395 -> 1395 bytes .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes .../model.onnx | 2 +- .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes .../model.onnx | 2 +- .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes .../model.onnx | 2 +- .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes .../model.onnx | 2 +- .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes .../test_softmax_cross_entropy_sum/model.onnx | Bin 163 -> 163 bytes .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes .../model.onnx | Bin 1262 -> 1262 bytes .../test_data_set_0/input_1.pb | Bin 33 -> 21 bytes onnx/defs/math/defs.cc | 6 +++++- 27 files changed, 15 insertions(+), 7 deletions(-) diff --git a/docs/Changelog.md b/docs/Changelog.md index 3c7d2024175..f9b21494112 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -14965,7 +14965,7 @@ This version of the operator has been available since version 12 of the default
scores : T
The predicted outputs with shape [batch_size, class_size], or [batch_size, class_size, D1, D2 , ..., Dk], where K is the number of dimensions.
-
labels : T
+
labels : Tind
The ground truth output tensor, with shape [batch_size], or [batch_size, D1, D2, ..., Dk], where K is the number of dimensions.
weights (optional) : T
A manual rescaling weight given to each class. If given, it has to be a 1D Tensor assigning weight to each of the classes. Otherwise, it is treated as if having all ones.
@@ -14985,6 +14985,8 @@ This version of the operator has been available since version 12 of the default
T : tensor(float16), tensor(float), tensor(double)
Constrain input and output types to float tensors.
+
Tind : tensor(int32), tensor(int64)
+
Constrain target to integer types
### **UnfoldToDepth-12** diff --git a/docs/Operators.md b/docs/Operators.md index f7d6008ad51..bedee1a1732 100644 --- a/docs/Operators.md +++ b/docs/Operators.md @@ -18218,7 +18218,7 @@ This version of the operator has been available since version 12 of the default
scores : T
The predicted outputs with shape [batch_size, class_size], or [batch_size, class_size, D1, D2 , ..., Dk], where K is the number of dimensions.
-
labels : T
+
labels : Tind
The ground truth output tensor, with shape [batch_size], or [batch_size, D1, D2, ..., Dk], where K is the number of dimensions.
weights (optional) : T
A manual rescaling weight given to each class. If given, it has to be a 1D Tensor assigning weight to each of the classes. Otherwise, it is treated as if having all ones.
@@ -18238,6 +18238,8 @@ This version of the operator has been available since version 12 of the default
T : tensor(float16), tensor(float), tensor(double)
Constrain input and output types to float tensors.
+
Tind : tensor(int32), tensor(int64)
+
Constrain target to integer types
diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean/model.onnx index 1925ad13c53fb5b765cfc811704853a15c4cf34d..9b4faf33d8ab003192926bfb317b1c642cbbcba3 100644 GIT binary patch delta 11 ScmZ3=xRh~1FC*K;K5+mSLIbA& delta 11 ScmZ3=xRh~1FC+WJK5+mSMgyn- diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean/test_data_set_0/input_1.pb index 6251a1cdb8d5f655406beff874d0b8f495b4e18b..bc4806043c89396003882cc95bab3524afb90a85 100644 GIT binary patch literal 21 Zcmd;J7GQH?tn}hxWME)m0b*t#1^^QN0XzTz literal 33 Ycmd;J7GQT`tn`v#WPkt`D9sF|0V41LNdN!< diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_3d/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_3d/model.onnx index 9bbcf18e8f91df3d9aea0dbf2fb2ede3dbd96954..a17aa7d16f0b89edd2b70bc1e4798f36a3304bc2 100644 GIT binary patch delta 35 pcmdnMxPfuP6d5)l4lX7RW*}xt;^tzk5@O?G;b0VEaAFeR0RV021cLwo delta 35 pcmdnMxPfuP6d86Q4lX7RW*}xt;^tzk5@O?G;b0VEaAFeR0RV0U1cU$p diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_3d/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_3d/test_data_set_0/input_1.pb index cd3dd54a5b93f253a108e3cb7a976f79bb38e27b..87a0fc4fe9ba2edea50d17f0ee92267c58f8a54a 100644 GIT binary patch literal 35 fcmd;J=3o+Fb7HLYl3-?FU;tqzAZCHmK#BnXB&Gpa literal 59 hcmd;J=3o+FcVevcGGJza02s{#<+DI(7$3@I002oy0dW8T diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_3d_expanded/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_3d_expanded/model.onnx index 80e5bfe48d17fba807fcf538e109f673da11b73b..626da48c88d7cd241f738109a5afde597c1aad09 100644 GIT binary patch delta 36 qcmZ3_wVrE(Fslrk5C<0%2Qv^eC2?~xRtd3jv2ZX7F*q>^@Bjd3gakJL delta 36 qcmZ3_wVrE(Fslr^5C<0%2Qv^eC2?~xRtd3jv2ZX7F*q>^@Bjd3paeJo diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_3d_expanded/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_3d_expanded/test_data_set_0/input_1.pb index cd3dd54a5b93f253a108e3cb7a976f79bb38e27b..87a0fc4fe9ba2edea50d17f0ee92267c58f8a54a 100644 GIT binary patch literal 35 fcmd;J=3o+Fb7HLYl3-?FU;tqzAZCHmK#BnXB&Gpa literal 59 hcmd;J=3o+FcVevcGGJza02s{#<+DI(7$3@I002oy0dW8T diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_expanded/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_expanded/model.onnx index e7787066fa6e634d83f18e332d7cf14c8d1ebbe0..19875ee4259d07ba683cd5f0fa51ddf8cfce359a 100644 GIT binary patch delta 32 ncmey%`ImFUQx*v}Ar>ws4(23oF2*V$HZB$pMj-|#CIKD*gN_A+ delta 32 ncmey%`ImFUQx*w!Ar>ws4(23oF2*V$HZB$pMj-|#CIKD*gQf+A diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_expanded/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_expanded/test_data_set_0/input_1.pb index 6251a1cdb8d5f655406beff874d0b8f495b4e18b..bc4806043c89396003882cc95bab3524afb90a85 100644 GIT binary patch literal 21 Zcmd;J7GQH?tn}hxWME)m0b*t#1^^QN0XzTz literal 33 Ycmd;J7GQT`tn`v#WPkt`D9sF|0V41LNdN!< diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_weight/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_weight/model.onnx index dfe74a2fa911457af577a64845e77027b2af7b34..4d23b428c71965804fd36da45832eeccd8a917c5 100644 GIT binary patch delta 11 ScmX@Wcz|)jbVjy`Gc*7hzXSpR delta 11 ScmX@Wcz|)jbVl}xGc*7h!vq5W diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_weight/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_weight/test_data_set_0/input_1.pb index 6251a1cdb8d5f655406beff874d0b8f495b4e18b..bc4806043c89396003882cc95bab3524afb90a85 100644 GIT binary patch literal 21 Zcmd;J7GQH?tn}hxWME)m0b*t#1^^QN0XzTz literal 33 Ycmd;J7GQT`tn`v#WPkt`D9sF|0V41LNdN!< diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_weight_expanded/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_weight_expanded/model.onnx index b27ae19a56bd7aa0ec9086a19243e7864b06928e..b5f370b67e56b9c6d0c9bc0c05a2e390b8d30471 100644 GIT binary patch delta 13 Ucmey&^_gpf7b_#%WN%gt03+7~3;+NC delta 13 Ucmey&^_gpf7b_$CWN%gt03+N44FCWD diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_weight_expanded/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_mean_weight_expanded/test_data_set_0/input_1.pb index 6251a1cdb8d5f655406beff874d0b8f495b4e18b..bc4806043c89396003882cc95bab3524afb90a85 100644 GIT binary patch literal 21 Zcmd;J7GQH?tn}hxWME)m0b*t#1^^QN0XzTz literal 33 Ycmd;J7GQT`tn`v#WPkt`D9sF|0V41LNdN!< diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_none/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_none/model.onnx index 53f852258e1..dce630c51ac 100644 --- a/onnx/backend/test/data/node/test_softmax_cross_entropy_none/model.onnx +++ b/onnx/backend/test/data/node/test_softmax_cross_entropy_none/model.onnx @@ -9,7 +9,7 @@ Z y - + b z diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_none/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_none/test_data_set_0/input_1.pb index 6251a1cdb8d5f655406beff874d0b8f495b4e18b..bc4806043c89396003882cc95bab3524afb90a85 100644 GIT binary patch literal 21 Zcmd;J7GQH?tn}hxWME)m0b*t#1^^QN0XzTz literal 33 Ycmd;J7GQT`tn`v#WPkt`D9sF|0V41LNdN!< diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_none_expanded/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_none_expanded/model.onnx index 4504fd8a571..bb633ae1ffd 100644 --- a/onnx/backend/test/data/node/test_softmax_cross_entropy_none_expanded/model.onnx +++ b/onnx/backend/test/data/node/test_softmax_cross_entropy_none_expanded/model.onnx @@ -23,7 +23,7 @@ QSoftmaxCrossEntropyLoss_test_softmax_cross_entropy_none_expanded_functionlog_pr Z y - + b z diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_none_expanded/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_none_expanded/test_data_set_0/input_1.pb index 6251a1cdb8d5f655406beff874d0b8f495b4e18b..bc4806043c89396003882cc95bab3524afb90a85 100644 GIT binary patch literal 21 Zcmd;J7GQH?tn}hxWME)m0b*t#1^^QN0XzTz literal 33 Ycmd;J7GQT`tn`v#WPkt`D9sF|0V41LNdN!< diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights/model.onnx index e19f2be1fe9..1f3dd146cbb 100644 --- a/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights/model.onnx +++ b/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights/model.onnx @@ -10,7 +10,7 @@ Z y - + Z w diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights/test_data_set_0/input_1.pb index 6251a1cdb8d5f655406beff874d0b8f495b4e18b..bc4806043c89396003882cc95bab3524afb90a85 100644 GIT binary patch literal 21 Zcmd;J7GQH?tn}hxWME)m0b*t#1^^QN0XzTz literal 33 Ycmd;J7GQT`tn`v#WPkt`D9sF|0V41LNdN!< diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights_expanded/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights_expanded/model.onnx index ea22b63b577..7e7af80dcdc 100644 --- a/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights_expanded/model.onnx +++ b/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights_expanded/model.onnx @@ -25,7 +25,7 @@ YSoftmaxCrossEntropyLoss_test_softmax_cross_entropy_none_weights_expanded_functi Z y - + Z w diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights_expanded/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_none_weights_expanded/test_data_set_0/input_1.pb index 6251a1cdb8d5f655406beff874d0b8f495b4e18b..bc4806043c89396003882cc95bab3524afb90a85 100644 GIT binary patch literal 21 Zcmd;J7GQH?tn}hxWME)m0b*t#1^^QN0XzTz literal 33 Ycmd;J7GQT`tn`v#WPkt`D9sF|0V41LNdN!< diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_sum/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_sum/model.onnx index e9f7ea879ee06bb073d5ebdd9e7a89b0c07bd2bc..a3b4bb690971fa54434ec12f11836cc9e7a9a317 100644 GIT binary patch delta 31 mcmZ3?xR`N5w*;FI3l|dya}qZfW0epa7YhfY5Q7tw01p6M7z9E9 delta 31 mcmZ3?xR`N5w*ws4(23oF2*V$HZB$pMj-|#CIKD*epdxo delta 32 ncmaFI`HpkLH5LhWAr>ws4(23oF2*V$HZB$pMj-|#CIKD*es2X> diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_sum_expanded/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_sum_expanded/test_data_set_0/input_1.pb index 6251a1cdb8d5f655406beff874d0b8f495b4e18b..bc4806043c89396003882cc95bab3524afb90a85 100644 GIT binary patch literal 21 Zcmd;J7GQH?tn}hxWME)m0b*t#1^^QN0XzTz literal 33 Ycmd;J7GQT`tn`v#WPkt`D9sF|0V41LNdN!< diff --git a/onnx/defs/math/defs.cc b/onnx/defs/math/defs.cc index 3d387a58592..a66eac72fab 100644 --- a/onnx/defs/math/defs.cc +++ b/onnx/defs/math/defs.cc @@ -2340,7 +2340,7 @@ ONNX_OPERATOR_SET_SCHEMA( "labels", "The ground truth output tensor, with shape [batch_size], or " "[batch_size, D1, D2, ..., Dk], where K is the number of dimensions.", - "T") + "Tind") .Input( 2, "weights", @@ -2366,6 +2366,10 @@ ONNX_OPERATOR_SET_SCHEMA( "T", {"tensor(float16)", "tensor(float)", "tensor(double)"}, "Constrain input and output types to float tensors.") + .TypeConstraint( + "Tind", + {"tensor(int32)", "tensor(int64)"}, + "Constrain target to integer types") .SetContextDependentFunctionBodyBuilder(BuildContextDependentFunctionBodySCE) .TypeAndShapeInferenceFunction([](InferenceContext& ctx) { propagateElemTypeFromInputToOutput(ctx, 0, 0);