diff --git a/tensorflow/core/kernels/depthtospace_op.cc b/tensorflow/core/kernels/depthtospace_op.cc --- a/tensorflow/core/kernels/depthtospace_op.cc +++ b/tensorflow/core/kernels/depthtospace_op.cc @@ -112,7 +112,7 @@ auto Tinput = input.tensor(); auto Toutput = outputs_tensor->tensor(); - if (std::is_same::value) { + if constexpr (std::is_same::value) { if (is_int8x4) { // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32. auto Tinput_v = input.template reinterpret_last_dimension(); diff --git a/tensorflow/core/kernels/spacetodepth_op.cc b/tensorflow/core/kernels/spacetodepth_op.cc --- a/tensorflow/core/kernels/spacetodepth_op.cc +++ b/tensorflow/core/kernels/spacetodepth_op.cc @@ -126,7 +126,7 @@ output_width, output_depth), &outputs_tensor)); - if (std::is_same::value) { + if constexpr (std::is_same::value) { using RT = typename RawType::type; if (data_format_ == FORMAT_NCHW_VECT_C) { // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32.