Use git version

3 files changed, 29 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 900db0e50c9d..da64bef44532 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = tensorflow-computecpp
 	pkgdesc = Library for computation using data flow graphs for scalable machine learning (backend with ComputeCpp)
-	pkgver = 1.7.0
-	pkgrel = 2
-	url = https://github.com/tensorflow/tensorflow
+	pkgver = 1.6.0
+	pkgrel = 1
+	url = https://github.com/lukeiwanski/tensorflow
 	arch = x86_64
 	license = APACHE
+	makedepends = git
 	makedepends = opencl-icd-loader
 	makedepends = computecpp
 	makedepends = bazel
@@ -14,12 +15,10 @@ pkgbase = tensorflow-computecpp
 	makedepends = python-setuptools
 	depends = opencl-icd-loader
 	depends = computecpp
-	source = https://github.com/tensorflow/tensorflow/archive/v1.7.0.tar.gz
+	source = git+https://github.com/lukeiwanski/tensorflow#branch=dev/amd_gpu
 	source = 17508.patch
-	source = no_trisycl.patch
-	sha512sums = 68fffad324be7f6e3726ea539670572729bd72c7dc935edfdb31771f821f1a8fe90c3d7c293969f660a25e5fd76249cc9b74c5f8511c7bd3e2189d3328044f29
+	sha512sums = SKIP
 	sha512sums = cb2880767532275f55f91ab66b29687fceadcadb8e23608d1e59b35a2899239882367ac38465a5e635f17378286093da0ede115668e23d651776d962ddc35ea9
-	sha512sums = 9081323af38496fbaff4ae79dd7dd291bdebe83758c715fa2d302d3733169a3fb347427b2b0f0268df91bd6b681c57d938fabfe7da3abdb1aa8fc49261a3d750
 
 pkgname = tensorflow-computecpp
 	provides = tensorflow
diff --git a/PKGBUILD b/PKGBUILD
index 4f1b60a04d96..6b5d5565d32f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,33 @@
 
 pkgbase=tensorflow-computecpp
 pkgname=(tensorflow-computecpp python-tensorflow-computecpp)
-pkgver=1.7.0
-pkgrel=2
+pkgver=ComputeCpp+0.6.0+30+g4cc789977d
+pkgrel=1
 pkgdesc="Library for computation using data flow graphs for scalable machine learning (backend with ComputeCpp)"
-url="https://github.com/tensorflow/tensorflow"
+url="https://github.com/lukeiwanski/tensorflow"
 license=('APACHE')
 arch=('x86_64')
 depends=(opencl-icd-loader computecpp)
-makedepends=(opencl-icd-loader computecpp bazel python-numpy python-pip python-wheel python-setuptools)
-source=("${url}/archive/v${pkgver}.tar.gz"
-        17508.patch
-        no_trisycl.patch)
-sha512sums=('68fffad324be7f6e3726ea539670572729bd72c7dc935edfdb31771f821f1a8fe90c3d7c293969f660a25e5fd76249cc9b74c5f8511c7bd3e2189d3328044f29'
-            'cb2880767532275f55f91ab66b29687fceadcadb8e23608d1e59b35a2899239882367ac38465a5e635f17378286093da0ede115668e23d651776d962ddc35ea9'
-            '9081323af38496fbaff4ae79dd7dd291bdebe83758c715fa2d302d3733169a3fb347427b2b0f0268df91bd6b681c57d938fabfe7da3abdb1aa8fc49261a3d750')
+makedepends=(git opencl-icd-loader computecpp bazel python-numpy python-pip python-wheel python-setuptools)
+source=("git+${url}#branch=dev/amd_gpu"
+        17508.patch)
+sha512sums=('SKIP'
+            'cb2880767532275f55f91ab66b29687fceadcadb8e23608d1e59b35a2899239882367ac38465a5e635f17378286093da0ede115668e23d651776d962ddc35ea9')
+
+pkgver() {
+  cd ${srcdir}/tensorflow
+  git describe --tags | sed 's/-/+/g;s/v//;'
+}
+
 prepare() {
-  patch -Np1 -i ${srcdir}/17508.patch -d tensorflow-${pkgver}
-  patch -Np1 -i ${srcdir}/no_trisycl.patch -d tensorflow-${pkgver}
+  patch -Np1 -i ${srcdir}/17508.patch -d tensorflow
 
   # These environment variables influence the behavior of the configure call below.
   export PYTHON_BIN_PATH=/usr/bin/python
   export USE_DEFAULT_PYTHON_LIB_PATH=1
   export HOST_CXX_COMPILER=/usr/bin/g++
   export HOST_C_COMPILER=/usr/bin/gcc
-  export CC_OPT_FLAGS="-march=native -O2"
+  export CC_OPT_FLAGS="-march=native -mfpmath=sse -minline-stringops-dynamically -O2 -pipe -fstack-protector-strong -fno-plt"
   export TF_CUDA_CLANG=0
   export TF_NEED_CUDA=0
   export TF_NEED_JEMALLOC=0
@@ -34,14 +37,17 @@ prepare() {
   export TF_ENABLE_XLA=0
   export TF_NEED_GDR=0
   export TF_NEED_VERBS=0
-  export TF_NEED_OPENCL=1
   export TF_NEED_MPI=0
   export TF_NEED_S3=0
   export TF_NEED_KAFKA=0
   export TF_NEED_TENSORRT=0
   export TF_SET_ANDROID_WORKSPACE=0
+  export TF_NEED_OPENCL=1
   export TF_NEED_OPENCL_SYCL=1
   export TF_NEED_COMPUTECPP=1
+  export TF_USE_HALF_SYCL=0
+  export TF_USE_DOUBLE_SYCL=1
+  export TF_SYCL_BITCODE_TARGET=spir64
   export COMPUTECPP_TOOLKIT_PATH=/opt/ComputeCpp-CE
   export COMPUTE=:0
 
@@ -52,7 +58,7 @@ prepare() {
 
 build() {
   # _bazel_09_fix="--incompatible_load_argument_is_label=false"
-  cd ${srcdir}/tensorflow-${pkgver}
+  cd ${srcdir}/tensorflow
 
   ./configure
   bazel build -c opt --config=sycl //tensorflow:libtensorflow.so //tensorflow/tools/pip_package:build_pip_package # ${_bazel_09_fix}
@@ -63,7 +69,7 @@ package_tensorflow-computecpp() {
   conflicts=(tensorflow)
   provides=(tensorflow)
 
-  cd ${srcdir}/tensorflow-${pkgver}
+  cd ${srcdir}/tensorflow
 
   tensorflow/c/generate-pc.sh --prefix=/usr --version=${pkgver}
   install -Dm644 tensorflow.pc ${pkgdir}/usr/lib/pkgconfig/tensorflow.pc
@@ -79,7 +85,7 @@ package_python-tensorflow-computecpp() {
   depends=(python-numpy python-protobuf absl-py)
   optdepends=('python-werkzeug: for using tensorboard')
 
-  cd ${srcdir}/tensorflow-${pkgver}
+  cd ${srcdir}/tensorflow
 
   WHEEL_PACKAGE=$(find ${srcdir}/tmp -name "tensor*.whl")
   pip install --ignore-installed --upgrade --root $pkgdir/ $WHEEL_PACKAGE --no-dependencies
diff --git a/no_trisycl.patch b/no_trisycl.patch
deleted file mode 100644
index b57f9f03844d..000000000000
--- a/no_trisycl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- old/third_party/sycl/sycl/BUILD.tpl	2018-03-29 12:18:40.000000000 +0800
-+++ new/third_party/sycl/sycl/BUILD.tpl	2018-04-25 20:37:48.874124617 +0800
-@@ -21,7 +21,7 @@
-     name = "using_sycl_trisycl",
-     define_values = {
-         "using_sycl": "true",
--        "using_trisycl": "false",
-+        "using_trisycl": "true",
-     },
- )