correctly apply patches

4 files changed, 6 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd58aa898e10..eebb4a76f889 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -34,12 +34,10 @@ pkgbase = tensorflow-amd-git
 	source = tensorflow::git+https://github.com/ROCmSoftwarePlatform/tensorflow-upstream.git#branch=r2.10-rocm-enhanced
 	source = fix-c++17-compat.patch
 	source = fix-cusolver-version.patch
-	source = fix-rocblas-include.patch
 	source = remove-log-spam.patch
 	sha512sums = SKIP
 	sha512sums = e919b77f17c8508c21607a988e4451542900bb2a1453b55bff865e3b2602faebf4543bd640f60d84ac9b8d7b8599986f115077f7d411732fba3866cb5d6ad2e2
-	sha512sums = 98f882a29c35f484d8f57cff602d910664ca0fabedb51a978d6d826adff7fca9bf7be6f92988c8b72a0159b7f71b43646c6eb5a8adde4ef8687c291ed435292e
-	sha512sums = 4f88760a5e60c79ef29335eb511afef7f6b064f4b4820261f08c12f69d7ba1e3748fff480ee073d248b41aa56de642f69fa9e57ba106cd885ab47ca83d272353
+	sha512sums = fc263a0d0d318899914b26e8e06b3beb7c8e55118f5eb54c94fd97d8749151decfe6bf399130db43481d12908f4fdb58ff388acbcd90507d84f1d06d96f6019f
 	sha512sums = fde73feeb2bbb814ba229c2b879e5e5944fd658e9810937753a25f2650f57c49f8a435924b47a1a54eb2852f9713b19a15d42b307593e26a74ad65aeee22c36a
 
 pkgname = tensorflow-amd-git
diff --git a/PKGBUILD b/PKGBUILD
index 38648b9396d4..cf8d5a230516 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,13 +33,11 @@ optdepends=('tensorboard: Tensorflow visualization toolkit')
 source=("tensorflow::git+https://github.com/ROCmSoftwarePlatform/tensorflow-upstream.git#branch=r2.10-rocm-enhanced"
         fix-c++17-compat.patch
         fix-cusolver-version.patch
-        fix-rocblas-include.patch
         remove-log-spam.patch)
 
 sha512sums=('SKIP'
             'e919b77f17c8508c21607a988e4451542900bb2a1453b55bff865e3b2602faebf4543bd640f60d84ac9b8d7b8599986f115077f7d411732fba3866cb5d6ad2e2'
-            '98f882a29c35f484d8f57cff602d910664ca0fabedb51a978d6d826adff7fca9bf7be6f92988c8b72a0159b7f71b43646c6eb5a8adde4ef8687c291ed435292e'
-            '4f88760a5e60c79ef29335eb511afef7f6b064f4b4820261f08c12f69d7ba1e3748fff480ee073d248b41aa56de642f69fa9e57ba106cd885ab47ca83d272353'
+            'fc263a0d0d318899914b26e8e06b3beb7c8e55118f5eb54c94fd97d8749151decfe6bf399130db43481d12908f4fdb58ff388acbcd90507d84f1d06d96f6019f'
             'fde73feeb2bbb814ba229c2b879e5e5944fd658e9810937753a25f2650f57c49f8a435924b47a1a54eb2852f9713b19a15d42b307593e26a74ad65aeee22c36a')
 
 # consolidate common dependencies to prevent mishaps
@@ -87,6 +85,8 @@ prepare() {
   sed -i 's/rocblas.h"/rocblas\/rocblas.h"/g' tensorflow/core/util/gpu_solvers.h
   sed -i 's/rocm\/include\/rocblas.h"/rocblas\/rocblas.h"/g' tensorflow/stream_executor/rocm/rocblas_wrapper.h
 
+  patch -Np1 -i "${srcdir}/fix-cusolver-version.patch"
+  patch -Np1 -i "${srcdir}/remove-log-spam.patch"
   cd "${srcdir}"
 
   cp -r $_srcname tensorflow-amd-git
diff --git a/fix-cusolver-version.patch b/fix-cusolver-version.patch
index 74e691f31c62..39c39b0d39d9 100644
--- a/fix-cusolver-version.patch
+++ b/fix-cusolver-version.patch
@@ -1,7 +1,7 @@
 diff --color -aur tensorflow-2.9.1-old/third_party/gpus/cuda_configure.bzl tensorflow-2.9.1-new/third_party/gpus/cuda_configure.bzl
 --- tensorflow-2.9.1-old/third_party/gpus/cuda_configure.bzl	2022-08-22 14:03:54.439731148 +0300
 +++ tensorflow-2.9.1-new/third_party/gpus/cuda_configure.bzl	2022-08-22 14:07:09.479726331 +0300
-@@ -710,7 +716,7 @@
+@@ -715,7 +715,7 @@
          cuda_version_major = cuda_major,
          cudart_version = cudart_version,
          cublas_version = cublas_version,
@@ -9,4 +9,4 @@ diff --color -aur tensorflow-2.9.1-old/third_party/gpus/cuda_configure.bzl tenso
 +        cusolver_version = "11",
          curand_version = curand_version,
          cufft_version = cufft_version,
-         cusparse_version = cusparse_version,
\ No newline at end of file
+         cusparse_version = cusparse_version,
diff --git a/fix-rocblas-include.patch b/fix-rocblas-include.patch
deleted file mode 100644
index a4d513a4d08c..000000000000
--- a/fix-rocblas-include.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/tensorflow/stream_executor/rocm/rocblas_wrapper.h b/tensorflow/stream_executor/rocm/rocblas_wrapper.h
---- a/tensorflow/stream_executor/rocm/rocblas_wrapper.h	(revision 9685e1ca56f7ba1d31b84d3dda51d50c92b36ae7)
-+++ b/tensorflow/stream_executor/rocm/rocblas_wrapper.h	(date 1663176000544)
-@@ -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 --git a/tensorflow/stream_executor/rocm/rocm_blas.h b/tensorflow/stream_executor/rocm/rocm_blas.h
---- a/tensorflow/stream_executor/rocm/rocm_blas.h	(revision 9685e1ca56f7ba1d31b84d3dda51d50c92b36ae7)
-+++ b/tensorflow/stream_executor/rocm/rocm_blas.h	(date 1663175994438)
-@@ -22,7 +22,7 @@
- 
- #include "absl/base/thread_annotations.h"
- #include "absl/synchronization/mutex.h"
--#include "rocm/include/rocblas.h"
-+#include "rocm/include/rocblas/rocblas.h"
- #include "tensorflow/stream_executor/blas.h"
- #include "tensorflow/stream_executor/platform/port.h"
- #include "tensorflow/stream_executor/plugin_registry.h"
-diff --git a/tensorflow/core/util/gpu_solvers.h b/tensorflow/core/util/gpu_solvers.h
---- a/tensorflow/core/util/gpu_solvers.h	(revision 9685e1ca56f7ba1d31b84d3dda51d50c92b36ae7)
-+++ b/tensorflow/core/util/gpu_solvers.h	(date 1663176032850)
-@@ -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"