mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-06 02:57:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
f4ab485c6b
vcpkg/ports/tensorflow-common/fix-windows-build.patch

26 lines
1.2 KiB
Diff
Raw Normal View History

[tensorflow] update to 2.6 (#20015) * 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>
2021-09-30 11:43:32 +08:00
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>();
[tensorflow] upgrade to 2.4.1 (#16364) * fix build issues occurring from default bazel config being used because customized bazel config is stored in wrong directory * [tensorflow-cc] Update CONTROL and ci.baseline.txt * fix also applies to windows static build * fix debug and static builds as well as library naming for non-linux - add patch to fix debug builds - add patch to fix exports for static linking - really build debug (instead of cloning release) - override bazel build options for debug (work around bazel bug) - bazel doesn't support static libraries: work around by building dynamic library and constructing static linkage commands from build log - Windows .pdb file can't be >4GB even on x64: work around using reduced debug information - Windows doesn't support .lib files >4GB even on x64, so split into multiple libs - vcpkg requires equal amount of libs for debug and release: work around using handcrafted empty dummy libs - fix naming of libs (.dll on Windows and .dylib on macOS) * upgrade tensorflow from v1.14 to v2.3 - adapt patch files to tensorflow code changes - update bazel from v0.25.2 to v3.1 - on Windows use python installed on the host instead of embedded python obtained via vcpkg because embedded python lacks pip, which we need to obtain numpy - on Windows add MSYS2 to the PATH so that bazel tools can access MSYS2 GIT - add support for custom CA certificates when using HTTPS_PROXY * fix execute process macro The existing implementation totally screwed up commands if the command's arguments contained semicolons (this is the case, e.g., in the FindPython modules of the cmake distribution). * extend overriden execute_process to more than one COMMAND as there actually are use cases for this * added another patch required for tensorflow v2.3, fixed path and working directory * Revert "incorporate changes from microsoft:master" * Revert "Revert "incorporate changes from microsoft:master"" * final fixes for static build + improving out messages * enabling linux and osx in CI to see if it works now * simplified code, fixed version numbers, fixed generated include cmake file * fix failing postbuild check on handcrafted empty dummy library by spreading the last real libraries contents over the required number of libraries * remove dead code commit by mistake again * improvements from code review * cleaner fix for debug code * find pip3 in PATH (PYTHON3_DIR apparently not valid for pip3) * fix error in python helper script * fix wrong libname in postbuild script * fix python detection + switch to python on msys2 (instead of embedded python) for Windows as we need numpy * fix order of arguments * fix command (it may contain spaces such as C:\Program Files\...) * revert last commit (root cause for CI failures is something different: there are line breaks in path) * fix regex comparision (value needs to be escaped as it may contains regex special characters such as brackets, eg C:/Program Files (x86)/...) * fix linebreaks in generated file * fix CRT linkage (macOS doesn't support static CRT linkage; it's set to dynamic even static target triplets for macOS and linux) * refactor implemenation to avoid as much code duplication as possible -- algorithmically identical * fix version numbers in helper scripts * enable work-around for Windows until bazel fix is available * install missing python3-pip on linux * fix linux build by patching * apply timeout feature now available via merged master branch * correct linux build patch * improve debug build patches (no functional difference because LOG(FATAL, ...) macro internally anyway calls abort(), which the compiler doesn't detect in debug mode... * improve linux patch * temporarily add debug to inspect what's going on on macOS CI * remove temporary debug code and fix static linking scripts for linux and macOS * fix regex escaping * fix ambiguous match while grepping for the framework link command * extend fix of ambiguous match while grepping for the framework link command * fix what merge of master broke * fix more what got broken by merging master (all packages and their dependencies are now maintained manually instead of using pacman...) * remove "unofficial" from filename * added switch do distinct classic and manifest mode when generating config.cmake file * create symlinks for libraries without version number * fix linux postbuild script * temporarily disable code making problems * add note for linking on Linux and macOS * forget to add README file in previous commit * add file forgotton in macro fixing patch * fix python library path * fix macOS static link command * update linkage instructions in README * Update ports/tensorflow-cc/CONTROL * Update ports/tensorflow-cc/portfile.cmake * Update scripts/ci.baseline.txt * use vcpkg_execute_required_process * pass C_FLAGS and CXX_FLAGS to bazel * fix INTERFACE_INCLUDE_DIRECTORIES * fix optional c/cxx arguments * also add linker opts * update README * merge static libs into one to support force_load (cannot force_load both due to duplicate symbols) * update README * quote python path (it might contain spaces that don't get escaped inside outer quotes of bash command) * fix python path also for static build * add arm(64) as currently unsupported arch * bazel 3.7 is available -> remove workaround * update README, remove necessary c-ares from deps * update msys package * add uwp specific options, and minor general improvements * fix string replace * fix control file and windows path separator * revert backslashes-fix -- the root cause was missing .exe extension * upgrade to tf 2.3.1 * fix hard-coded version * remove uwp work-in-progress code so that PR can be merged * add [tensorflow] C API port * missing in previous commit * fix include file * remove unnecessary suffix * update README and print out usage info in portfile * add UWP patches * fix uwp patch file * fix patch again * fix patch again * fix patch again * move options from command line to .bazelrc * fix include paths * work around bazel restriction "The include path 'D:/buildtrees/tensorflow-cc/tools_clone' references a path outside of the execution root." * go for a completely different approach: force-include uwppatch.h * fix include path again * choose different include location, which is available in bazel build tree * fix compile errors * update header (getenv redefinition) * next try to get patched headers to work * another try to fix include paths * update patched header, bazel has its own naming for target triplet * yet another try to fix patched include path * next try to fix includes: patch bazel deps where required * fix patch * Update ports/tensorflow-cc/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/tensorflow/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * follow-up to code review * extend patch (further build deps) * fix suffix parameter * add more build deps * fix quoting * extend linux patch * fix patch * extend patch again * yet another deps fix * another try to fix quoting of possibly empty string parameter * add another deps patch * extend patch again * different approach to fix empty string arguments * fix portfiles, add more bazel deps * update list of headers for tensorflow 2.3.1 (was still 2.3.0) * update list of headers for v2.3.1 * extend bazel deps path again * Update ports/tensorflow/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * fix bazel deps, bump port version * add more bazel deps * move common stuff into tensorflow-common as discussed in review * go for a different approach (patch bazel toolchain) as adding bazel deps is a never-ending story... * Apply suggestions from code review Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * yet again a completely different approach to fix the include path * fix path * fix path again * merge changes from C port * fix cmake variable replacement (apparently @ cannot be escaped...) * try again without escaping * use absolute path * fix escaping * calculate absolute path * fix replacement in configure_file * handle directory exists error * convert cygpath to windows path * overcome backslash / escaping issues * try include with build-root-relative path * apply work-around until proper solution is available * merge master * resolved conflicts * Revert "merge master" This reverts commit f0804f184d107c68c6146e8f17afc33a2a8318fc. * add uwp files to copy list * update uwppatch.h * fix typo * patch the patch for UWP case * fix patch (missing spaces) * fix build error in AWS SDK prerequisit * fix more compilation errors * replace previous patch with more targeted patch * add escaped quotes around Windows path with spaces * cleanup * merge patch (there can only be one patch file per external) * add messages to user * update versions files * update tensorflow to 2.4.1 * port 0 seems to cause errors => remove port field * remove patches that made it into tensorflow, correct line numbers in remaining patches * fix patch line numbers, add copy rules for new header files * fix patch line numbers * fix versions for x86 * add more Windows and Linux specific patches * add more Windows and Linux patches * fix UWP patches * fix x86 target * remove UWP specific fixes from this branch as UWP PR doesn't get merged * fix version shas * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * fix version hash again * try an easier fix after discussion upstream * fix hashes Co-authored-by: Gehweiler <Joachim_Gehweiler@McAfee.com> Co-authored-by: wangli28 <wangli28@beyondsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Joachim Gehweiler <joachim@Joachims-iMac.local> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-03-27 05:55:50 +08:00
[tensorflow] update to 2.6 (#20015) * 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>
2021-09-30 11:43:32 +08:00
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.
Reference in New Issue Copy Permalink