Use gcc-8 to build (CUDA requirement) and find CUDA/cuDNN version automatically (from tensorflow package)

Still needs to be rebuilt after CUDA upgrade, and compiler version may need to be changed
Thanks oysstu

2 files changed, 18 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 385d5c9b04a0..8f4e662c631b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-tensorflow-addons-cuda-git
 	pkgdesc = Useful extra functionality for TensorFlow 2.x, built with CUDA support
-	pkgver = r746.25959474
-	pkgrel = 2
+	pkgver = r1118.a0bfe3f3
+	pkgrel = 1
 	url = https://github.com/tensorflow/addons
 	arch = any
 	license = APACHE
@@ -11,10 +11,8 @@ pkgbase = python-tensorflow-addons-cuda-git
 	depends = tensorflow-cuda
 	depends = python-tensorflow
 	depends = python-typeguard
-	depends = cuda>=10.2
-	depends = cuda<10.3
-	depends = cudnn>=7
-	depends = cudnn<8
+	depends = cuda
+	depends = cudnn
 	source = git+https://github.com/tensorflow/addons.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 67e520e82295..0a6240e0d31c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: piernov <piernov@piernov.org>
 
 pkgname=python-tensorflow-addons-cuda-git
-pkgver=r746.25959474
-pkgrel=2
+pkgver=r1118.a0bfe3f3
+pkgrel=1
 pkgdesc="Useful extra functionality for TensorFlow 2.x, built with CUDA support"
 url="https://github.com/tensorflow/addons"
 arch=('any')
 license=('APACHE')
-depends=('tensorflow-cuda' 'python-tensorflow' 'python-typeguard' 'cuda>=10.2' 'cuda<10.3' 'cudnn>=7' 'cudnn<8')
+depends=('tensorflow-cuda' 'python-tensorflow' 'python-typeguard' 'cuda' 'cudnn')
 makedepends=('python-setuptools' 'bazel' 'rsync')
 source=("git+https://github.com/tensorflow/addons.git")
 sha256sums=('SKIP')
@@ -17,17 +17,25 @@ pkgver() {
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-build() {
+prepare() {
+  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-8
+  export HOST_CXX_COMPILER_PATH=/usr/bin/gcc-8
+
   # Force OpenJDK-11
   export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
 
   export TF_NEED_CUDA=1
-  export TF_CUDA_VERSION=10.2
-  export TF_CUDNN_VERSION=7
+  export TF_CUDA_CLANG=0
   export CUDA_TOOLKIT_PATH=/opt/cuda
   export CUDNN_INSTALL_PATH=/usr
   export TF_CUDA_PATHS=/opt/cuda/targets/x86_64-linux
 
+  export TF_CUDA_VERSION=$(/opt/cuda/bin/nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')
+  export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' /usr/include/cudnn.h)
+  export TF_CUDA_COMPUTE_CAPABILITIES=3.5,3.7,5.0,5.2,5.3,6.0,6.1,6.2,7.0,7.2,7.5
+}
+
+build() {
   cd "${srcdir}"/addons
   python3 ./configure.py --no-deps
   bazel build --copt=-O3 --copt=-march=native build_pip_pkg