mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-02 04:39:08 +08:00
e92dfa5c01
* Revert "incorporate changes from microsoft:master" * Revert "Revert "incorporate changes from microsoft:master"" * update tensorflow to 2.7 and bazel to latest 4.x * Update version database. Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
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<T, kDims>();
|
|
auto Toutput = outputs_tensor->tensor<T, kDims>();
|
|
|
|
- if (std::is_same<Device, GPUDevice>::value) {
|
|
+ if constexpr (std::is_same<Device, GPUDevice>::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<int32, 4>();
|
|
|
|
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<Device, GPUDevice>::value) {
|
|
+ if constexpr (std::is_same<Device, GPUDevice>::value) {
|
|
using RT = typename RawType<T>::type;
|
|
if (data_format_ == FORMAT_NCHW_VECT_C) {
|
|
// NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32.
|