updpkg 2.8.0

5 files changed, 29 insertions, 470 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 184e03c9589b..604558b4aa6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = tensorflow-rocm
 	pkgdesc = Library for computation using data flow graphs for scalable machine learning
-	pkgver = 2.6.0
-	pkgrel = 2
+	pkgver = 2.8.0
+	pkgrel = 1
 	url = https://www.tensorflow.org/
 	arch = x86_64
 	license = APACHE
 	makedepends = bazel
 	makedepends = python-numpy
-	makedepends = rocm
-	makedepends = rocm-libs
+	makedepends = rocm-hip-sdk
 	makedepends = miopen
 	makedepends = rccl
 	makedepends = git
@@ -23,7 +22,7 @@ pkgbase = tensorflow-rocm
 	depends = intel-mkl
 	depends = onednn
 	depends = pybind11
-	depends = openssl-1.0
+	depends = openssl
 	depends = lmdb
 	depends = libpng
 	depends = curl
@@ -31,16 +30,10 @@ pkgbase = tensorflow-rocm
 	depends = icu
 	depends = libjpeg-turbo
 	optdepends = tensorboard: Tensorflow visualization toolkit
-	source = tensorflow-rocm-2.6.0.tar.gz::https://github.com/tensorflow/tensorflow/archive/v2.6.0.tar.gz
-	source = 48935.patch
+	source = tensorflow-rocm-2.8.0.tar.gz::https://github.com/tensorflow/tensorflow/archive/v2.8.0.tar.gz
 	source = fix-c++17-compat.patch
-	source = build-against-actual-mkl.patch
-	source = openssl-1.1.patch
-	sha512sums = d052da4b324f1b5ac9c904ac3cca270cefbf916be6e5968a6835ef3f8ea8c703a0b90be577ac5205edf248e8e6c7ee8817b6a1b383018bb77c381717c6205e05
-	sha512sums = 8a0fb7e728b144656503ee54b3c90483c619adf17b2081dceb2bd6bcd1435dd64afba97526d94114d4c10fc002d2d213ae6717ad407285b18e438b05fc1ed2ad
+	sha512sums = 9cddb78c0392b7810e71917c3731f895e31c250822031ac7f498bf20435408c640b2fba4de439fa4a47c70dbff38b86e50fed2971df1f1916f23f9490241cfed
 	sha512sums = f682368bb47b2b022a51aa77345dfa30f3b0d7911c56515d428b8326ee3751242f375f4e715a37bb723ef20a86916dad9871c3c81b1b58da85e1ca202bc4901e
-	sha512sums = e51e3f3dced121db3a09fbdaefd33555536095584b72a5eb6f302fa6fa68ab56ea45e8a847ec90ff4ba076db312c06f91ff672e08e95263c658526582494ce08
-	sha512sums = cb15e7331f62d6e77e1099055430cd026e5788f0cab202fbfad8e27c47fca9ad5e1467249683dcdaab8c76cab4dece016f8ecd0f0793adb256ff6d975f893125
 
 pkgname = tensorflow-rocm
 	pkgdesc = Library for computation using data flow graphs for scalable machine learning (with ROCM)
@@ -48,15 +41,14 @@ pkgname = tensorflow-rocm
 	depends = intel-mkl
 	depends = onednn
 	depends = pybind11
-	depends = openssl-1.0
+	depends = openssl
 	depends = lmdb
 	depends = libpng
 	depends = curl
 	depends = giflib
 	depends = icu
 	depends = libjpeg-turbo
-	depends = rocm
-	depends = rocm-libs
+	depends = rocm-hip-sdk
 	depends = miopen
 	depends = rccl
 	provides = tensorflow
@@ -68,7 +60,7 @@ pkgname = python-tensorflow-rocm
 	depends = intel-mkl
 	depends = onednn
 	depends = pybind11
-	depends = openssl-1.0
+	depends = openssl
 	depends = lmdb
 	depends = libpng
 	depends = curl
