Change type of label tensor to int32/int64 in SoftmaxCrossEntropyLoss…

… spec. (onnx#2667)
jywu-msft · Mar 18, 2020 · ac1caf3 · ac1caf3
1 parent c2fefcb
commit ac1caf3
Show file tree

Hide file tree

Showing 27 changed files with 15 additions and 7 deletions.
diff --git 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
 <dl>
 <dt><tt>scores</tt> : T</dt>
 <dd>The predicted outputs with shape [batch_size, class_size], or [batch_size, class_size, D1, D2 , ..., Dk], where K is the number of dimensions.</dd>
-<dt><tt>labels</tt> : T</dt>
+<dt><tt>labels</tt> : Tind</dt>
 <dd>The ground truth output tensor, with shape [batch_size], or [batch_size, D1, D2, ..., Dk], where K is the number of dimensions.</dd>
 <dt><tt>weights</tt> (optional) : T</dt>
 <dd>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.</dd>
@@ -14985,6 +14985,8 @@ This version of the operator has been available since version 12 of the default
 <dl>
 <dt><tt>T</tt> : tensor(float16), tensor(float), tensor(double)</dt>
 <dd>Constrain input and output types to float tensors.</dd>
+<dt><tt>Tind</tt> : tensor(int32), tensor(int64)</dt>
+<dd>Constrain target to integer types</dd>
 </dl>
 
 ### <a name="UnfoldToDepth-12"></a>**UnfoldToDepth-12**</a>

diff --git 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
 <dl>
 <dt><tt>scores</tt> : T</dt>
 <dd>The predicted outputs with shape [batch_size, class_size], or [batch_size, class_size, D1, D2 , ..., Dk], where K is the number of dimensions.</dd>
-<dt><tt>labels</tt> : T</dt>
+<dt><tt>labels</tt> : Tind</dt>
 <dd>The ground truth output tensor, with shape [batch_size], or [batch_size, D1, D2, ..., Dk], where K is the number of dimensions.</dd>
 <dt><tt>weights</tt> (optional) : T</dt>
 <dd>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.</dd>
@@ -18238,6 +18238,8 @@ This version of the operator has been available since version 12 of the default
 <dl>
 <dt><tt>T</tt> : tensor(float16), tensor(float), tensor(double)</dt>
 <dd>Constrain input and output types to float tensors.</dd>
+<dt><tt>Tind</tt> : tensor(int32), tensor(int64)</dt>
+<dd>Constrain target to integer types</dd>
 </dl>
 
 

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
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
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
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
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
diff --git a/...end/test/data/node/test_softmax_cross_entropy_mean_3d_expanded/test_data_set_0/input_1.pb b/...end/test/data/node/test_softmax_cross_entropy_mean_3d_expanded/test_data_set_0/input_1.pb
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
diff --git a/...ackend/test/data/node/test_softmax_cross_entropy_mean_expanded/test_data_set_0/input_1.pb b/...ackend/test/data/node/test_softmax_cross_entropy_mean_expanded/test_data_set_0/input_1.pb
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
diff --git a/.../backend/test/data/node/test_softmax_cross_entropy_mean_weight/test_data_set_0/input_1.pb b/.../backend/test/data/node/test_softmax_cross_entropy_mean_weight/test_data_set_0/input_1.pb
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
diff --git a/...test/data/node/test_softmax_cross_entropy_mean_weight_expanded/test_data_set_0/input_1.pb b/...test/data/node/test_softmax_cross_entropy_mean_weight_expanded/test_data_set_0/input_1.pb
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
@@ -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
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
@@ -23,7 +23,7 @@ QSoftmaxCrossEntropyLoss_test_softmax_cross_entropy_none_expanded_functionlog_pr
 Z
 y
 
-
+
 b
 z
 

diff --git a/...ackend/test/data/node/test_softmax_cross_entropy_none_expanded/test_data_set_0/input_1.pb b/...ackend/test/data/node/test_softmax_cross_entropy_none_expanded/test_data_set_0/input_1.pb
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
@@ -10,7 +10,7 @@
 Z
 y
 
-
+
 Z
 w
 

diff --git a/...backend/test/data/node/test_softmax_cross_entropy_none_weights/test_data_set_0/input_1.pb b/...backend/test/data/node/test_softmax_cross_entropy_none_weights/test_data_set_0/input_1.pb
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
@@ -25,7 +25,7 @@ YSoftmaxCrossEntropyLoss_test_softmax_cross_entropy_none_weights_expanded_functi
 Z
 y
 
-
+
 Z
 w
 

diff --git a/...est/data/node/test_softmax_cross_entropy_none_weights_expanded/test_data_set_0/input_1.pb b/...est/data/node/test_softmax_cross_entropy_none_weights_expanded/test_data_set_0/input_1.pb
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
diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_sum/test_data_set_0/input_1.pb b/onnx/backend/test/data/node/test_softmax_cross_entropy_sum/test_data_set_0/input_1.pb
diff --git a/onnx/backend/test/data/node/test_softmax_cross_entropy_sum_expanded/model.onnx b/onnx/backend/test/data/node/test_softmax_cross_entropy_sum_expanded/model.onnx
diff --git a/...backend/test/data/node/test_softmax_cross_entropy_sum_expanded/test_data_set_0/input_1.pb b/...backend/test/data/node/test_softmax_cross_entropy_sum_expanded/test_data_set_0/input_1.pb
diff --git 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);
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
     Z
     y
     b
     z
@@ Expand Down @@