Python 3.8 fix. Hopefully it should still work with the new computecpp.

I also tried to skip the "zip and unzip" stupid step, copying some line from build_pip_package.sh and with some wheel-fu.. But only pip at install time seems able to handle entry_points.txt for scripts

3 files changed, 49 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 995677b4c985..175f8ecc71ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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 = 5
+	pkgrel = 6
 	epoch = 1
 	url = https://github.com/codeplaysoftware/tensorflow
 	arch = x86_64
@@ -26,6 +26,7 @@ pkgbase = tensorflow-computecpp
 	source = gcc1.diff
 	source = gcc2.diff
 	source = gcc3.diff
+	source = python38.patch
 	sha256sums = SKIP
 	sha256sums = 758e10caff4c1cb496d1cf49d6f4da2969b610b174276fb734b8502686d07ddd
 	sha256sums = ef54b3783a05b5604cd8f448136567686806ad3a5759978f48549256807a8394
@@ -33,6 +34,7 @@ pkgbase = tensorflow-computecpp
 	sha256sums = 7d9f32a46cac83ec1a7308ac380226cdf40f98830c869bcdf5feb7bf110abf9a
 	sha256sums = 10de738141852cfebae9847b746ae9b58f3b3985561cccede929d8fbdba93551
 	sha256sums = 742abe5d8bfd3f7ce33778a08cbb233337db56238d11ac2ad07171b0d6097bfb
+	sha256sums = b69895cfd098efacc95b1d1fffd471afa05c449f8d42964ee10b1a6fd9a75689
 
 pkgname = tensorflow-computecpp
 	provides = tensorflow
diff --git a/PKGBUILD b/PKGBUILD
index 0d715683455a..15891bf404e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=tensorflow-computecpp
 pkgname=(tensorflow-computecpp python-tensorflow-computecpp)
 pkgver=1.9
-pkgrel=5
+pkgrel=6
 pkgdesc="Library for computation using data flow graphs for scalable machine learning (backend with ComputeCpp)"
 url="https://github.com/codeplaysoftware/tensorflow"
 epoch=1
@@ -20,14 +20,16 @@ source=("git+${url}"
          py37.diff
          gcc1.diff
          gcc2.diff
-         gcc3.diff)
+         gcc3.diff
+         python38.patch)
 sha256sums=('SKIP'
             '758e10caff4c1cb496d1cf49d6f4da2969b610b174276fb734b8502686d07ddd'
             'ef54b3783a05b5604cd8f448136567686806ad3a5759978f48549256807a8394'
             'b3997091bc7a32f9e8c062a88e9148273090ebf66aeebb5dc055baa41b7aae7e'
             '7d9f32a46cac83ec1a7308ac380226cdf40f98830c869bcdf5feb7bf110abf9a'
             '10de738141852cfebae9847b746ae9b58f3b3985561cccede929d8fbdba93551'
-            '742abe5d8bfd3f7ce33778a08cbb233337db56238d11ac2ad07171b0d6097bfb')
+            '742abe5d8bfd3f7ce33778a08cbb233337db56238d11ac2ad07171b0d6097bfb'
+            'b69895cfd098efacc95b1d1fffd471afa05c449f8d42964ee10b1a6fd9a75689')
 
 prepare() {
   # These environment variables influence the behavior of the configure call below.
@@ -68,6 +70,7 @@ prepare() {
   git apply --index --whitespace=nowarn ../gcc1.diff
   git apply --index --whitespace=nowarn ../gcc2.diff
   git apply --index --whitespace=nowarn ../gcc3.diff
+  git apply --index ../python38.patch
 }
 
 build() {
@@ -83,7 +86,7 @@ build() {
     ./configure
   fi
 
-# Please take notice this requires at least 7GB of swap/disk space and 0.8+(3.2*threads)GB of RAM to 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
diff --git a/python38.patch b/python38.patch
new file mode 100644
index 000000000000..0d32ef2f8e00
--- /dev/null
+++ b/python38.patch
@@ -0,0 +1,39 @@
+diff --git a/tensorflow/python/eager/pywrap_tfe_src.cc b/tensorflow/python/eager/pywrap_tfe_src.cc
+index 6c9481c3af..eb61a962ff 100644
+--- a/tensorflow/python/eager/pywrap_tfe_src.cc
++++ b/tensorflow/python/eager/pywrap_tfe_src.cc
+@@ -956,7 +956,7 @@ static PyTypeObject TFE_Py_Tape_Type = {
+     sizeof(TFE_Py_Tape),                          /* tp_basicsize */
+     0,                                            /* tp_itemsize */
+     &TFE_Py_Tape_Delete,                          /* tp_dealloc */
+-    nullptr,                                      /* tp_print */
++    0,                                            /* tp_print */
+     nullptr,                                      /* tp_getattr */
+     nullptr,                                      /* tp_setattr */
+     nullptr,                                      /* tp_reserved */
+diff --git a/tensorflow/python/lib/core/bfloat16.cc b/tensorflow/python/lib/core/bfloat16.cc
+index 77fa2c1f66..28308e0cff 100644
+--- a/tensorflow/python/lib/core/bfloat16.cc
++++ b/tensorflow/python/lib/core/bfloat16.cc
+@@ -317,7 +317,7 @@ PyTypeObject PyBfloat16_Type = {
+     sizeof(PyBfloat16),                        // tp_basicsize
+     0,                                         // tp_itemsize
+     nullptr,                                   // tp_dealloc
+-    nullptr,                                   // tp_print
++    0,                                         // tp_print
+     nullptr,                                   // tp_getattr
+     nullptr,                                   // tp_setattr
+     nullptr,                                   // tp_compare / tp_reserved
+diff --git a/tensorflow/python/lib/core/ndarray_tensor_bridge.cc b/tensorflow/python/lib/core/ndarray_tensor_bridge.cc
+index 0d5838505f..95bfe24dde 100644
+--- a/tensorflow/python/lib/core/ndarray_tensor_bridge.cc
++++ b/tensorflow/python/lib/core/ndarray_tensor_bridge.cc
+@@ -86,7 +86,7 @@ PyTypeObject TensorReleaserType = {
+     0,                                /* tp_itemsize */
+     /* methods */
+     TensorReleaser_dealloc,      /* tp_dealloc */
+-    nullptr,                     /* tp_print */
++    0,                           /* tp_print */
+     nullptr,                     /* tp_getattr */
+     nullptr,                     /* tp_setattr */
+     nullptr,                     /* tp_compare */