@@ -76,8 +68,7 @@ pkgname = python-tensorflow-rocm
 	depends = icu
 	depends = libjpeg-turbo
 	depends = tensorflow-rocm
-	depends = rocm
-	depends = rocm-libs
+	depends = rocm-hip-sdk
 	depends = miopen
 	depends = rccl
 	depends = python-termcolor
@@ -87,6 +78,7 @@ pkgname = python-tensorflow-rocm
 	depends = python-protobuf
 	depends = absl-py
 	depends = python-h5py
+	depends = python-keras
 	depends = python-keras-applications
 	depends = python-keras-preprocessing
 	depends = python-tensorflow-estimator
@@ -103,15 +95,14 @@ pkgname = tensorflow-opt-rocm
 	depends = intel-mkl
 	depends = onednn
 	depends = pybind11
-	depends = openssl-1.0
+	depends = openssl
 	depends = lmdb
 	depends = libpng
 	depends = curl
 	depends = giflib
 	depends = icu
 	depends = libjpeg-turbo
-	depends = rocm
-	depends = rocm-libs
+	depends = rocm-hip-sdk
 	depends = miopen
 	depends = rccl
 	provides = tensorflow
@@ -124,7 +115,7 @@ pkgname = python-tensorflow-opt-rocm
 	depends = intel-mkl
 	depends = onednn
 	depends = pybind11
-	depends = openssl-1.0
+	depends = openssl
 	depends = lmdb
 	depends = libpng
 	depends = curl
@@ -132,8 +123,7 @@ pkgname = python-tensorflow-opt-rocm
 	depends = icu
 	depends = libjpeg-turbo
 	depends = tensorflow-rocm
-	depends = rocm
-	depends = rocm-libs
+	depends = rocm-hip-sdk
 	depends = miopen
 	depends = rccl
 	depends = python-termcolor
@@ -143,6 +133,7 @@ pkgname = python-tensorflow-opt-rocm
 	depends = python-protobuf
 	depends = absl-py
 	depends = python-h5py
+	depends = python-keras
 	depends = python-keras-applications
 	depends = python-keras-preprocessing
 	depends = python-tensorflow-estimator
