aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorJoachim Gehweiler <44170764+jgehw@users.noreply.github.com>2021-09-30 05:43:32 +0200
committerGitHub <noreply@github.com>2021-09-29 20:43:32 -0700
commit8ad33ead9075cd8d6d357e0b870ba8d501efe35c (patch)
treeab3a6b7785b5b34da890e0db63f50bbe60362bf6 /versions
parentdd991ef5b82051cb7481a92c71dc5706325ba7c2 (diff)
downloadvcpkg-8ad33ead9075cd8d6d357e0b870ba8d501efe35c.tar.gz
vcpkg-8ad33ead9075cd8d6d357e0b870ba8d501efe35c.zip
[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>
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json10
-rw-r--r--versions/t-/tensorflow-cc.json5
-rw-r--r--versions/t-/tensorflow-common.json5
-rw-r--r--versions/t-/tensorflow.json5
4 files changed, 20 insertions, 5 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index 8c4ebc40d..d19079847 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6457,16 +6457,16 @@
"port-version": 1
},
"tensorflow": {
- "baseline": "2.4.1",
+ "baseline": "2.6.0",
"port-version": 0
},
"tensorflow-cc": {
- "baseline": "2.4.1",
- "port-version": 1
+ "baseline": "2.6.0",
+ "port-version": 0
},
"tensorflow-common": {
- "baseline": "2.4.1",
- "port-version": 5
+ "baseline": "2.6.0",
+ "port-version": 0
},
"tensorpipe": {
"baseline": "2021-04-26",
diff --git a/versions/t-/tensorflow-cc.json b/versions/t-/tensorflow-cc.json
index b43b8b239..2fb6918aa 100644
--- a/versions/t-/tensorflow-cc.json
+++ b/versions/t-/tensorflow-cc.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b9e9f840127f8da0c67cadf0369023753c90686b",
+ "version-semver": "2.6.0",
+ "port-version": 0
+ },
+ {
"git-tree": "77875da04a151fb36abe52cce80491a9a7f16c55",
"version-semver": "2.4.1",
"port-version": 1
diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json
index a647b39e3..26d4c0d26 100644
--- a/versions/t-/tensorflow-common.json
+++ b/versions/t-/tensorflow-common.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "84662f791eb9d38350a4ffe99cd80d49f562b10f",
+ "version-semver": "2.6.0",
+ "port-version": 0
+ },
+ {
"git-tree": "2160d070413af839dbe9da331350e34c91352e11",
"version-semver": "2.4.1",
"port-version": 5
diff --git a/versions/t-/tensorflow.json b/versions/t-/tensorflow.json
index c83f74066..900e6a8ed 100644
--- a/versions/t-/tensorflow.json
+++ b/versions/t-/tensorflow.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "8692b5026a3b7666e73dcaf7432e525dc103f8c5",
+ "version-semver": "2.6.0",
+ "port-version": 0
+ },
+ {
"git-tree": "bd9bf99a10fe9a9769f26dedb282f3c1954fc9bb",
"version-semver": "2.4.1",
"port-version": 0