[arch-commits] Commit in tensorflow/repos (7 files)
Date: Sunday, December 5, 2021 @ 02:42:50 Author: svenstaro Revision: 1065110 archrelease: copy trunk to community-staging-x86_64 Added: tensorflow/repos/community-staging-x86_64/ tensorflow/repos/community-staging-x86_64/48935.patch (from rev 1065109, tensorflow/trunk/48935.patch) tensorflow/repos/community-staging-x86_64/PKGBUILD (from rev 1065109, tensorflow/trunk/PKGBUILD) tensorflow/repos/community-staging-x86_64/build-against-actual-mkl.patch (from rev 1065109, tensorflow/trunk/build-against-actual-mkl.patch) tensorflow/repos/community-staging-x86_64/fix-c++17-compat.patch (from rev 1065109, tensorflow/trunk/fix-c++17-compat.patch) tensorflow/repos/community-staging-x86_64/openssl-1.1.patch (from rev 1065109, tensorflow/trunk/openssl-1.1.patch) tensorflow/repos/community-staging-x86_64/test.py (from rev 1065109, tensorflow/trunk/test.py) + 48935.patch| 926 +++ PKGBUILD | 315 + build-against-actual-mkl.patch | 37 + fix-c++17-compat.patch | 11 openssl-1.1.patch | 24 + test.py| 12 6 files changed, 1325 insertions(+) Copied: tensorflow/repos/community-staging-x86_64/48935.patch (from rev 1065109, tensorflow/trunk/48935.patch) === --- community-staging-x86_64/48935.patch(rev 0) +++ community-staging-x86_64/48935.patch2021-12-05 02:42:50 UTC (rev 1065110) @@ -0,0 +1,926 @@ +From 0f8fde42d09b199d02cf5d9d79fe76ebf1d260ef Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:13:40 +0200 +Subject: [PATCH 01/14] Fix NumPy 1.20 error with np.prod() + +Reference: #47691, https://stackoverflow.com/questions/66373169 +--- + tensorflow/python/ops/array_ops.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +index 519f2ef26fcef..d143ee96a2fc9 100644 +--- a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +@@ -36,6 +36,7 @@ + from tensorflow.python.framework.constant_op import constant + from tensorflow.python.ops import gen_array_ops + from tensorflow.python.ops import gen_math_ops ++from tensorflow.python.ops import math_ops + # go/tf-wildcard-import + # pylint: disable=wildcard-import + from tensorflow.python.ops.gen_array_ops import * +@@ -2894,7 +2895,7 @@ def matrix_set_diag( + + def _constant_if_small(value, shape, dtype, name): + try: +-if np.prod(shape) < 1000: ++if math_ops.reduce_prod(shape) < 1000: + return constant(value, shape=shape, dtype=dtype, name=name) + except TypeError: + # Happens when shape is a Tensor, list with Tensor elements, etc. + +From 86cbf87703876330b5818b7f170489356d9d2c86 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:34:12 +0200 +Subject: [PATCH 02/14] relax upper bounds for NumPy and SciPy in pip installs + +--- + .../tools/pip_package/setup_with_binary.py | 2 +- + .../install/install_centos_pip_packages.sh | 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(-) + +diff --git a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +index 6b9fe534bb2b1..ae06df8245521 100644 +--- a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +@@ -67,5 +67,5 @@ + package_dir={'': '.'}, + package_data={'': ['*.so', '*.pyd']}, + install_requires=[ +-'numpy ~= 1.19.2', # Higher versions have a compatibility issue. ++'numpy >= 1.19.2 , <1.21', + ]) +diff --git a/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh b/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh +index b9906b9378c79..ab0a766bf22b0 100755 +--- 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 + + pip2 install --upgrade numpy==1.14.5 +-pip3 install --upgrade numpy==1.14.5 ++pip3 install --upgrade numpy>=1.14.5 + + pip2 install scipy==1.2.2 +-pip3 install scipy==1.4.1 ++pip3 install scipy>=1.4.1 + + pip2 install scikit-learn==0.18.1 + pip3 install scikit-learn==0.18.1 + + # pandas required by `inflow` + pip2 install pandas==0.19.2 +-pip3 install pandas==0.19.2 ++pip3 install pandas>=0.19.2 + + # Benchmark tests require the
[arch-commits] Commit in tensorflow/repos (7 files)
Date: Monday, November 22, 2021 @ 06:55:53 Author: felixonmars Revision: 1054215 archrelease: copy trunk to community-staging-x86_64 Added: tensorflow/repos/community-staging-x86_64/ tensorflow/repos/community-staging-x86_64/48935.patch (from rev 1054214, tensorflow/trunk/48935.patch) tensorflow/repos/community-staging-x86_64/PKGBUILD (from rev 1054214, tensorflow/trunk/PKGBUILD) tensorflow/repos/community-staging-x86_64/build-against-actual-mkl.patch (from rev 1054214, tensorflow/trunk/build-against-actual-mkl.patch) tensorflow/repos/community-staging-x86_64/fix-c++17-compat.patch (from rev 1054214, tensorflow/trunk/fix-c++17-compat.patch) tensorflow/repos/community-staging-x86_64/openssl-1.1.patch (from rev 1054214, tensorflow/trunk/openssl-1.1.patch) tensorflow/repos/community-staging-x86_64/test.py (from rev 1054214, tensorflow/trunk/test.py) + 48935.patch| 926 +++ PKGBUILD | 310 + build-against-actual-mkl.patch | 37 + fix-c++17-compat.patch | 11 openssl-1.1.patch | 24 + test.py| 12 6 files changed, 1320 insertions(+) Copied: tensorflow/repos/community-staging-x86_64/48935.patch (from rev 1054214, tensorflow/trunk/48935.patch) === --- community-staging-x86_64/48935.patch(rev 0) +++ community-staging-x86_64/48935.patch2021-11-22 06:55:53 UTC (rev 1054215) @@ -0,0 +1,926 @@ +From 0f8fde42d09b199d02cf5d9d79fe76ebf1d260ef Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:13:40 +0200 +Subject: [PATCH 01/14] Fix NumPy 1.20 error with np.prod() + +Reference: #47691, https://stackoverflow.com/questions/66373169 +--- + tensorflow/python/ops/array_ops.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +index 519f2ef26fcef..d143ee96a2fc9 100644 +--- a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +@@ -36,6 +36,7 @@ + from tensorflow.python.framework.constant_op import constant + from tensorflow.python.ops import gen_array_ops + from tensorflow.python.ops import gen_math_ops ++from tensorflow.python.ops import math_ops + # go/tf-wildcard-import + # pylint: disable=wildcard-import + from tensorflow.python.ops.gen_array_ops import * +@@ -2894,7 +2895,7 @@ def matrix_set_diag( + + def _constant_if_small(value, shape, dtype, name): + try: +-if np.prod(shape) < 1000: ++if math_ops.reduce_prod(shape) < 1000: + return constant(value, shape=shape, dtype=dtype, name=name) + except TypeError: + # Happens when shape is a Tensor, list with Tensor elements, etc. + +From 86cbf87703876330b5818b7f170489356d9d2c86 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:34:12 +0200 +Subject: [PATCH 02/14] relax upper bounds for NumPy and SciPy in pip installs + +--- + .../tools/pip_package/setup_with_binary.py | 2 +- + .../install/install_centos_pip_packages.sh | 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(-) + +diff --git a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +index 6b9fe534bb2b1..ae06df8245521 100644 +--- a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +@@ -67,5 +67,5 @@ + package_dir={'': '.'}, + package_data={'': ['*.so', '*.pyd']}, + install_requires=[ +-'numpy ~= 1.19.2', # Higher versions have a compatibility issue. ++'numpy >= 1.19.2 , <1.21', + ]) +diff --git a/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh b/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh +index b9906b9378c79..ab0a766bf22b0 100755 +--- 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 + + pip2 install --upgrade numpy==1.14.5 +-pip3 install --upgrade numpy==1.14.5 ++pip3 install --upgrade numpy>=1.14.5 + + pip2 install scipy==1.2.2 +-pip3 install scipy==1.4.1 ++pip3 install scipy>=1.4.1 + + pip2 install scikit-learn==0.18.1 + pip3 install scikit-learn==0.18.1 + + # pandas required by `inflow` + pip2 install pandas==0.19.2 +-pip3 install pandas==0.19.2 ++pip3 install pandas>=0.19.2 + + # Benchmark tests require
[arch-commits] Commit in tensorflow/repos (7 files)
Date: Saturday, November 6, 2021 @ 17:26:15 Author: svenstaro Revision: 1037653 archrelease: copy trunk to community-testing-x86_64 Added: tensorflow/repos/community-testing-x86_64/ tensorflow/repos/community-testing-x86_64/48935.patch (from rev 1037652, tensorflow/trunk/48935.patch) tensorflow/repos/community-testing-x86_64/PKGBUILD (from rev 1037652, tensorflow/trunk/PKGBUILD) tensorflow/repos/community-testing-x86_64/build-against-actual-mkl.patch (from rev 1037652, tensorflow/trunk/build-against-actual-mkl.patch) tensorflow/repos/community-testing-x86_64/fix-c++17-compat.patch (from rev 1037652, tensorflow/trunk/fix-c++17-compat.patch) tensorflow/repos/community-testing-x86_64/openssl-1.1.patch (from rev 1037652, tensorflow/trunk/openssl-1.1.patch) tensorflow/repos/community-testing-x86_64/test.py (from rev 1037652, tensorflow/trunk/test.py) + 48935.patch| 926 +++ PKGBUILD | 310 + build-against-actual-mkl.patch | 37 + fix-c++17-compat.patch | 11 openssl-1.1.patch | 24 + test.py| 12 6 files changed, 1320 insertions(+) Copied: tensorflow/repos/community-testing-x86_64/48935.patch (from rev 1037652, tensorflow/trunk/48935.patch) === --- community-testing-x86_64/48935.patch(rev 0) +++ community-testing-x86_64/48935.patch2021-11-06 17:26:15 UTC (rev 1037653) @@ -0,0 +1,926 @@ +From 0f8fde42d09b199d02cf5d9d79fe76ebf1d260ef Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:13:40 +0200 +Subject: [PATCH 01/14] Fix NumPy 1.20 error with np.prod() + +Reference: #47691, https://stackoverflow.com/questions/66373169 +--- + tensorflow/python/ops/array_ops.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +index 519f2ef26fcef..d143ee96a2fc9 100644 +--- a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +@@ -36,6 +36,7 @@ + from tensorflow.python.framework.constant_op import constant + from tensorflow.python.ops import gen_array_ops + from tensorflow.python.ops import gen_math_ops ++from tensorflow.python.ops import math_ops + # go/tf-wildcard-import + # pylint: disable=wildcard-import + from tensorflow.python.ops.gen_array_ops import * +@@ -2894,7 +2895,7 @@ def matrix_set_diag( + + def _constant_if_small(value, shape, dtype, name): + try: +-if np.prod(shape) < 1000: ++if math_ops.reduce_prod(shape) < 1000: + return constant(value, shape=shape, dtype=dtype, name=name) + except TypeError: + # Happens when shape is a Tensor, list with Tensor elements, etc. + +From 86cbf87703876330b5818b7f170489356d9d2c86 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:34:12 +0200 +Subject: [PATCH 02/14] relax upper bounds for NumPy and SciPy in pip installs + +--- + .../tools/pip_package/setup_with_binary.py | 2 +- + .../install/install_centos_pip_packages.sh | 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(-) + +diff --git a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +index 6b9fe534bb2b1..ae06df8245521 100644 +--- a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +@@ -67,5 +67,5 @@ + package_dir={'': '.'}, + package_data={'': ['*.so', '*.pyd']}, + install_requires=[ +-'numpy ~= 1.19.2', # Higher versions have a compatibility issue. ++'numpy >= 1.19.2 , <1.21', + ]) +diff --git a/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh b/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh +index b9906b9378c79..ab0a766bf22b0 100755 +--- 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 + + pip2 install --upgrade numpy==1.14.5 +-pip3 install --upgrade numpy==1.14.5 ++pip3 install --upgrade numpy>=1.14.5 + + pip2 install scipy==1.2.2 +-pip3 install scipy==1.4.1 ++pip3 install scipy>=1.4.1 + + pip2 install scikit-learn==0.18.1 + pip3 install scikit-learn==0.18.1 + + # pandas required by `inflow` + pip2 install pandas==0.19.2 +-pip3 install pandas==0.19.2 ++pip3 install pandas>=0.19.2 + + # Benchmark tests require
[arch-commits] Commit in tensorflow/repos (7 files)
Date: Sunday, October 31, 2021 @ 14:07:43 Author: svenstaro Revision: 1035062 archrelease: copy trunk to community-testing-x86_64 Added: tensorflow/repos/community-testing-x86_64/ tensorflow/repos/community-testing-x86_64/48935.patch (from rev 1035061, tensorflow/trunk/48935.patch) tensorflow/repos/community-testing-x86_64/PKGBUILD (from rev 1035061, tensorflow/trunk/PKGBUILD) tensorflow/repos/community-testing-x86_64/build-against-actual-mkl.patch (from rev 1035061, tensorflow/trunk/build-against-actual-mkl.patch) tensorflow/repos/community-testing-x86_64/fix-c++17-compat.patch (from rev 1035061, tensorflow/trunk/fix-c++17-compat.patch) tensorflow/repos/community-testing-x86_64/openssl-1.1.patch (from rev 1035061, tensorflow/trunk/openssl-1.1.patch) tensorflow/repos/community-testing-x86_64/test.py (from rev 1035061, tensorflow/trunk/test.py) + 48935.patch| 353 +++ PKGBUILD | 327 build-against-actual-mkl.patch | 37 fix-c++17-compat.patch | 11 + openssl-1.1.patch | 24 ++ test.py| 12 + 6 files changed, 764 insertions(+) Copied: tensorflow/repos/community-testing-x86_64/48935.patch (from rev 1035061, tensorflow/trunk/48935.patch) === --- community-testing-x86_64/48935.patch(rev 0) +++ community-testing-x86_64/48935.patch2021-10-31 14:07:43 UTC (rev 1035062) @@ -0,0 +1,353 @@ +From 0f8fde42d09b199d02cf5d9d79fe76ebf1d260ef Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:13:40 +0200 +Subject: [PATCH 1/7] Fix NumPy 1.20 error with np.prod() + +Reference: #47691, https://stackoverflow.com/questions/66373169 +--- + tensorflow/python/ops/array_ops.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +index 519f2ef26fcef..d143ee96a2fc9 100644 +--- a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +@@ -36,6 +36,7 @@ + from tensorflow.python.framework.constant_op import constant + from tensorflow.python.ops import gen_array_ops + from tensorflow.python.ops import gen_math_ops ++from tensorflow.python.ops import math_ops + # go/tf-wildcard-import + # pylint: disable=wildcard-import + from tensorflow.python.ops.gen_array_ops import * +@@ -2894,7 +2895,7 @@ def matrix_set_diag( + + def _constant_if_small(value, shape, dtype, name): + try: +-if np.prod(shape) < 1000: ++if math_ops.reduce_prod(shape) < 1000: + return constant(value, shape=shape, dtype=dtype, name=name) + except TypeError: + # Happens when shape is a Tensor, list with Tensor elements, etc. + +From 86cbf87703876330b5818b7f170489356d9d2c86 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:34:12 +0200 +Subject: [PATCH 2/7] relax upper bounds for NumPy and SciPy in pip installs + +--- + .../tools/pip_package/setup_with_binary.py | 2 +- + .../install/install_centos_pip_packages.sh | 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/pip_package/setup.py | 2 +- + 7 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +index 6b9fe534bb2b1..ae06df8245521 100644 +--- a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +@@ -67,5 +67,5 @@ + package_dir={'': '.'}, + package_data={'': ['*.so', '*.pyd']}, + install_requires=[ +-'numpy ~= 1.19.2', # Higher versions have a compatibility issue. ++'numpy >= 1.19.2 , <1.21', + ]) +diff --git a/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh b/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh +index b9906b9378c79..ab0a766bf22b0 100755 +--- 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.16.0 + + pip2 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 ++pip3 install scipy>=1.4.1 + + pip2 install scikit-learn==0.18.1 + pip3 install scikit-learn==0.18.1 + + # pandas required by `inflow` + pip2 install pandas==0.19.2 +-pip3 install pandas==0.19.2 ++pip3 install pandas>=0.19.2 + + # Benchmark tests require the following: + pip2 install psutil +diff --git
[arch-commits] Commit in tensorflow/repos (7 files)
Date: Friday, September 10, 2021 @ 16:24:57 Author: kgizdov Revision: 1013601 archrelease: copy trunk to community-testing-x86_64 Added: tensorflow/repos/community-testing-x86_64/ tensorflow/repos/community-testing-x86_64/48935.patch (from rev 1013600, tensorflow/trunk/48935.patch) tensorflow/repos/community-testing-x86_64/PKGBUILD (from rev 1013600, tensorflow/trunk/PKGBUILD) tensorflow/repos/community-testing-x86_64/build-against-actual-mkl.patch (from rev 1013600, tensorflow/trunk/build-against-actual-mkl.patch) tensorflow/repos/community-testing-x86_64/fix-c++17-compat.patch (from rev 1013600, tensorflow/trunk/fix-c++17-compat.patch) tensorflow/repos/community-testing-x86_64/openssl-1.1.patch (from rev 1013600, tensorflow/trunk/openssl-1.1.patch) tensorflow/repos/community-testing-x86_64/test.py (from rev 1013600, tensorflow/trunk/test.py) + 48935.patch| 353 +++ PKGBUILD | 327 build-against-actual-mkl.patch | 37 fix-c++17-compat.patch | 11 + openssl-1.1.patch | 24 ++ test.py| 12 + 6 files changed, 764 insertions(+) Copied: tensorflow/repos/community-testing-x86_64/48935.patch (from rev 1013600, tensorflow/trunk/48935.patch) === --- community-testing-x86_64/48935.patch(rev 0) +++ community-testing-x86_64/48935.patch2021-09-10 16:24:57 UTC (rev 1013601) @@ -0,0 +1,353 @@ +From 0f8fde42d09b199d02cf5d9d79fe76ebf1d260ef Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:13:40 +0200 +Subject: [PATCH 1/7] Fix NumPy 1.20 error with np.prod() + +Reference: #47691, https://stackoverflow.com/questions/66373169 +--- + tensorflow/python/ops/array_ops.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +index 519f2ef26fcef..d143ee96a2fc9 100644 +--- a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +@@ -36,6 +36,7 @@ + from tensorflow.python.framework.constant_op import constant + from tensorflow.python.ops import gen_array_ops + from tensorflow.python.ops import gen_math_ops ++from tensorflow.python.ops import math_ops + # go/tf-wildcard-import + # pylint: disable=wildcard-import + from tensorflow.python.ops.gen_array_ops import * +@@ -2894,7 +2895,7 @@ def matrix_set_diag( + + def _constant_if_small(value, shape, dtype, name): + try: +-if np.prod(shape) < 1000: ++if math_ops.reduce_prod(shape) < 1000: + return constant(value, shape=shape, dtype=dtype, name=name) + except TypeError: + # Happens when shape is a Tensor, list with Tensor elements, etc. + +From 86cbf87703876330b5818b7f170489356d9d2c86 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:34:12 +0200 +Subject: [PATCH 2/7] relax upper bounds for NumPy and SciPy in pip installs + +--- + .../tools/pip_package/setup_with_binary.py | 2 +- + .../install/install_centos_pip_packages.sh | 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/pip_package/setup.py | 2 +- + 7 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +index 6b9fe534bb2b1..ae06df8245521 100644 +--- a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +@@ -67,5 +67,5 @@ + package_dir={'': '.'}, + package_data={'': ['*.so', '*.pyd']}, + install_requires=[ +-'numpy ~= 1.19.2', # Higher versions have a compatibility issue. ++'numpy >= 1.19.2 , <1.21', + ]) +diff --git a/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh b/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh +index b9906b9378c79..ab0a766bf22b0 100755 +--- 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.16.0 + + pip2 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 ++pip3 install scipy>=1.4.1 + + pip2 install scikit-learn==0.18.1 + pip3 install scikit-learn==0.18.1 + + # pandas required by `inflow` + pip2 install pandas==0.19.2 +-pip3 install pandas==0.19.2 ++pip3 install pandas>=0.19.2 + + # Benchmark tests require the following: + pip2 install psutil +diff --git
[arch-commits] Commit in tensorflow/repos (7 files)
Date: Tuesday, August 17, 2021 @ 00:38:41 Author: kgizdov Revision: 1001100 archrelease: copy trunk to community-testing-x86_64 Added: tensorflow/repos/community-testing-x86_64/ tensorflow/repos/community-testing-x86_64/48935.patch (from rev 1001099, tensorflow/trunk/48935.patch) tensorflow/repos/community-testing-x86_64/PKGBUILD (from rev 1001099, tensorflow/trunk/PKGBUILD) tensorflow/repos/community-testing-x86_64/build-against-actual-mkl.patch (from rev 1001099, tensorflow/trunk/build-against-actual-mkl.patch) tensorflow/repos/community-testing-x86_64/fix-c++17-compat.patch (from rev 1001099, tensorflow/trunk/fix-c++17-compat.patch) tensorflow/repos/community-testing-x86_64/openssl-1.1.patch (from rev 1001099, tensorflow/trunk/openssl-1.1.patch) tensorflow/repos/community-testing-x86_64/test.py (from rev 1001099, tensorflow/trunk/test.py) + 48935.patch| 353 +++ PKGBUILD | 327 build-against-actual-mkl.patch | 37 fix-c++17-compat.patch | 11 + openssl-1.1.patch | 24 ++ test.py| 12 + 6 files changed, 764 insertions(+) Copied: tensorflow/repos/community-testing-x86_64/48935.patch (from rev 1001099, tensorflow/trunk/48935.patch) === --- community-testing-x86_64/48935.patch(rev 0) +++ community-testing-x86_64/48935.patch2021-08-17 00:38:41 UTC (rev 1001100) @@ -0,0 +1,353 @@ +From 0f8fde42d09b199d02cf5d9d79fe76ebf1d260ef Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:13:40 +0200 +Subject: [PATCH 1/7] Fix NumPy 1.20 error with np.prod() + +Reference: #47691, https://stackoverflow.com/questions/66373169 +--- + tensorflow/python/ops/array_ops.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +index 519f2ef26fcef..d143ee96a2fc9 100644 +--- a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py +@@ -36,6 +36,7 @@ + from tensorflow.python.framework.constant_op import constant + from tensorflow.python.ops import gen_array_ops + from tensorflow.python.ops import gen_math_ops ++from tensorflow.python.ops import math_ops + # go/tf-wildcard-import + # pylint: disable=wildcard-import + from tensorflow.python.ops.gen_array_ops import * +@@ -2894,7 +2895,7 @@ def matrix_set_diag( + + def _constant_if_small(value, shape, dtype, name): + try: +-if np.prod(shape) < 1000: ++if math_ops.reduce_prod(shape) < 1000: + return constant(value, shape=shape, dtype=dtype, name=name) + except TypeError: + # Happens when shape is a Tensor, list with Tensor elements, etc. + +From 86cbf87703876330b5818b7f170489356d9d2c86 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Thu, 6 May 2021 12:34:12 +0200 +Subject: [PATCH 2/7] relax upper bounds for NumPy and SciPy in pip installs + +--- + .../tools/pip_package/setup_with_binary.py | 2 +- + .../install/install_centos_pip_packages.sh | 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/pip_package/setup.py | 2 +- + 7 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +index 6b9fe534bb2b1..ae06df8245521 100644 +--- a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py +@@ -67,5 +67,5 @@ + package_dir={'': '.'}, + package_data={'': ['*.so', '*.pyd']}, + install_requires=[ +-'numpy ~= 1.19.2', # Higher versions have a compatibility issue. ++'numpy >= 1.19.2 , <1.21', + ]) +diff --git a/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh b/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh +index b9906b9378c79..ab0a766bf22b0 100755 +--- 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.16.0 + + pip2 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 ++pip3 install scipy>=1.4.1 + + pip2 install scikit-learn==0.18.1 + pip3 install scikit-learn==0.18.1 + + # pandas required by `inflow` + pip2 install pandas==0.19.2 +-pip3 install pandas==0.19.2 ++pip3 install pandas>=0.19.2 + + # Benchmark tests require the following: + pip2 install psutil +diff --git