Depends on bazel3, use gcc10<=10.2.0 (https://github.com/NVIDIA/nccl/issues/494), fix bazel CUDA build (https://github.com/tensorflow/recommenders-addons/pull/53)

3 files changed, 31 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f4e662c631b..86c1140e1a5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
 pkgbase = python-tensorflow-addons-cuda-git
 	pkgdesc = Useful extra functionality for TensorFlow 2.x, built with CUDA support
-	pkgver = r1118.a0bfe3f3
+	pkgver = r1365.97eb293d
 	pkgrel = 1
 	url = https://github.com/tensorflow/addons
 	arch = any
 	license = APACHE
 	makedepends = python-setuptools
-	makedepends = bazel
+	makedepends = bazel3
 	makedepends = rsync
+	makedepends = gcc10<=1:10.2.0
 	depends = tensorflow-cuda
 	depends = python-tensorflow
 	depends = python-typeguard
 	depends = cuda
 	depends = cudnn
+	depends = gcc10-libs
 	source = git+https://github.com/tensorflow/addons.git
+	source = bazel-cuda-build-fix.patch
 	sha256sums = SKIP
+	sha256sums = 987e4933a298616a2ede9f2a938e047df20287ab7f514f104703ac7af5e8ef9d
 
 pkgname = python-tensorflow-addons-cuda-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 0a6240e0d31c..2aefc644166f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,18 @@
 # Maintainer: piernov <piernov@piernov.org>
 
 pkgname=python-tensorflow-addons-cuda-git
-pkgver=r1118.a0bfe3f3
+pkgver=r1365.97eb293d
 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' 'cudnn')
-makedepends=('python-setuptools' 'bazel' 'rsync')
-source=("git+https://github.com/tensorflow/addons.git")
-sha256sums=('SKIP')
+depends=('tensorflow-cuda' 'python-tensorflow' 'python-typeguard' 'cuda' 'cudnn' 'gcc10-libs')
+makedepends=('python-setuptools' 'bazel3' 'rsync' 'gcc10<=1:10.2.0')
+source=("git+https://github.com/tensorflow/addons.git"
+	"bazel-cuda-build-fix.patch")
+sha256sums=('SKIP'
+            '987e4933a298616a2ede9f2a938e047df20287ab7f514f104703ac7af5e8ef9d')
 
 pkgver() {
   cd addons
@@ -18,8 +20,9 @@ pkgver() {
 }
 
 prepare() {
-  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-8
-  export HOST_CXX_COMPILER_PATH=/usr/bin/gcc-8
+  cd "${srcdir}"/addons
+  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-10
+  export HOST_CXX_COMPILER_PATH=/usr/bin/gcc-10
 
   # Force OpenJDK-11
   export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
@@ -33,6 +36,8 @@ prepare() {
   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
+
+  patch -p1 < "${srcdir}/bazel-cuda-build-fix.patch"
 }
 
 build() {
diff --git a/bazel-cuda-build-fix.patch b/bazel-cuda-build-fix.patch
new file mode 100644
index 000000000000..a3665d9cf2a0
--- /dev/null
+++ b/bazel-cuda-build-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/build_deps/toolchains/gpu/cuda_configure.bzl b/build_deps/toolchains/gpu/cuda_configure.bzl
+index ba38c6b5..3a0b558d 100644
+--- a/build_deps/toolchains/gpu/cuda_configure.bzl
++++ b/build_deps/toolchains/gpu/cuda_configure.bzl
+@@ -1022,6 +1022,8 @@ def _create_local_cuda_repository(repository_ctx):
+ 
+     builtin_include_directories = []
+     for one_line in cuda_defines["%{host_compiler_includes}"].splitlines():
++        if len(one_line) == 0:
++            continue
+         inc_dir = one_line.split(":")[1][2:-1]
+         builtin_include_directories.append(inc_dir)
+