diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 40 | ||||
| -rw-r--r-- | python310.diff | 13 | ||||
| -rw-r--r-- | python310or.patch | 34 |
4 files changed, 73 insertions, 20 deletions
@@ -1,7 +1,7 @@ pkgbase = tensorflow-computecpp pkgdesc = Library for computation using data flow graphs for scalable machine learning (backend with ComputeCpp) pkgver = 1.9 - pkgrel = 7 + pkgrel = 8 epoch = 1 url = https://github.com/codeplaysoftware/tensorflow arch = x86_64 @@ -30,6 +30,7 @@ pkgbase = tensorflow-computecpp source = gcc10.patch source = numpy.diff source = python310.diff + source = python310or.patch sha256sums = SKIP sha256sums = 758e10caff4c1cb496d1cf49d6f4da2969b610b174276fb734b8502686d07ddd sha256sums = ef54b3783a05b5604cd8f448136567686806ad3a5759978f48549256807a8394 @@ -40,7 +41,8 @@ pkgbase = tensorflow-computecpp sha256sums = b69895cfd098efacc95b1d1fffd471afa05c449f8d42964ee10b1a6fd9a75689 sha256sums = 15c20b31394537051f8756707819e13f3c12da24d8aa63d3ba47e6fce4d19d95 sha256sums = fe4c34a66000ba3a24d7c35914dc22e95adb5efa60a58d1f0b3d3cad77fd722d - sha256sums = fd3796ac670c4ee59c5cdc6969b2a58761d04d806bac4ba3911dcf74d894be42 + sha256sums = 16bbc9d5cfd7e3888a7bda73ac4ebaab5c9c2588632eac342917f7cec745db9a + sha256sums = 7fe63476cb7b2dfe359f8ae3d894869f2329c399c6611a52449cd5dcd6f67098 pkgname = tensorflow-computecpp provides = tensorflow @@ -3,7 +3,7 @@ pkgbase=tensorflow-computecpp pkgname=(tensorflow-computecpp python-tensorflow-computecpp) pkgver=1.9 -pkgrel=7 +pkgrel=8 pkgdesc="Library for computation using data flow graphs for scalable machine learning (backend with ComputeCpp)" url="https://github.com/codeplaysoftware/tensorflow" epoch=1 @@ -24,7 +24,8 @@ source=("git+${url}" python38.patch gcc10.patch numpy.diff - python310.diff) + python310.diff + python310or.patch) sha256sums=('SKIP' '758e10caff4c1cb496d1cf49d6f4da2969b610b174276fb734b8502686d07ddd' 'ef54b3783a05b5604cd8f448136567686806ad3a5759978f48549256807a8394' @@ -35,7 +36,8 @@ sha256sums=('SKIP' 'b69895cfd098efacc95b1d1fffd471afa05c449f8d42964ee10b1a6fd9a75689' '15c20b31394537051f8756707819e13f3c12da24d8aa63d3ba47e6fce4d19d95' 'fe4c34a66000ba3a24d7c35914dc22e95adb5efa60a58d1f0b3d3cad77fd722d' - 'fd3796ac670c4ee59c5cdc6969b2a58761d04d806bac4ba3911dcf74d894be42') + '16bbc9d5cfd7e3888a7bda73ac4ebaab5c9c2588632eac342917f7cec745db9a' + '7fe63476cb7b2dfe359f8ae3d894869f2329c399c6611a52449cd5dcd6f67098') prepare() { # These environment variables influence the behavior of the configure call below. @@ -70,7 +72,7 @@ prepare() { export HTTP_PROXY=`echo $http_proxy | sed -e 's/\/$//'` export HTTPS_PROXY=`echo $https_proxy | sed -e 's/\/$//'` - cd ${srcdir}/tensorflow + cd "${srcdir}"/tensorflow git apply --index ../python37.patch git apply --index --whitespace=nowarn ../py37.diff git apply --index --whitespace=nowarn ../gcc1.diff @@ -80,17 +82,19 @@ prepare() { git apply --index ../gcc10.patch git apply --index ../numpy.diff git apply --index ../python310.diff + git apply --index ../python310or.patch } build() { # Build bazel echo "Please note: currently, bazel version <0.18 is required to build this package." echo "Fixing that for you" # "Building it temporarily..." + echo "Make sure there are no spaces in PATH" cd "$srcdir" # ./compile.sh - export PATH=`pwd`/usr/bin:$PATH + export PATH="${srcdir}/usr/bin:$PATH" - cd ${srcdir}/tensorflow + cd "${srcdir}"/tensorflow if [ ! -f .bazelrc ]; then # configure should be in prepare, but bazel has to be built first atm ./configure fi @@ -98,21 +102,21 @@ build() { # Please take notice this requires at least 8GB of swap/disk space and 0.7+(3.2*threads)GB of RAM to build bazel build -c opt --config=sycl //tensorflow:libtensorflow.so \ //tensorflow/tools/pip_package:build_pip_package # --jobs 1 --verbose_failures - bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmp + bazel-bin/tensorflow/tools/pip_package/build_pip_package "${srcdir}"/tmp } package_tensorflow-computecpp() { conflicts=(tensorflow) provides=(tensorflow) - cd ${srcdir}/tensorflow + cd "${srcdir}"/tensorflow tensorflow/c/generate-pc.sh --prefix=/usr --version=${pkgver} - install -Dm644 tensorflow.pc ${pkgdir}/usr/lib/pkgconfig/tensorflow.pc - install -Dm755 bazel-bin/tensorflow/libtensorflow.so ${pkgdir}/usr/lib/libtensorflow.so - install -Dm755 bazel-bin/tensorflow/libtensorflow_framework.so ${pkgdir}/usr/lib/libtensorflow_framework.so - install -Dm644 tensorflow/c/c_api.h ${pkgdir}/usr/include/tensorflow/c/c_api.h - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 tensorflow.pc "${pkgdir}"/usr/lib/pkgconfig/tensorflow.pc + install -Dm755 bazel-bin/tensorflow/libtensorflow.so "${pkgdir}"/usr/lib/libtensorflow.so + install -Dm755 bazel-bin/tensorflow/libtensorflow_framework.so "${pkgdir}"/usr/lib/libtensorflow_framework.so + install -Dm644 tensorflow/c/c_api.h "${pkgdir}"/usr/include/tensorflow/c/c_api.h + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } package_python-tensorflow-computecpp() { @@ -121,15 +125,15 @@ package_python-tensorflow-computecpp() { depends=(python-numpy python-protobuf absl-py) optdepends=('python-werkzeug: for using tensorboard') - cd ${srcdir}/tensorflow + cd "${srcdir}"/tensorflow - WHEEL_PACKAGE=$(find ${srcdir}/tmp -name "tensor*.whl") - pip install --ignore-installed --upgrade --root $pkgdir/ $WHEEL_PACKAGE --no-dependencies --no-warn-script-location + WHEEL_PACKAGE=$(find "${srcdir}"/tmp -name "tensor*.whl") + pip install --ignore-installed --upgrade --root "$pkgdir" $WHEEL_PACKAGE --no-dependencies --no-warn-script-location # tensorboard has been separated from upstream but they still install it with # tensorflow. I don't know what kind of sense that makes but we have to clean # it out from this pacakge. - rm -rf ${pkgdir}/usr/bin/tensorboard + rm -rf "${pkgdir}"/usr/bin/tensorboard - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/python310.diff b/python310.diff index 9876ac7df4c5..11a9ebdb2187 100644 --- a/python310.diff +++ b/python310.diff @@ -799,3 +799,16 @@ index a0e6bf65cf..4e80540560 100644 def _IsRepeatedContainer(value): +diff --git a/tensorflow/python/keras/callbacks.py b/tensorflow/python/keras/callbacks.py +index a6dbe2ba71..0dd9617a8e 100644 +--- a/tensorflow/python/keras/callbacks.py ++++ b/tensorflow/python/keras/callbacks.py +@@ -20,7 +20,7 @@ from __future__ import division + from __future__ import print_function + + from collections import deque +-from collections import Iterable ++from collections.abc import Iterable + from collections import OrderedDict + import csv + import json diff --git a/python310or.patch b/python310or.patch new file mode 100644 index 000000000000..da09be35bf4e --- /dev/null +++ b/python310or.patch @@ -0,0 +1,34 @@ +From 3bec74195ec5a242d8783fdfc718d45dc7210c4e Mon Sep 17 00:00:00 2001 +From: Dan Moldovan <mdan@google.com> +Date: Tue, 9 Jun 2020 07:40:08 -0700 +Subject: [PATCH] Remove a defensive check that prevented adding Generic as + superclass of Tensor. This is required to unblock #40132. + +PiperOrigin-RevId: 315481237 +Change-Id: Ia56c0087ab129499fe815b96ae83564e5a49df8f +--- + tensorflow/python/framework/ops.py | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py +index 8fee3057b8d12..efb1ebbdbc243 100644 +--- a/tensorflow/python/framework/ops.py ++++ b/tensorflow/python/framework/ops.py +@@ -183,16 +183,8 @@ def _override_helper(clazz_object, operator, func): + func: the function that replaces the overridden operator. + + Raises: +- ValueError: If operator has already been overwritten, +- or if operator is not allowed to be overwritten. ++ ValueError: If operator is not allowed to be overwritten. + """ +- existing = getattr(clazz_object, operator, None) +- if existing is not None: +- # Check to see if this is a default method-wrapper or slot wrapper which +- # will be true for the comparison operators. +- if not isinstance(existing, type(object.__lt__)): +- raise ValueError("operator %s cannot be overwritten again on class %s." % +- (operator, clazz_object)) + if operator not in Tensor.OVERLOADABLE_OPERATORS: + raise ValueError("Overriding %s is disallowed" % operator) + setattr(clazz_object, operator, func) |