change upstream to ROCmSoftwarePlatform/tensorflow-upstream

+ update to 2.9.2
+ use branch+commit from docker.io/rocm/tensorflow@lastest at 2022-08-03

3 files changed, 59 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c95510b56161..8135b084c94a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tensorflow-rocm
 	pkgdesc = Library for computation using data flow graphs for scalable machine learning
-	pkgver = 2.9.1
+	pkgver = 2.9.2
 	pkgrel = 1
 	url = https://www.tensorflow.org/
 	arch = x86_64
@@ -30,12 +30,12 @@ pkgbase = tensorflow-rocm
 	depends = icu
 	depends = libjpeg-turbo
 	optdepends = tensorboard: Tensorflow visualization toolkit
-	source = tensorflow-rocm-2.9.1.tar.gz::https://github.com/tensorflow/tensorflow/archive/v2.9.1.tar.gz
+	source = tensorflow-rocm-2.9.2.tar.gz::https://github.com/ROCmSoftwarePlatform/tensorflow-upstream/archive/4f7f7b9d6489de80eb81572ecc188af299e9e495.tar.gz
 	source = fix-c++17-compat.patch
-	source = rocblas-version.patch::https://github.com/tensorflow/tensorflow/commit/dc68efe693cb58e8d34ee62179cdaad7ce7487a7.patch
-	sha512sums = 95ffbee1e50e396065c6f1802fd9668344c45c000e22da859bcd08ec217bcc0a8ff0e84661fdf511f210e8b09d7ae6d26c3fc1ddcf28b8aedf87c0fb1b8b60e4
+	source = fix-rocblas-include.patch
+	sha512sums = a0a900ae5134ee8b3e896cd30b87b340c96ffad9cef98b960f3d555b455a4a0c2119249a3d318771d37a73438bc3ab02e03130c0f03594bc449f25c9c3cb6897
 	sha512sums = f682368bb47b2b022a51aa77345dfa30f3b0d7911c56515d428b8326ee3751242f375f4e715a37bb723ef20a86916dad9871c3c81b1b58da85e1ca202bc4901e
-	sha512sums = SKIP
+	sha512sums = de7ffe73ee3de04f4534bff0b090081179e0ec367754a25ed7a1facbbc34b7bf64e6011c0ea5c2f5746f2c4efd8e37af4c88f8d22c6f50c7a18ebe7f0316f518
 
 pkgname = tensorflow-rocm
 	pkgdesc = Library for computation using data flow graphs for scalable machine learning (with ROCM)
diff --git a/PKGBUILD b/PKGBUILD
index 74e57554bd3e..dad8ee5d3e08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,6 +3,7 @@
 # Contributor: Konstantin Gizdov (kgizdov) <arch@kge.pw>
 # Contributor: Adria Arrufat (archdria) <adria.arrufat+AUR@protonmail.ch>
 # Contributor: Thibault Lorrain (fredszaq) <fredszaq@gmail.com>
+# Contributor: wuxxin <wuxxin@gmail.com>
 
 pkgbase=tensorflow-rocm
 
@@ -14,8 +15,12 @@ pkgname=()
 [ "$_build_no_opt" -eq 1 ] && pkgname+=(tensorflow-rocm python-tensorflow-rocm)
 [ "$_build_opt" -eq 1 ] && pkgname+=(tensorflow-opt-rocm python-tensorflow-opt-rocm)
 
-pkgver=2.9.1
-_pkgver=2.9.1
+# use ROCm fork of tensorflow: https://github.com/ROCmSoftwarePlatform/tensorflow-upstream
+# take branch+commit from docker.io/rocm/tensorflow@lastest Dockerfile
+_id="4f7f7b9d6489de80eb81572ecc188af299e9e495"
+_srcname="tensorflow-upstream-$_id"
+_pkgver=2.9.2
+pkgver=2.9.2
 pkgrel=1
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
@@ -27,13 +32,13 @@ makedepends=('bazel' 'python-numpy' 'rocm-hip-sdk' 'miopen' 'rccl' 'git'
              'python-keras-applications' 'python-keras-preprocessing'
              'cython')
 optdepends=('tensorboard: Tensorflow visualization toolkit')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz"
-        fix-c++17-compat.patch
-        "rocblas-version.patch::https://github.com/tensorflow/tensorflow/commit/dc68efe693cb58e8d34ee62179cdaad7ce7487a7.patch")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/ROCmSoftwarePlatform/tensorflow-upstream/archive/$_id.tar.gz"
+        "fix-c++17-compat.patch"
+        "fix-rocblas-include.patch")
 
