diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2021-07-30 13:01:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-30 13:01:31 -0700 |
| commit | 261c458af6e3eed5d099144aff95d2b5035f656b (patch) | |
| tree | 7462d05a5d2ded0c0adccc3e523a20a8c51a3cdd | |
| parent | a5a70c7c3eadcc8a48b5f513b0ec361e40a5aeca (diff) | |
| download | vcpkg-261c458af6e3eed5d099144aff95d2b5035f656b.tar.gz vcpkg-261c458af6e3eed5d099144aff95d2b5035f656b.zip | |
[tensorflow] Update the max version of the supported bazel (#19165)
* [tensorflow] Update the max version of the supported bazel
* Update json file
| -rw-r--r-- | ports/tensorflow-common/Update-bazel-max-version.patch | 13 | ||||
| -rw-r--r-- | ports/tensorflow-common/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/tensorflow-common/tensorflow-common.cmake | 1 | ||||
| -rw-r--r-- | ports/tensorflow-common/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/tensorflow-common.json | 5 |
6 files changed, 22 insertions, 2 deletions
diff --git a/ports/tensorflow-common/Update-bazel-max-version.patch b/ports/tensorflow-common/Update-bazel-max-version.patch new file mode 100644 index 000000000..9dffd884b --- /dev/null +++ b/ports/tensorflow-common/Update-bazel-max-version.patch @@ -0,0 +1,13 @@ +diff --git a/configure.py b/configure.py
+index e5428a6..9324d7b 100644
+--- a/configure.py
++++ b/configure.py
+@@ -47,7 +47,7 @@ _TF_WORKSPACE_ROOT = ''
+ _TF_BAZELRC = ''
+ _TF_CURRENT_BAZEL_VERSION = None
+ _TF_MIN_BAZEL_VERSION = '3.1.0'
+-_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/portfile.cmake b/ports/tensorflow-common/portfile.cmake index 7aacbbc20..e505c4430 100644 --- a/ports/tensorflow-common/portfile.cmake +++ b/ports/tensorflow-common/portfile.cmake @@ -18,6 +18,7 @@ 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 90cba9197..776cb9c00 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -138,6 +138,7 @@ foreach(BUILD_TYPE dbg rel) 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} ${LINUX_ONLY_PATCHES} diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index 35d2fdb26..d97e2c228 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorflow-common", "version-semver": "2.4.1", - "port-version": 2, + "port-version": 3, "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/versions/baseline.json b/versions/baseline.json index ae0396a56..7e6419146 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6190,7 +6190,7 @@ }, "tensorflow-common": { "baseline": "2.4.1", - "port-version": 2 + "port-version": 3 }, "tensorpipe": { "baseline": "2021-04-26", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index 3ac6d830e..cbe798a9e 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "dd652b405ef53658c13af438e8414110f2977520", + "version-semver": "2.4.1", + "port-version": 3 + }, + { "git-tree": "84ba326c66ab77faaf3e59d8eb3f04ffa155a4bb", "version-semver": "2.4.1", "port-version": 2 |