Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
d3121ce
Merge pull request #1 from microsoft/master
jgehw Aug 17, 2020
c743e49
Revert "incorporate changes from microsoft:master"
jgehw Aug 18, 2020
2571bd1
Merge pull request #2 from jgehw/revert-1-master
jgehw Aug 18, 2020
98ecc0c
Revert "Revert "incorporate changes from microsoft:master""
jgehw Aug 18, 2020
ab8fdf7
Merge branch 'master' of https://github.com/microsoft/vcpkg
Aug 18, 2020
36143ac
Merge branch 'master' of https://github.com/microsoft/vcpkg
Aug 20, 2020
1866a82
Merge branch 'master' of https://github.com/microsoft/vcpkg
Aug 21, 2020
9451d33
Merge branch 'master' of https://github.com/microsoft/vcpkg
Aug 22, 2020
fbbde32
Merge branch 'master' of https://github.com/microsoft/vcpkg
jgehw Aug 28, 2020
cc3823d
Merge branch 'master' of https://github.com/microsoft/vcpkg
jgehw Aug 29, 2020
f7ee6c6
Merge branch 'master' of https://github.com/microsoft/vcpkg
jgehw Aug 31, 2020
37f79c6
Merge branch 'master' of https://github.com/microsoft/vcpkg
jgehw Sep 1, 2020
f0d1c89
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Sep 2, 2020
3df3b9b
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Sep 3, 2020
067323c
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Sep 8, 2020
b8e9523
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Sep 10, 2020
6384898
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Oct 9, 2020
2ad839b
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Oct 15, 2020
f4e64da
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Oct 21, 2020
fe1d24c
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Oct 27, 2020
3898892
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Nov 12, 2020
77559a6
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Nov 16, 2020
0070847
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw May 17, 2021
e7a2378
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw May 25, 2021
647b8e3
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Jun 2, 2021
77c63ea
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Aug 4, 2021
5347f2c
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Sep 3, 2021
1799ce5
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Sep 4, 2021
4c0a3ca
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Sep 6, 2021
5817d17
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Sep 10, 2021
54af43c
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Sep 30, 2021
6093498
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Nov 15, 2021
13f119f
Merge branch 'master' of https://github.com/microsoft/vcpkg into master
jgehw Dec 14, 2021
ea4fbab
update tensorflow to 2.7 and bazel to latest 4.x
jgehw Dec 14, 2021
7962196
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 15, 2021
d3ce830
Update version database.
BillyONeal Dec 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/tensorflow-cc/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tensorflow-cc",
"version-semver": "2.6.0",
"version-semver": "2.7.0",
"description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)",
"homepage": "https://github.com/tensorflow/tensorflow",
"supports": "!(x86 | arm | uwp)",
Expand Down
12 changes: 0 additions & 12 deletions ports/tensorflow-common/Update-bazel-max-version.patch

This file was deleted.

32 changes: 0 additions & 32 deletions ports/tensorflow-common/fix-windows-build.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,6 @@ diff --git a/tensorflow/core/kernels/depthtospace_op.cc b/tensorflow/core/kernel
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
Expand All @@ -39,19 +23,3 @@ diff --git a/tensorflow/core/kernels/spacetodepth_op.cc b/tensorflow/core/kernel
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) \
1 change: 0 additions & 1 deletion ports/tensorflow-common/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ set(TENSORFLOW_FILES
"${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in"
"${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in"
"${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in"
"${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch"
)

