mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 06:49:56 +08:00
8ad33ead90
* Revert "incorporate changes from microsoft:master" * Revert "Revert "incorporate changes from microsoft:master"" * WIP: update to tensorflow 2.6 * update patch * update more patches * fix patch again * fix new Windows compile/linkage errors * fix patch * fix patch again * temporarily revert Windows build option fix to test whether upstream fix doesn't work * check if constexpr is sufficient (is_same_v requires C++17) * try patch for build parameters * remove fastbuild patch and improve constexpr patch (no C++17 requirement) (fastbuild patch didn't work because bazel overrides it with /DEBUG:FULL) * x-add-version * add C++17 preprocessor switch for "if constexpr" * x-add-version * remove pre-processor switch (doesn't work without) * x-add-version * work-around toolchain issues on macOS * x-add-version * fix Windows build options (must be string, not list) * x-add-version * temporarily add code to debug CI * temporarily add more debug output as build doesn't even start on macOS CI * remove debug code, add switch for linker parameters on macOS and re-introduce old behaviour (some platforms still use old behaviour) * x-add-version * fix broken string termination * x-add-version * fix function name * x-add-version Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
58 lines
2.1 KiB
Diff
58 lines
2.1 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>();
|
|
@@ -173,15 +173,6 @@
|
|
}
|
|
};
|
|
|
|
-#ifdef WIN32
|
|
-template <typename T>
|
|
-struct DepthToSpaceOpFunctor<CPUDevice, T, FORMAT_NCHW> {
|
|
- void operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor input,
|
|
- int block_size, typename TTypes<T, 4>::Tensor output) {
|
|
- LOG(FATAL) << "Trivial implementation to make debug build compile.";
|
|
- }
|
|
-};
|
|
-#endif
|
|
} // namespace functor
|
|
|
|
#define REGISTER(type) \
|
|
|
|
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.
|
|
@@ -189,15 +189,6 @@
|
|
}
|
|
};
|
|
|
|
-#ifdef WIN32
|
|
-template <typename T>
|
|
-struct SpaceToDepthOpFunctor<CPUDevice, T, FORMAT_NCHW> {
|
|
- void operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor input,
|
|
- int block_size, typename TTypes<T, 4>::Tensor output) {
|
|
- LOG(FATAL) << "Trivial implementation to make debug build compile.";
|
|
- }
|
|
-};
|
|
-#endif
|
|
} // namespace functor
|
|
|
|
#define REGISTER(type) \
|