diff --git a/ports/tensorflow-cc/vcpkg.json b/ports/tensorflow-cc/vcpkg.json index b2f1edcc77f92e..8a79f071679562 100644 --- a/ports/tensorflow-cc/vcpkg.json +++ b/ports/tensorflow-cc/vcpkg.json @@ -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)", diff --git a/ports/tensorflow-common/Update-bazel-max-version.patch b/ports/tensorflow-common/Update-bazel-max-version.patch deleted file mode 100644 index 172a6439d319f7..00000000000000 --- a/ports/tensorflow-common/Update-bazel-max-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.py b/configure.py ---- a/configure.py -+++ b/configure.py -@@ -50,7 +50,7 @@ - _TF_BAZELRC = '' - _TF_CURRENT_BAZEL_VERSION = None - _TF_MIN_BAZEL_VERSION = '3.7.2' --_TF_MAX_BAZEL_VERSION = '3.99.0' -+_TF_MAX_BAZEL_VERSION = '4.1.0' - - NCCL_LIB_PATHS = [ - 'lib64/', 'lib/powerpc64le-linux-gnu/', 'lib/x86_64-linux-gnu/', '' diff --git a/ports/tensorflow-common/fix-windows-build.patch b/ports/tensorflow-common/fix-windows-build.patch index 8450299e80f7fb..9f7f8dea8d29f1 100644 --- a/ports/tensorflow-common/fix-windows-build.patch +++ b/ports/tensorflow-common/fix-windows-build.patch @@ -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(); -@@ -173,15 +173,6 @@ - } - }; - --#ifdef WIN32 --template --struct DepthToSpaceOpFunctor { -- void operator()(const CPUDevice& d, typename TTypes::ConstTensor input, -- int block_size, typename TTypes::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 @@ -39,19 +23,3 @@ diff --git a/tensorflow/core/kernels/spacetodepth_op.cc b/tensorflow/core/kernel using RT = typename RawType::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 --struct SpaceToDepthOpFunctor { -- void operator()(const CPUDevice& d, typename TTypes::ConstTensor input, -- int block_size, typename TTypes::Tensor output) { -- LOG(FATAL) << "Trivial implementation to make debug build compile."; -- } --}; --#endif - } // namespace functor - - #define REGISTER(type) \ diff --git a/ports/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake index bbfc287df5c544..45fb70e27099a2 100644 --- a/ports/tensorflow-common/portfile.cmake +++ b/ports/tensorflow-common/portfile.cmake @@ -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}") diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake index cdb7c9665ef98f..c432f141730c6c 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -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) @@ -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} ) diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index f6a9f7cd124dbf..dc23ce51725969 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -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" } diff --git a/ports/tensorflow/vcpkg.json b/ports/tensorflow/vcpkg.json index b00a067fcf3bf3..4aa6847128a937 100644 --- a/ports/tensorflow/vcpkg.json +++ b/ports/tensorflow/vcpkg.json @@ -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)", diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 036043462c6665..55e64feb3f3787 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -497,7 +497,7 @@ 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) @@ -505,19 +505,19 @@ function(vcpkg_find_acquire_program program) 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) diff --git a/versions/baseline.json b/versions/baseline.json index 1586b894b2f405..4b4e3fdec01de0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/t-/tensorflow-cc.json b/versions/t-/tensorflow-cc.json index 2fb6918aa5f074..017d76e1637d58 100644 --- a/versions/t-/tensorflow-cc.json +++ b/versions/t-/tensorflow-cc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0bd2999562da259b6e2c39131a6a02f632b21a8", + "version-semver": "2.7.0", + "port-version": 0 + }, { "git-tree": "b9e9f840127f8da0c67cadf0369023753c90686b", "version-semver": "2.6.0", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index 532edc4b54c3ca..a7797048467249 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb9e0e1345847b72eccecd5a6b85a441f034e1a7", + "version-semver": "2.7.0", + "port-version": 0 + }, { "git-tree": "e766afec982de89398663f587da490fc8996474f", "version-semver": "2.6.0", diff --git a/versions/t-/tensorflow.json b/versions/t-/tensorflow.json index 900e6a8ed8106e..97c05bf141f58b 100644 --- a/versions/t-/tensorflow.json +++ b/versions/t-/tensorflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b12af58d1b9069b6ab8b2de9e1c6c7f2b07aadfe", + "version-semver": "2.7.0", + "port-version": 0 + }, { "git-tree": "8692b5026a3b7666e73dcaf7432e525dc103f8c5", "version-semver": "2.6.0",