Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tensorflow] upgrade to 2.4.1 #16364

Merged
merged 222 commits into from
Mar 26, 2021
Merged

Conversation

jgehw
Copy link
Contributor

@jgehw jgehw commented Feb 22, 2021

  • upgrade tensorflow to 2.4.1

Gehweiler and others added 30 commits July 23, 2020 21:53
…se customized bazel config is stored in wrong directory
- 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)
- 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
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).
incorporate changes from microsoft:master
…-more' as required for find_package(Python3)
Revert "incorporate changes from microsoft:master"
…eading the last real libraries contents over the required number of libraries
@jgehw
Copy link
Contributor Author

jgehw commented Mar 2, 2021

@NancyLi1013 as the TensorFlow UWP branch won't get merged in the foreseeable future, I removed the UWP changes from this PR, so that it only contains the TensorFlow v2.3.1 -> v2.4.1 upgrade now, so you can remove the "depends:different-pr" label.

Contents of this PR are now just a) removal of patches that were merged upstream and b) new patches that got necessary.

@NancyLi1013 NancyLi1013 removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Mar 3, 2021
@NancyLi1013
Copy link
Contributor

@jgehw

Is this PR ready for review now?

@jgehw
Copy link
Contributor Author

jgehw commented Mar 4, 2021

Is this PR ready for review now?

@NancyLi1013 yes, please

ports/tensorflow-cc/vcpkg.json Outdated Show resolved Hide resolved
ports/tensorflow-common/vcpkg.json Outdated Show resolved Hide resolved
ports/tensorflow/vcpkg.json Outdated Show resolved Hide resolved
versions/t-/tensorflow.json Outdated Show resolved Hide resolved
versions/t-/tensorflow-common.json Outdated Show resolved Hide resolved
versions/t-/tensorflow-cc.json Outdated Show resolved Hide resolved
@NancyLi1013 NancyLi1013 changed the title WIP: [tensorflow] upgrade to 2.4.1 [tensorflow] upgrade to 2.4.1 Mar 5, 2021
@jgehw
Copy link
Contributor Author

jgehw commented Mar 8, 2021

@NancyLi1013 please trigger a full Linux build, then the CI should build fine. The current CI error is because there were still files from the previous build:

Installing package tensorflow-common[core]:x64-linux...
The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with tensorflow-common:x64-linux

@NancyLi1013
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013 NancyLi1013 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Mar 9, 2021
@NancyLi1013
Copy link
Contributor

After rerun, all CI checks have passed now.

LGTM, thanks for your update @jgehw.

@ras0219-msft ras0219-msft marked this pull request as draft March 11, 2021 20:37
@ras0219-msft
Copy link
Contributor

Converting to draft while this PR is blocked on another.

@jgehw
Copy link
Contributor Author

jgehw commented Mar 12, 2021

Converting to draft while this PR is blocked on another.

@ras0219-msft It's no longer blocked as I reverted the UWP specific changes on March 2nd. Afterwards, this PR has already been reviewed by @NancyLi1013, so it's actually ready for merge into master.

@PhoebeHui PhoebeHui marked this pull request as ready for review March 15, 2021 09:44
@PhoebeHui
Copy link
Contributor

Relate to UWP PR #14394

@PhoebeHui
Copy link
Contributor

PhoebeHui commented Mar 23, 2021

@vicroms, since this doesn't include the uwp changes any more, could you help review and merge this PR?

@ras0219-msft ras0219-msft merged commit a9ba425 into microsoft:master Mar 26, 2021
@ras0219-msft
Copy link
Contributor

Thanks, this looks great to me!

@jgehw jgehw deleted the update-tf-2.4.1 branch March 29, 2021 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants