change upstream to ROCmSoftwarePlatform/tensorflow-upstream

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

2 files changed, 41 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 578ae51a07c0..9aa7b88a136f 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
 
@@ -69,11 +70,11 @@ 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
 
   # manually specify cusolver .so version
   patch -Np1 -i "${srcdir}/fix-cusolver-version.patch" -d tensorflow-${_pkgver}
@@ -87,8 +88,8 @@ prepare() {
 
   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"