From 67f4cd54fab321d83e4a75a40efeee95a6a17079 Mon Sep 17 00:00:00 2001 From: Yulong Wang <7679871+fs-eire@users.noreply.github.com> Date: Sun, 9 Jul 2023 08:53:11 -0700 Subject: [PATCH] fix JSEP build break (#16636) ### Description fix JSEP build break. the build break was caused by enabling `-Wshorten-64-to-32` while merging the CI. --- onnxruntime/core/providers/js/operators/conv_transpose.h | 8 ++++---- onnxruntime/core/providers/js/operators/split.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/onnxruntime/core/providers/js/operators/conv_transpose.h b/onnxruntime/core/providers/js/operators/conv_transpose.h index 3e412f2f62..b09091c74d 100644 --- a/onnxruntime/core/providers/js/operators/conv_transpose.h +++ b/onnxruntime/core/providers/js/operators/conv_transpose.h @@ -63,7 +63,7 @@ class ConvTranspose : public JsKernel { std::vector local_output_padding(conv_transpose_attrs_.output_padding.begin(), conv_transpose_attrs_.output_padding.end()); if (conv_transpose_attrs_.kernel_shape_specified) { for (size_t i = 0; i < kernel_shape.size() && i < kernel_shape_vec_size; ++i) { - local_kernel_shape.push_back(kernel_shape[i]); + local_kernel_shape.push_back(gsl::narrow_cast(kernel_shape[i])); } } else { for (size_t i = 0; i < kernel_shape_vec_size; ++i) { @@ -71,13 +71,13 @@ class ConvTranspose : public JsKernel { } } for (size_t i = 0; i < conv_transpose_attrs_.pads.size() && i < pads_vec_size; ++i) { - local_pads[i] = conv_transpose_attrs_.pads[i]; + local_pads[i] = gsl::narrow_cast(conv_transpose_attrs_.pads[i]); } for (size_t i = 0; i < conv_transpose_attrs_.dilations.size() && i < dialations_vec_size; ++i) { - local_dilations[i] = conv_transpose_attrs_.dilations[i]; + local_dilations[i] = gsl::narrow_cast(conv_transpose_attrs_.dilations[i]); } for (size_t i = 0; i < conv_transpose_attrs_.strides.size() && i < strides_vec_size; ++i) { - local_strides[i] = conv_transpose_attrs_.strides[i]; + local_strides[i] = gsl::narrow_cast(conv_transpose_attrs_.strides[i]); } LOGS_DEFAULT(VERBOSE) << "output_shape = " << conv_transpose_attrs_.output_shape << std::endl; LOGS_DEFAULT(VERBOSE) << "output_padding = " << conv_transpose_attrs_.output_padding << std::endl; diff --git a/onnxruntime/core/providers/js/operators/split.h b/onnxruntime/core/providers/js/operators/split.h index 5bd08221ea..4031145e46 100644 --- a/onnxruntime/core/providers/js/operators/split.h +++ b/onnxruntime/core/providers/js/operators/split.h @@ -27,7 +27,7 @@ class Split : public JsKernel, public SplitBase { } } else if (split_sizes_.size() == 0) { // Compute split_sizes from input shape and num_outputs - auto total_split_size = info.node().InputDefs()[0]->Shape()->dim(axis_).dim_value(); + auto total_split_size = info.node().InputDefs()[0]->Shape()->dim(gsl::narrow_cast(axis_)).dim_value(); int64_t split_size_sum = 0; if (num_outputs_ < 0) { num_outputs_ = info.node().OutputDefs().size(); @@ -37,7 +37,7 @@ class Split : public JsKernel, public SplitBase { num_outputs_, ")"); } for (auto output : info.node().OutputDefs()) { - auto split_size = output->Shape()->dim(axis_).dim_value(); + auto split_size = output->Shape()->dim(gsl::narrow_cast(axis_)).dim_value(); split_sizes.push_back(gsl::narrow_cast(split_size)); split_size_sum += split_size; }