diff --git a/48935.patch b/48935.patch
deleted file mode 100644
index 6dc4a682e21f..000000000000
--- a/48935.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-From 0f8fde42d09b199d02cf5d9d79fe76ebf1d260ef Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Thu, 6 May 2021 12:13:40 +0200
-Subject: [PATCH 1/7] Fix NumPy 1.20 error with np.prod()
-
-Reference: #47691, https://stackoverflow.com/questions/66373169
----
- tensorflow/python/ops/array_ops.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
-index 519f2ef26fcef..d143ee96a2fc9 100644
---- a/tensorflow/python/ops/array_ops.py
-+++ b/tensorflow/python/ops/array_ops.py
-@@ -36,6 +36,7 @@
- from tensorflow.python.framework.constant_op import constant
- from tensorflow.python.ops import gen_array_ops
- from tensorflow.python.ops import gen_math_ops
-+from tensorflow.python.ops import math_ops
- # go/tf-wildcard-import
- # pylint: disable=wildcard-import
- from tensorflow.python.ops.gen_array_ops import *
-@@ -2894,7 +2895,7 @@ def matrix_set_diag(
- 
- def _constant_if_small(value, shape, dtype, name):
-   try:
--    if np.prod(shape) < 1000:
-+    if math_ops.reduce_prod(shape) < 1000:
-       return constant(value, shape=shape, dtype=dtype, name=name)
-   except TypeError:
-     # Happens when shape is a Tensor, list with Tensor elements, etc.
-
-From 86cbf87703876330b5818b7f170489356d9d2c86 Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Thu, 6 May 2021 12:34:12 +0200
-Subject: [PATCH 2/7] relax upper bounds for NumPy and SciPy in pip installs
-
----
- .../tools/pip_package/setup_with_binary.py     |  2 +-
- .../install/install_centos_pip_packages.sh     |  6 +++---
- .../ci_build/install/install_pip_packages.sh   |  4 ++--
- .../install/install_pip_packages_by_version.sh |  2 +-
- .../install/install_python3.6_pip_packages.sh  |  2 +-
- tensorflow/tools/pip_package/setup.py          |  2 +-
- 7 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/tensorflow/lite/tools/pip_package/setup_with_binary.py b/tensorflow/lite/tools/pip_package/setup_with_binary.py
-index 6b9fe534bb2b1..ae06df8245521 100644
---- a/tensorflow/lite/tools/pip_package/setup_with_binary.py
-+++ b/tensorflow/lite/tools/pip_package/setup_with_binary.py
-@@ -67,5 +67,5 @@
-     package_dir={'': '.'},
-     package_data={'': ['*.so', '*.pyd']},
-     install_requires=[
--        'numpy ~= 1.19.2',  # Higher versions have a compatibility issue.
-+        'numpy >= 1.19.2 , <1.21',
-     ])
-diff --git a/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh b/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh
-index b9906b9378c79..ab0a766bf22b0 100755
---- a/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh
-+++ b/tensorflow/tools/ci_build/install/install_centos_pip_packages.sh
-@@ -55,17 +55,17 @@ pip2 install --upgrade protobuf==3.6.1
- pip3 install --upgrade protobuf==3.16.0
- 
- pip2 install --upgrade numpy==1.14.5
--pip3 install --upgrade numpy~=1.19.2
-+pip3 install --upgrade numpy>=1.19.2
- 
- pip2 install scipy==1.2.2
--pip3 install scipy==1.4.1
-+pip3 install scipy>=1.4.1
- 
- pip2 install scikit-learn==0.18.1
- pip3 install scikit-learn==0.18.1
- 
- # pandas required by `inflow`
- pip2 install pandas==0.19.2
--pip3 install pandas==0.19.2
-+pip3 install pandas>=0.19.2
- 
- # Benchmark tests require the following:
- pip2 install psutil
-diff --git a/tensorflow/tools/ci_build/install/install_pip_packages.sh b/tensorflow/tools/ci_build/install/install_pip_packages.sh
-index f9aa818c57038..6f0bf612e51ec 100755
---- a/tensorflow/tools/ci_build/install/install_pip_packages.sh
-+++ b/tensorflow/tools/ci_build/install/install_pip_packages.sh
-@@ -60,9 +60,9 @@ rm -rf /usr/lib/python3/dist-packages/six*
- # https://github.com/tensorflow/tensorflow/issues/6968
- # This workaround isn't needed for Ubuntu 16.04 or later.
- if $(cat /etc/*-release | grep -q 14.04); then
--  pip3 install --upgrade numpy==1.14.5
-+  pip3 install --upgrade numpy>=1.14.5
- else
--  pip3 install --upgrade numpy~=1.19.2
-+  pip3 install --upgrade numpy>=1.19.2
- fi
- 
- pip3 install scipy==1.4.1
-diff --git a/tensorflow/tools/ci_build/install/install_pip_packages_by_version.sh b/tensorflow/tools/ci_build/install/install_pip_packages_by_version.sh
-index 110928f3b3de5..b536bf20b8992 100755
---- a/tensorflow/tools/ci_build/install/install_pip_packages_by_version.sh
-+++ b/tensorflow/tools/ci_build/install/install_pip_packages_by_version.sh
-@@ -29,7 +29,7 @@ PACKAGES=(
-   # NOTE: As numpy has releases that break semver guarantees and several other
-   # deps depend on numpy without an upper bound, we must install numpy before
-   # everything else.
--  "numpy~=1.19.2"
-+  "numpy>=1.19.2,<1.21"
-   "auditwheel"
-   "wheel"
-   "setuptools"
-diff --git a/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh b/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh
-index 761973deb28cb..3b49679031c29 100755
---- a/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh
-+++ b/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh
-@@ -72,7 +72,7 @@ rm -rf /usr/lib/python3/dist-packages/six*
- # numpy needs to be installed from source to fix segfaults. See:
- # https://github.com/tensorflow/tensorflow/issues/6968
- # This workaround isn't needed for Ubuntu 16.04 or later.
--pip3 install --upgrade numpy~=1.19.2
-+pip3 install --upgrade numpy>=1.19.2
- 
- pip3 install scipy==1.4.1
- 
-diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
-index 5fe345ed7ed9f..453c930700139 100644
---- a/tensorflow/tools/pip_package/setup.py
-+++ b/tensorflow/tools/pip_package/setup.py
-@@ -78,7 +78,7 @@
-     # NOTE: As numpy has releases that break semver guarantees and several other
-     # deps depend on numpy without an upper bound, we must install numpy before
-     # everything else.
--    'numpy ~= 1.19.2',
-+    'numpy >= 1.19.2, < 1.21',
-     # Install other dependencies
-     'absl-py ~= 0.10',
-     'astunparse ~= 1.6.3',
-
-From 7d2b0cff4e4df1b2b706daaa003f274777b85aa4 Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Thu, 6 May 2021 12:38:22 +0200
-Subject: [PATCH 3/7] relax upper numpy bound in dockerfiles
-
----
- .../dockerfiles/arm64v8/devel-cpu-arm64v8-jupyter.Dockerfile    | 2 +-
- .../dockerfiles/arm64v8/devel-cpu-arm64v8.Dockerfile            | 2 +-
- .../tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile  | 2 +-
- tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile   | 2 +-
- .../tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile  | 2 +-
- tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile   | 2 +-
- .../dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile    | 2 +-
- .../dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile            | 2 +-
- .../dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile    | 2 +-
- .../dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile            | 2 +-
- .../tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile  | 2 +-
- .../partials/ubuntu/bazelbuild-arm64v8.partial.Dockerfile       | 2 +-
- .../dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile   | 2 +-
- 13 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/arm64v8/devel-cpu-arm64v8-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/arm64v8/devel-cpu-arm64v8-jupyter.Dockerfile
-index e8a5026d7eddc..5fcca1b4a0d58 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/arm64v8/devel-cpu-arm64v8-jupyter.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/arm64v8/devel-cpu-arm64v8-jupyter.Dockerfile
-@@ -88,7 +88,7 @@ RUN python3 -m pip --no-cache-dir install \
-     h5py \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/arm64v8/devel-cpu-arm64v8.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/arm64v8/devel-cpu-arm64v8.Dockerfile
-index 5efeed2796c5c..381b4084f3e0a 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/arm64v8/devel-cpu-arm64v8.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/arm64v8/devel-cpu-arm64v8.Dockerfile
-@@ -88,7 +88,7 @@ RUN python3 -m pip --no-cache-dir install \
-     h5py \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile
-index 88c941704aee6..d9062086b184a 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile
-@@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile
-index 618d3d211d9df..2d310dec012cf 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile
-@@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile
-index 4be850f5fae3b..6c100cc9d8e05 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile
-@@ -125,7 +125,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile
-index feba442ec1c26..a8e9b8d9088fb 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile
-@@ -125,7 +125,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile
-index 129f983eb319e..a1a5cfbc03040 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile
-@@ -83,7 +83,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile
-index aa2b9f88702e2..118de55a138de 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile
-@@ -83,7 +83,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile
-index 0f6a9ae5e5e27..4f94ba1edb119 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile
-@@ -124,7 +124,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile
-index 7086a0cd5d6d7..0eefc0737d5a8 100644
---- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile
-@@ -124,7 +124,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile
-index ac3d23c3747e8..620660f0b28a4 100644
---- a/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile
-@@ -14,7 +14,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild-arm64v8.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild-arm64v8.partial.Dockerfile
-index 969445c627465..87497f60ae3f9 100644
---- a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild-arm64v8.partial.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild-arm64v8.partial.Dockerfile
-@@ -18,7 +18,7 @@ RUN python3 -m pip --no-cache-dir install \
-     h5py \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile
-index 0cf475d9deb13..22d2104db7a28 100644
---- a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile
-+++ b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile
-@@ -13,7 +13,7 @@ RUN python3 -m pip --no-cache-dir install \
-     keras_preprocessing \
-     matplotlib \
-     mock \
--    'numpy<1.19.0' \
-+    'numpy<1.21' \
-     scipy \
-     sklearn \
-     pandas \
-
-From 444840954cab9fda8be108e83af74d6a79e395b9 Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Thu, 17 Jun 2021 11:44:08 +0200
-Subject: [PATCH 7/7] shape must be integer tuple
-
----
- tensorflow/python/eager/function_test.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tensorflow/python/eager/function_test.py b/tensorflow/python/eager/function_test.py
-index ccf3f117e3970..69985f6557c17 100644
---- a/tensorflow/python/eager/function_test.py
-+++ b/tensorflow/python/eager/function_test.py
-@@ -279,8 +279,8 @@ def testImplementsAttributeAssertsOnSideInput(self):
-       z = array_ops.zeros(0)
-       v = def_function.function(
-           experimental_implements='func')(lambda x, y: x + y + z)
--      a = array_ops.ones((1.0,))
--      b = array_ops.ones((1.0,))
-+      a = array_ops.ones((1,))
-+      b = array_ops.ones((1,))
-       with self.assertRaisesRegex(AssertionError,
-                                   'variables are always captured'):
-         v(a, b)
diff --git a/PKGBUILD b/PKGBUILD
index 6c699fa78b11..6955272b797c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,34 +14,27 @@ 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.6.0
-_pkgver=2.6.0
-pkgrel=2
+pkgver=2.8.0
+_pkgver=2.8.0
+pkgrel=1
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')
 arch=('x86_64')
-depends=('c-ares' 'intel-mkl' 'onednn' 'pybind11' 'openssl-1.0' 'lmdb' 'libpng' 'curl' 'giflib' 'icu' 'libjpeg-turbo')
-makedepends=('bazel' 'python-numpy' 'rocm' 'rocm-libs' 'miopen' 'rccl' 'git'
+depends=('c-ares' 'intel-mkl' 'onednn' 'pybind11' 'openssl' 'lmdb' 'libpng' 'curl' 'giflib' 'icu' 'libjpeg-turbo')
+makedepends=('bazel' 'python-numpy' 'rocm-hip-sdk' 'miopen' 'rccl' 'git'
              'python-pip' 'python-wheel' 'python-setuptools' 'python-h5py'
              '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"
-        48935.patch
-        fix-c++17-compat.patch
-        build-against-actual-mkl.patch
-        openssl-1.1.patch)
-
-sha512sums=('d052da4b324f1b5ac9c904ac3cca270cefbf916be6e5968a6835ef3f8ea8c703a0b90be577ac5205edf248e8e6c7ee8817b6a1b383018bb77c381717c6205e05'
-            '8a0fb7e728b144656503ee54b3c90483c619adf17b2081dceb2bd6bcd1435dd64afba97526d94114d4c10fc002d2d213ae6717ad407285b18e438b05fc1ed2ad'
-            'f682368bb47b2b022a51aa77345dfa30f3b0d7911c56515d428b8326ee3751242f375f4e715a37bb723ef20a86916dad9871c3c81b1b58da85e1ca202bc4901e'
-            'e51e3f3dced121db3a09fbdaefd33555536095584b72a5eb6f302fa6fa68ab56ea45e8a847ec90ff4ba076db312c06f91ff672e08e95263c658526582494ce08'
-            'cb15e7331f62d6e77e1099055430cd026e5788f0cab202fbfad8e27c47fca9ad5e1467249683dcdaab8c76cab4dece016f8ecd0f0793adb256ff6d975f893125')
+        fix-c++17-compat.patch)
 
+sha512sums=('9cddb78c0392b7810e71917c3731f895e31c250822031ac7f498bf20435408c640b2fba4de439fa4a47c70dbff38b86e50fed2971df1f1916f23f9490241cfed'
+            'f682368bb47b2b022a51aa77345dfa30f3b0d7911c56515d428b8326ee3751242f375f4e715a37bb723ef20a86916dad9871c3c81b1b58da85e1ca202bc4901e')
 
 # consolidate common dependencies to prevent mishaps
-_common_py_depends=(python-termcolor python-astor python-gast03 python-numpy python-protobuf absl-py python-h5py python-keras-applications python-keras-preprocessing python-tensorflow-estimator python-opt_einsum python-astunparse python-pasta python-flatbuffers)
+_common_py_depends=(python-termcolor python-astor python-gast03 python-numpy python-protobuf absl-py python-h5py python-keras python-keras-applications python-keras-preprocessing python-tensorflow-estimator python-opt_einsum python-astunparse python-pasta python-flatbuffers)
 
 get_pyver () {
   python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
@@ -72,17 +65,6 @@ prepare() {
   # Allow any bazel version
   echo "*" > tensorflow-${_pkgver}/.bazelversion
 
-  # Tensorflow actually wants to build against a slimmed down version of Intel MKL called MKLML
-  # See https://github.com/intel/mkl-dnn/issues/102
-  # MKLML version that Tensorflow wants to use is https://github.com/intel/mkl-dnn/releases/tag/v0.21
-  # patch -Np1 -d tensorflow-${_pkgver} -i "$srcdir"/build-against-actual-mkl.patch
-
-  # https://github.com/tensorflow/tensorflow/pull/48935/files
-  patch -p1 -d tensorflow-${_pkgver} -i "$srcdir"/48935.patch
-
-  # https://bugs.archlinux.org/task/71597
-  patch -p1 -d tensorflow-${_pkgver} -i "$srcdir"/openssl-1.1.patch
-
   # 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
@@ -243,7 +225,7 @@ _python_package() {
 
 package_tensorflow-rocm() {
   pkgdesc="Library for computation using data flow graphs for scalable machine learning (with ROCM)"
-  depends+=(rocm rocm-libs miopen rccl)
+  depends+=(rocm-hip-sdk miopen rccl)
   conflicts=(tensorflow)
   provides=(tensorflow)
 
@@ -253,7 +235,7 @@ package_tensorflow-rocm() {
 
 package_tensorflow-opt-rocm() {
   pkgdesc="Library for computation using data flow graphs for scalable machine learning (with ROCM and AVX2 CPU optimizations)"
-  depends+=(rocm rocm-libs miopen rccl)
+  depends+=(rocm-hip-sdk miopen rccl)
   conflicts=(tensorflow)
   provides=(tensorflow tensorflow-rocm)
 
@@ -263,7 +245,7 @@ package_tensorflow-opt-rocm() {
 
 package_python-tensorflow-rocm() {
   pkgdesc="Library for computation using data flow graphs for scalable machine learning (with ROCM)"
-  depends+=(tensorflow-rocm rocm rocm-libs miopen rccl "${_common_py_depends[@]}")
+  depends+=(tensorflow-rocm rocm-hip-sdk miopen rccl "${_common_py_depends[@]}")
   conflicts=(python-tensorflow)
   provides=(python-tensorflow)
 
@@ -273,7 +255,7 @@ package_python-tensorflow-rocm() {
 
 package_python-tensorflow-opt-rocm() {
   pkgdesc="Library for computation using data flow graphs for scalable machine learning (with ROCM and AVX2 CPU optimizations)"
-  depends+=(tensorflow-rocm rocm rocm-libs miopen rccl "${_common_py_depends[@]}")
+  depends+=(tensorflow-rocm rocm-hip-sdk miopen rccl "${_common_py_depends[@]}")
   conflicts=(python-tensorflow)
   provides=(python-tensorflow python-tensorflow-rocm)
 
diff --git a/build-against-actual-mkl.patch b/build-against-actual-mkl.patch
deleted file mode 100644
index c1589b568751..000000000000
--- a/build-against-actual-mkl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/third_party/mkl/build_defs.bzl b/third_party/mkl/build_defs.bzl
-index 4b8fb83eb0..f4e1adfb22 100644
---- a/third_party/mkl/build_defs.bzl
-+++ b/third_party/mkl/build_defs.bzl
-@@ -124,7 +124,7 @@ def _mkl_autoconf_impl(repository_ctx):
-     if _enable_local_mkl(repository_ctx):
-         # Symlink lib and include local folders.
-         mkl_root = repository_ctx.os.environ[_TF_MKL_ROOT]
--        mkl_lib_path = "%s/lib" % mkl_root
-+        mkl_lib_path = "%s/lib/intel64" % mkl_root
-         repository_ctx.symlink(mkl_lib_path, "lib")
-         mkl_include_path = "%s/include" % mkl_root
-         repository_ctx.symlink(mkl_include_path, "include")
-diff --git a/third_party/mkl/mkl.BUILD b/third_party/mkl/mkl.BUILD
-index 72370182c4..4972bb005e 100644
---- a/third_party/mkl/mkl.BUILD
-+++ b/third_party/mkl/mkl.BUILD
-@@ -5,7 +5,6 @@ exports_files(["license.txt"])
- filegroup(
-     name = "LICENSE",
-     srcs = [
--        "license.txt",
-     ],
-     visibility = ["//visibility:public"],
- )
-@@ -21,7 +20,10 @@ cc_library(
-     name = "mkl_libs_linux",
-     srcs = [
-         "lib/libiomp5.so",
--        "lib/libmklml_intel.so",
-+        "lib/libmkl_core.so",
-+        "lib/libmkl_rt.so",
-+        "lib/libmkl_intel_thread.so",
-+        "lib/libmkl_intel_lp64.so",
-     ],
-     visibility = ["//visibility:public"],
- )
diff --git a/openssl-1.1.patch b/openssl-1.1.patch
deleted file mode 100644
index d1dbb543cae4..000000000000
--- a/openssl-1.1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/tensorflow/core/platform/s3/aws_crypto.cc b/tensorflow/core/platform/s3/aws_crypto.cc
-index 6a473027..2fe87675 100644
---- a/tensorflow/core/platform/s3/aws_crypto.cc
-+++ b/tensorflow/core/platform/s3/aws_crypto.cc
-@@ -35,14 +35,13 @@ class AWSSha256HMACOpenSSLImpl : public Aws::Utils::Crypto::HMAC {
-     Aws::Utils::ByteBuffer digest(length);
-     memset(digest.GetUnderlyingData(), 0, length);
- 
--    HMAC_CTX ctx;
--    HMAC_CTX_init(&ctx);
-+    HMAC_CTX * ctx = HMAC_CTX_new();
- 
--    HMAC_Init_ex(&ctx, secret.GetUnderlyingData(),
-+    HMAC_Init_ex(ctx, secret.GetUnderlyingData(),
-                  static_cast<int>(secret.GetLength()), EVP_sha256(), NULL);
--    HMAC_Update(&ctx, toSign.GetUnderlyingData(), toSign.GetLength());
--    HMAC_Final(&ctx, digest.GetUnderlyingData(), &length);
--    HMAC_CTX_cleanup(&ctx);
-+    HMAC_Update(ctx, toSign.GetUnderlyingData(), toSign.GetLength());
-+    HMAC_Final(ctx, digest.GetUnderlyingData(), &length);
-+    HMAC_CTX_free(ctx);
- 
-     return Aws::Utils::Crypto::HashResult(std::move(digest));
-   }