file(COPY ${TENSORFLOW_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
Expand Down
7 changes: 3 additions & 4 deletions ports/tensorflow-common/tensorflow-common.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(TF_VERSION 2.6.0)
set(TF_VERSION_SHORT 2.6)
set(TF_VERSION 2.7.0)
set(TF_VERSION_SHORT 2.7)

vcpkg_find_acquire_program(BAZEL)
get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY)
Expand Down Expand Up @@ -144,11 +144,10 @@ foreach(BUILD_TYPE dbg rel)
OUT_SOURCE_PATH SOURCE_PATH
REPO tensorflow/tensorflow
REF "v${TF_VERSION}"
SHA512 d052da4b324f1b5ac9c904ac3cca270cefbf916be6e5968a6835ef3f8ea8c703a0b90be577ac5205edf248e8e6c7ee8817b6a1b383018bb77c381717c6205e05
SHA512 f1e892583c7b3a73d4d39ec65dc135a5b02c789b357d57414ad2b6d05ad9fbfc8ef81918ba6410e314abd6928b76f764e6ef64c0b0c84b58b50796634be03f39
HEAD_REF master
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error
"${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch"
${STATIC_ONLY_PATCHES}
${WINDOWS_ONLY_PATCHES}
)
Expand Down
3 changes: 1 addition & 2 deletions ports/tensorflow-common/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "tensorflow-common",
"version-semver": "2.6.0",
"port-version": 1,
"version-semver": "2.7.0",
"description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.",
"homepage": "https://github.com/tensorflow/tensorflow"
}
2 changes: 1 addition & 1 deletion ports/tensorflow/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tensorflow",
"version-semver": "2.6.0",
"version-semver": "2.7.0",
"description": "Library for computation using data flow graphs for scalable machine learning (C API version)",
"homepage": "https://github.com/tensorflow/tensorflow",
"supports": "!(x86 | arm | uwp)",
Expand Down
8 changes: 4 additions & 4 deletions scripts/cmake/vcpkg_find_acquire_program.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -497,27 +497,27 @@ function(vcpkg_find_acquire_program program)
set(tool_subdirectory c3eeb6b9fa-76d69c6db5)
elseif(program STREQUAL "BAZEL")
set(program_name bazel)
set(program_version 4.1.0)
set(program_version 4.2.2)
set(rename_binary_to "bazel")
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
set(supported_on_unix ON)
set(tool_subdirectory "${program_version}-linux")
set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64")
set(download_filename "bazel-${tool_subdirectory}-x86_64")
set(raw_executable ON)
set(download_sha512 50aa0894dbeedb9189a56f17baa8cecfa55c5f9c1f93a61b9ab5e10984754a400884fc9802b4979f536778e15f813a72807396b4b47694e4c05eadb841361c69)
set(download_sha512 f38619e054df78cab38278a5901b2798f2e25b5cec53358d98278002e713d225fd3df96a209b7f22a2357835a279cee8ef1768e10561b3e9fe6361f324563bb9)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
set(supported_on_unix ON)
set(tool_subdirectory "${program_version}-darwin")
set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64")
set(download_filename "bazel-${tool_subdirectory}-x86_64")
set(raw_executable ON)
set(download_sha512 3500560c9d49d37a1ead2d2777d673c6f1874582883e141ecd5b3991005b1b6b8aab5f255c187133d771497c2a956f5c1e0dfad04dc453525634537e65b649af)
set(download_sha512 a3fd8f9d71b0669d742439200f27ee0a3891c1f248df62c841ebb2b416a47534562f429f8a08793b074e9b74f2ede3d97a7e13ac9921c7ee2dc6a2dca8b7f275)
else()
set(tool_subdirectory "${program_version}-windows")
set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64.zip")
set(download_filename "bazel-${tool_subdirectory}-x86_64.zip")
set(download_sha512 3954ab54b465d62eef397767dac7ce21d06ac8ea3e1571d0e7b1f0ea8b5c2cf44eea5d252b85a63a1e1a08dbe9a219783cc23c2888673c35e2df03edfdc9e5a7)
set(download_sha512 8a8196e242964114316232818cb81bfa19ebfd3a029ebf550a241e33b22a6e9ed636dade06411a8706c05c4e73def0bc8d7f45ff0ec5478bcc5de21b5638204d)
endif()
elseif(program STREQUAL "ARIA2")
set(program_name aria2c)
Expand Down
8 changes: 4 additions & 4 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6689,16 +6689,16 @@
"port-version": 1
},
"tensorflow": {
"baseline": "2.6.0",
"baseline": "2.7.0",
"port-version": 0
},
"tensorflow-cc": {
"baseline": "2.6.0",
"baseline": "2.7.0",
"port-version": 0
},
"tensorflow-common": {
"baseline": "2.6.0",
"port-version": 1
"baseline": "2.7.0",
"port-version": 0
},
"tensorpipe": {
"baseline": "2021-04-26",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tensorflow-cc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f0bd2999562da259b6e2c39131a6a02f632b21a8",
"version-semver": "2.7.0",
"port-version": 0
},
{
"git-tree": "b9e9f840127f8da0c67cadf0369023753c90686b",
"version-semver": "2.6.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tensorflow-common.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "eb9e0e1345847b72eccecd5a6b85a441f034e1a7",
"version-semver": "2.7.0",
"port-version": 0
},
{
"git-tree": "e766afec982de89398663f587da490fc8996474f",
"version-semver": "2.6.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tensorflow.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b12af58d1b9069b6ab8b2de9e1c6c7f2b07aadfe",
"version-semver": "2.7.0",
"port-version": 0
},
{
"git-tree": "8692b5026a3b7666e73dcaf7432e525dc103f8c5",
"version-semver": "2.6.0",
Expand Down