-sha512sums=('95ffbee1e50e396065c6f1802fd9668344c45c000e22da859bcd08ec217bcc0a8ff0e84661fdf511f210e8b09d7ae6d26c3fc1ddcf28b8aedf87c0fb1b8b60e4'
+sha512sums=('a0a900ae5134ee8b3e896cd30b87b340c96ffad9cef98b960f3d555b455a4a0c2119249a3d318771d37a73438bc3ab02e03130c0f03594bc449f25c9c3cb6897'
             'f682368bb47b2b022a51aa77345dfa30f3b0d7911c56515d428b8326ee3751242f375f4e715a37bb723ef20a86916dad9871c3c81b1b58da85e1ca202bc4901e'
-            'SKIP')
+            'de7ffe73ee3de04f4534bff0b090081179e0ec367754a25ed7a1facbbc34b7bf64e6011c0ea5c2f5746f2c4efd8e37af4c88f8d22c6f50c7a18ebe7f0316f518')
 
 # consolidate common dependencies to prevent mishaps
 _common_py_depends=(python-termcolor python-astor python-gast03 python-numpy python-protobuf
@@ -68,18 +73,18 @@ check_dir() {
 
 prepare() {
   # Allow any bazel version
-  echo "*" > tensorflow-${_pkgver}/.bazelversion
+  echo "*" > $_srcname/.bazelversion
 
   # Get rid of hardcoded versions. Not like we ever cared about what upstream
   # thinks about which versions should be used anyway. ;) (FS#68772)
-  sed -i -E "s/'([0-9a-z_-]+) .= [0-9].+[0-9]'/'\1'/" tensorflow-${_pkgver}/tensorflow/tools/pip_package/setup.py
+  sed -i -E "s/'([0-9a-z_-]+) .= [0-9].+[0-9]'/'\1'/" $_srcname/tensorflow/tools/pip_package/setup.py
 
-  cd "${srcdir}/tensorflow-${_pkgver}"
-  patch -Np1 -i "${srcdir}/rocblas-version.patch"
+  cd "${srcdir}/$_srcname"
+  patch -Np1 -i "${srcdir}/fix-rocblas-include.patch"
   cd "${srcdir}"
 
-  cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-rocm
-  cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt-rocm
+  cp -r $_srcname tensorflow-${_pkgver}-rocm
+  cp -r $_srcname tensorflow-${_pkgver}-opt-rocm
 
   # These environment variables influence the behavior of the configure call below.
   export PYTHON_BIN_PATH=/usr/bin/python
diff --git a/fix-rocblas-include.patch b/fix-rocblas-include.patch
new file mode 100644
index 000000000000..38801faff8bd
--- /dev/null
+++ b/fix-rocblas-include.patch
@@ -0,0 +1,36 @@
+diff -r -u a/tensorflow/core/util/gpu_solvers.h b/tensorflow/core/util/gpu_solvers.h
+--- a/tensorflow/core/util/gpu_solvers.h	2022-08-13 22:09:50.429250747 +0200
++++ b/tensorflow/core/util/gpu_solvers.h	2022-08-13 23:39:06.336527162 +0200
+@@ -33,7 +33,7 @@
+ #else
+ #include "rocm/rocm_config.h"
+ #include "rocm/include/hip/hip_complex.h"
+-#include "rocm/include/rocblas.h"
++#include "rocm/include/rocblas/rocblas.h"
+ #include "tensorflow/stream_executor/blas.h"
+ #if TF_ROCM_VERSION >= 40500
+ #include "tensorflow/stream_executor/rocm/hipsolver_wrapper.h"
+diff -r -u a/tensorflow/stream_executor/rocm/rocblas_wrapper.h b/tensorflow/stream_executor/rocm/rocblas_wrapper.h
+--- a/tensorflow/stream_executor/rocm/rocblas_wrapper.h	2022-08-13 22:09:50.769248881 +0200
++++ b/tensorflow/stream_executor/rocm/rocblas_wrapper.h	2022-08-13 23:39:06.339860477 +0200
+@@ -20,7 +20,7 @@
+ #ifndef TENSORFLOW_STREAM_EXECUTOR_ROCM_ROCBLAS_WRAPPER_H_
+ #define TENSORFLOW_STREAM_EXECUTOR_ROCM_ROCBLAS_WRAPPER_H_
+ 
+-#include "rocm/include/rocblas.h"
++#include "rocm/include/rocblas/rocblas.h"
+ #include "tensorflow/stream_executor/gpu/gpu_activation.h"
+ #include "tensorflow/stream_executor/lib/env.h"
+ #include "tensorflow/stream_executor/platform/dso_loader.h"
+diff -r -u a/tensorflow/stream_executor/rocm/rocm_blas.h b/tensorflow/stream_executor/rocm/rocm_blas.h
+--- a/tensorflow/stream_executor/rocm/rocm_blas.h	2022-08-13 22:09:50.769248881 +0200
++++ b/tensorflow/stream_executor/rocm/rocm_blas.h	2022-08-13 23:39:06.339860477 +0200
+@@ -21,7 +21,7 @@
+ #define TENSORFLOW_STREAM_EXECUTOR_ROCM_ROCM_BLAS_H_
+ 
+ #include "absl/synchronization/mutex.h"
+-#include "rocm/include/rocblas.h"
++#include "rocm/include/rocblas/rocblas.h"
+ #include "tensorflow/core/platform/thread_annotations.h"
+ #include "tensorflow/stream_executor/blas.h"
+ #include "tensorflow/stream_executor/platform/port.h"