add patch to fix hipcc path

3 files changed, 13 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b32a59d27a47..7f8419171b1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tensorflow-rocm
 	pkgdesc = Library for computation using data flow graphs for scalable machine learning
 	pkgver = 2.3.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.tensorflow.org/
 	arch = x86_64
 	license = APACHE
@@ -26,11 +26,13 @@ pkgbase = tensorflow-rocm
 	source = tensorflow-rocm-2.3.0.tar.gz::https://github.com/tensorflow/tensorflow/archive/v2.3.0.tar.gz
 	source = numpy1.20.patch::https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch
 	source = build-against-actual-mkl.patch
-	source = fix_hip_hcc_path.patch
+	source = fix_hip_hcc_path.patch::https://github.com/tensorflow/tensorflow/commit/6175b78d8386bd6e5b2beebedb9f40e6b887d5a9.patch
+	source = fix_hipcc_path.patch::https://patch-diff.githubusercontent.com/raw/tensorflow/tensorflow/pull/42292.patch
 	sha512sums = 86aa087ea84dac1ecc1023b23a378100d41cc6778ccd20404a4b955fc67cef11b3dc08abcc5b88020124d221e6fb172b33bd5206e9c9db6bc8fbeed399917eac
 	sha512sums = df2e0373e2f63b8766f31933f7db57f6a7559b8f03af1db51644fba87731451a7cd3895529a3192e5394612fcb42f245b794b1c9ca3c05881ca03a547c8c9acc
 	sha512sums = e51e3f3dced121db3a09fbdaefd33555536095584b72a5eb6f302fa6fa68ab56ea45e8a847ec90ff4ba076db312c06f91ff672e08e95263c658526582494ce08
-	sha512sums = 2ee01810efb836a746bb46376f1a0463019ff3433c2761fa82bbcf8dc805a07225a8626e7eb2a302b95f244d2d037e1795bc50194ac41f26c456fc6293ca8a74
+	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = tensorflow-rocm
 	pkgdesc = Library for computation using data flow graphs for scalable machine learning (with ROCM)
diff --git a/PKGBUILD b/PKGBUILD
index e56bd17e2cfd..4930c0669d70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=tensorflow-rocm
 pkgname=(tensorflow-rocm tensorflow-opt-rocm python-tensorflow-rocm python-tensorflow-opt-rocm)
 pkgver=2.3.0
 _pkgver=2.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')
@@ -21,11 +21,13 @@ optdepends=('tensorboard: Tensorflow visualization toolkit')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz"
         numpy1.20.patch::https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch
         build-against-actual-mkl.patch
-        fix_hip_hcc_path.patch)
+        "fix_hip_hcc_path.patch"::"https://github.com/tensorflow/tensorflow/commit/6175b78d8386bd6e5b2beebedb9f40e6b887d5a9.patch"
+        "fix_hipcc_path.patch"::"https://patch-diff.githubusercontent.com/raw/tensorflow/tensorflow/pull/42292.patch")
 sha512sums=('86aa087ea84dac1ecc1023b23a378100d41cc6778ccd20404a4b955fc67cef11b3dc08abcc5b88020124d221e6fb172b33bd5206e9c9db6bc8fbeed399917eac'
             'df2e0373e2f63b8766f31933f7db57f6a7559b8f03af1db51644fba87731451a7cd3895529a3192e5394612fcb42f245b794b1c9ca3c05881ca03a547c8c9acc'
             'e51e3f3dced121db3a09fbdaefd33555536095584b72a5eb6f302fa6fa68ab56ea45e8a847ec90ff4ba076db312c06f91ff672e08e95263c658526582494ce08'
-            '2ee01810efb836a746bb46376f1a0463019ff3433c2761fa82bbcf8dc805a07225a8626e7eb2a302b95f244d2d037e1795bc50194ac41f26c456fc6293ca8a74')
+            'SKIP'
+            'SKIP')
 
 get_pyver () {
   python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
@@ -57,6 +59,9 @@ prepare() {
   # Fix hip_hcc path
   patch -Np1 -d tensorflow-${_pkgver} -i "$srcdir"/fix_hip_hcc_path.patch
 
+  # Fix hip_hcc path
+  patch -Np1 -d tensorflow-${_pkgver} -i "$srcdir"/fix_hipcc_path.patch
+
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-rocm
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt-rocm
 
diff --git a/fix_hip_hcc_path.patch b/fix_hip_hcc_path.patch
deleted file mode 100644
index 8f1a3d80288d..000000000000
--- a/fix_hip_hcc_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/gpus/rocm_configure.bzl b/third_party/gpus/rocm_configure.bzl
-index 24829eb..4cfec24 100644
---- a/third_party/gpus/rocm_configure.bzl
-+++ b/third_party/gpus/rocm_configure.bzl
-@@ -440,7 +440,7 @@ def _find_libs(repository_ctx, rocm_config, bash_bin):
-     libs_paths = [
-         (name, _rocm_lib_paths(repository_ctx, name, path))
-         for name, path in [
--            ("hip_hcc", rocm_config.rocm_toolkit_path),
-+            ("hip_hcc", rocm_config.rocm_toolkit_path + "/hip"),
-             ("rocblas", rocm_config.rocm_toolkit_path + "/rocblas"),
-             ("rocfft", rocm_config.rocm_toolkit_path + "/rocfft"),
-             ("hiprand", rocm_config.rocm_toolkit_path + "/hiprand"),