Date: Thursday, August 12, 2021 @ 15:58:57 Author: kgizdov Revision: 997600
upgpkg: tensorflow 2.6.0-1: upgpkg: tensorflow 2.6.0-1 Modified: tensorflow/trunk/48935.patch tensorflow/trunk/PKGBUILD tensorflow/trunk/fix-c++17-compat.patch ------------------------+ 48935.patch | 97 ++++------------------------------------------- PKGBUILD | 12 ++--- fix-c++17-compat.patch | 4 - 3 files changed, 17 insertions(+), 96 deletions(-) Modified: 48935.patch =================================================================== --- 48935.patch 2021-08-12 15:58:50 UTC (rev 997599) +++ 48935.patch 2021-08-12 15:58:57 UTC (rev 997600) @@ -41,7 +41,6 @@ .../ci_build/install/install_pip_packages.sh | 4 ++-- .../install/install_pip_packages_by_version.sh | 2 +- .../install/install_python3.6_pip_packages.sh | 2 +- - tensorflow/tools/ci_build/release/common.sh | 18 +++++++++--------- tensorflow/tools/pip_package/setup.py | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) @@ -61,11 +60,11 @@ --- a/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh +++ b/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh @@ -55,17 +55,17 @@ pip2 install --upgrade protobuf==3.6.1 - pip3 install --upgrade protobuf==3.6.1 + pip3 install --upgrade protobuf==3.16.0 pip2 install --upgrade numpy==1.14.5 --pip3 install --upgrade numpy==1.14.5 -+pip3 install --upgrade numpy>=1.14.5 +-pip3 install --upgrade numpy~=1.19.2 ++pip3 install --upgrade numpy>=1.19.2 pip2 install scipy==1.2.2 -pip3 install scipy==1.4.1 @@ -89,11 +88,11 @@ # https://github.com/tensorflow/tensorflow/issues/6968 # This workaround isn't needed for Ubuntu 16.04 or later. if $(cat /etc/*-release | grep -q 14.04); then -- pip3 install --no-binary=:all: --upgrade numpy==1.14.5 -+ pip3 install --no-binary=:all: --upgrade numpy>=1.14.5 - else - pip3 install --upgrade numpy==1.14.5 + pip3 install --upgrade numpy>=1.14.5 + else +- pip3 install --upgrade numpy~=1.19.2 ++ pip3 install --upgrade numpy>=1.19.2 fi pip3 install scipy==1.4.1 @@ -105,7 +104,7 @@ # NOTE: As numpy has releases that break semver guarantees and several other # deps depend on numpy without an upper bound, we must install numpy before # everything else. -- "numpy ~= 1.19.2" +- "numpy~=1.19.2" + "numpy>=1.19.2,<1.21" "auditwheel" "wheel" @@ -118,89 +117,11 @@ # numpy needs to be installed from source to fix segfaults. See: # https://github.com/tensorflow/tensorflow/issues/6968 # This workaround isn't needed for Ubuntu 16.04 or later. --pip3 install --no-binary=:all: --upgrade numpy==1.14.5 -+pip3 install --no-binary=:all: --upgrade numpy>=1.14.5 +-pip3 install --upgrade numpy~=1.19.2 ++pip3 install --upgrade numpy>=1.19.2 pip3 install scipy==1.4.1 -diff --git a/tensorflow/tools/ci_build/release/common.sh b/tensorflow/tools/ci_build/release/common.sh -index 89eecc5d83c8a..59bafb5198992 100644 ---- a/tensorflow/tools/ci_build/release/common.sh -+++ b/tensorflow/tools/ci_build/release/common.sh -@@ -125,8 +125,8 @@ function install_ubuntu_16_pip_deps { - # deps depend on numpy without an upper bound, we must install numpy before - # everything else. - # TODO(mihaimaruseac): Convert to requirements.txt -- "${PIP_CMD}" install --user 'numpy ~= 1.19.2' -- # Now, install the deps, as listed in setup.py -+ "${PIP_CMD}" install --user 'numpy >= 1.19.2,< 1.21' -+ # Now, install the deps, as listed in setup. py - "${PIP_CMD}" install --user 'absl-py ~= 0.10' - "${PIP_CMD}" install --user 'astunparse ~= 1.6.3' - "${PIP_CMD}" install --user 'flatbuffers ~= 1.12.0' -@@ -149,7 +149,7 @@ function install_ubuntu_16_pip_deps { - # Test dependencies - "${PIP_CMD}" install --user 'grpcio >= 1.37.0, < 2.0' - "${PIP_CMD}" install --user 'portpicker ~= 1.3.1' -- "${PIP_CMD}" install --user 'scipy ~= 1.5.2' -+ "${PIP_CMD}" install --user 'scipy >= 1.5.2, < 1.7' - # LINT.ThenChange(:mac_pip_installations) - # Need to be addressed later. Unblocking 2.4 branchcut - "${PIP_CMD}" install --user 'PyYAML ~= 5.3.1' -@@ -182,7 +182,7 @@ function install_ubuntu_16_python_pip_deps { - # deps depend on numpy without an upper bound, we must install numpy before - # everything else. - # TODO(mihaimaruseac): Convert to requirements.txt -- ${PIP_CMD} install --user 'numpy ~= 1.19.2' -+ ${PIP_CMD} install --user 'numpy >= 1.19.2, < 1.21' - # Now, install the deps, as listed in setup.py - ${PIP_CMD} install --user 'absl-py ~= 0.10' - ${PIP_CMD} install --user 'astunparse ~= 1.6.3' -@@ -206,7 +206,7 @@ function install_ubuntu_16_python_pip_deps { - # Test dependencies - ${PIP_CMD} install --user 'grpcio >= 1.37.0, < 2.0' - ${PIP_CMD} install --user 'portpicker ~= 1.3.1' -- ${PIP_CMD} install --user 'scipy ~= 1.5.2' -+ ${PIP_CMD} install --user 'scipy >= 1.5.2, <1.7' - # LINT.ThenChange(:mac_pip_installations) - # Need to be addressed later. Unblocking 2.4 branchcut - ${PIP_CMD} install --user 'PyYAML ~= 5.3.1' -@@ -225,7 +225,7 @@ function install_macos_pip_deps { - # deps depend on numpy without an upper bound, we must install numpy before - # everything else. - # TODO(mihaimaruseac): Convert to requirements.txt -- ${PIP_CMD} install 'numpy ~= 1.19.2' -+ ${PIP_CMD} install 'numpy >= 1.19.2 , <1.21' - # Now, install the deps, as listed in setup.py - ${PIP_CMD} install 'absl-py ~= 0.10' - ${PIP_CMD} install 'astunparse ~= 1.6.3' -@@ -249,7 +249,7 @@ function install_macos_pip_deps { - # Test dependencies - ${PIP_CMD} install 'grpcio >= 1.37.0, < 2.0' - ${PIP_CMD} install 'portpicker ~= 1.3.1' -- ${PIP_CMD} install 'scipy ~= 1.5.2' -+ ${PIP_CMD} install 'scipy >= 1.5.2, < 1.7' - ${PIP_CMD} install --upgrade certifi - - # LINT.ThenChange(:linux_pip_installations_orig) -@@ -272,7 +272,7 @@ function install_macos_pip_deps_no_venv { - # deps depend on numpy without an upper bound, we must install numpy before - # everything else. - # TODO(mihaimaruseac): Convert to requirements.txt -- ${PIP_CMD} install 'numpy ~= 1.19.2' --user -+ ${PIP_CMD} install 'numpy >= 1.19.2, <1.21' --user - # Now, install the deps, as listed in setup.py - ${PIP_CMD} install 'absl-py ~= 0.10' --user - ${PIP_CMD} install 'astunparse ~= 1.6.3' --user -@@ -296,7 +296,7 @@ function install_macos_pip_deps_no_venv { - # Test dependencies - ${PIP_CMD} install 'grpcio >= 1.37.0, < 2.0' --user - ${PIP_CMD} install 'portpicker ~= 1.3.1' --user -- ${PIP_CMD} install 'scipy ~= 1.5.2' --user -+ ${PIP_CMD} install 'scipy >= 1.5.2, <1.7' --user - ${PIP_CMD} install --upgrade certifi --user - - # LINT.ThenChange(:install_macos_pip_deps) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 5fe345ed7ed9f..453c930700139 100644 --- a/tensorflow/tools/pip_package/setup.py Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-08-12 15:58:50 UTC (rev 997599) +++ PKGBUILD 2021-08-12 15:58:57 UTC (rev 997600) @@ -5,8 +5,8 @@ pkgbase=tensorflow pkgname=(tensorflow tensorflow-opt tensorflow-cuda tensorflow-opt-cuda python-tensorflow python-tensorflow-opt python-tensorflow-cuda python-tensorflow-opt-cuda) -pkgver=2.5.1 -_pkgver=2.5.1 +pkgver=2.6.0 +_pkgver=2.6.0 pkgrel=1 pkgdesc="Library for computation using data flow graphs for scalable machine learning" url="https://www.tensorflow.org/"; @@ -23,9 +23,9 @@ fix-c++17-compat.patch build-against-actual-mkl.patch openssl-1.1.patch) -sha512sums=('bf68b2a9501a783c8dabcdb24fb316ec5d2b55bd940f1038c8145b7a0c4b3221cc956e659f47648985de40c96a3268dec5cdc62cabbfc9635cfe02f75d66be05' - '6dab3966de6e8065a3aa91575976df9593b56c7f347f5ef45cc791a4427b4569cde0b772ca6060f229d4e97ce637a69b04346a347c23cdc63420d8226da313ab' - 'a39f4adff91a60b05c18c4c1ef99b65375887bbea5991610eb162a3c6e3562f8d4438f9f1e1910b672f6094235b5b70dea633578f7f6b5b931f221ca2805152a' +sha512sums=('d052da4b324f1b5ac9c904ac3cca270cefbf916be6e5968a6835ef3f8ea8c703a0b90be577ac5205edf248e8e6c7ee8817b6a1b383018bb77c381717c6205e05' + '8a0fb7e728b144656503ee54b3c90483c619adf17b2081dceb2bd6bcd1435dd64afba97526d94114d4c10fc002d2d213ae6717ad407285b18e438b05fc1ed2ad' + 'f682368bb47b2b022a51aa77345dfa30f3b0d7911c56515d428b8326ee3751242f375f4e715a37bb723ef20a86916dad9871c3c81b1b58da85e1ca202bc4901e' 'e51e3f3dced121db3a09fbdaefd33555536095584b72a5eb6f302fa6fa68ab56ea45e8a847ec90ff4ba076db312c06f91ff672e08e95263c658526582494ce08' 'cb15e7331f62d6e77e1099055430cd026e5788f0cab202fbfad8e27c47fca9ad5e1467249683dcdaab8c76cab4dece016f8ecd0f0793adb256ff6d975f893125') @@ -100,7 +100,7 @@ export TF_NEED_IGNITE=0 export TF_NEED_ROCM=0 # See https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl - export TF_SYSTEM_LIBS="boringssl,curl,cython,gif,icu,libjpeg_turbo,lmdb,nasm,pcre,png,pybind11,zlib" + export TF_SYSTEM_LIBS="boringssl,curl,cython,gif,icu,libjpeg_turbo,lmdb,nasm,png,pybind11,zlib" export TF_SET_ANDROID_WORKSPACE=0 export TF_DOWNLOAD_CLANG=0 export TF_NCCL_VERSION=$(pkg-config nccl --modversion | grep -Po '\d+\.\d+') Modified: fix-c++17-compat.patch =================================================================== --- fix-c++17-compat.patch 2021-08-12 15:58:50 UTC (rev 997599) +++ fix-c++17-compat.patch 2021-08-12 15:58:57 UTC (rev 997600) @@ -1,9 +1,9 @@ --- config-old.h 2021-06-13 04:22:15.841839739 +0200 +++ config.h 2021-06-13 04:22:32.308939638 +0200 @@ -533,7 +533,7 @@ - #ifdef __has_include - #if __has_include(<string_view>) && __cplusplus >= 201703L + #if __has_include(<string_view>) && defined(__cplusplus) && \ + __cplusplus >= 201703L -#define ABSL_HAVE_STD_STRING_VIEW 1 +// #define ABSL_HAVE_STD_STRING_VIEW 1 #endif
