should work with community/tensorflow

2 files changed, 82 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 91a92066af5b..93ae23239a9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
 pkgbase = python-sonnet-git
 	pkgdesc = TensorFlow-based neural network library.
-	pkgver = 9d209830
-	pkgrel = 3
+	pkgver = 20170515.170829
+	pkgrel = 1
 	url = https://github.com/deepmind/sonnet
-	arch = i686
 	arch = x86_64
 	license = Apache2
 	makedepends = git
-	makedepends = python-pip
 	makedepends = bazel
+	makedepends = python-numpy
+	makedepends = python-pip
+	makedepends = python-wheel
+	makedepends = python-setuptools
 	depends = python-tensorflow
-	depends = gcc-libs
 	depends = python
-	optdepends = cuda: GPU support
-	optdepends = cudnn: GPU support
-	provides = python-sonnet
-	conflicts = python-sonnet
 	source = git+https://github.com/deepmind/sonnet
+	source = https://github.com/tensorflow/tensorflow/archive/v1.1.0.tar.gz
 	md5sums = SKIP
+	md5sums = fb745649d33954c97d29b7acaffe7d65
 
 pkgname = python-sonnet-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 47d871e20fe9..eed78bab2c8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,109 +1,101 @@
 # Maintainer: Sasasu <lizhaolong0123@gmail.com>
-
-pkgname=python-sonnet-git
-pkgver=9d209830
-pkgrel=3
-
+pkgbase=python-sonnet-git
+# pkgname=(python-sonnet-git python-sonnet-cuda-git)
+pkgname=(python-sonnet-git)
+pkgver=20170515.170829
+tf_pkgver=1.1.0
+pkgrel=1
 pkgdesc="TensorFlow-based neural network library."
 url="https://github.com/deepmind/sonnet"
 license=('Apache2')
-
-arch=('i686' 'x86_64')
-
-provides=('python-sonnet')
-conflicts=('python-sonnet')
-depends=('python-tensorflow' 'gcc-libs' 'python')
-makedepends=('git' 'python-pip' 'bazel')
-optdepends=('cuda: GPU support'
-            'cudnn: GPU support')
+arch=('x86_64')
+depends=('python-tensorflow' 'python')
+# makedepends=('git' 'bazel' 'python-numpy' 'gcc5' 'cuda' 'cudnn' 'python-pip' 'python-wheel' 'python-setuptools')
+makedepends=('git' 'bazel' 'python-numpy' 'python-pip' 'python-wheel' 'python-setuptools')
 source=("git+https://github.com/deepmind/sonnet"
-        )
-md5sums=('SKIP')
-
-pkgver() {
-  cd ${srcdir}/sonnet
-  git rev-list HEAD  | sed -n '1p'  | cut -c1-8
-}
-
+        "https://github.com/tensorflow/tensorflow/archive/v${tf_pkgver}.tar.gz")
+md5sums=('SKIP'
+         'fb745649d33954c97d29b7acaffe7d65')
 
 prepare() {
-   cd ${srcdir}/sonnet
-   
-   git submodule update --init --recursive
-}
-
-configure_tensorflow() {
-  cd ${srcdir}/sonnet/tensorflow
-  git checkout r1.1 
-  # clean and create the directory to store the wheel file
-  if [ -d ${srcdir}/tmp ]; then
-    rm -rf ${srcdir}/tmp
-  else
-    mkdir -p ${srcdir}/tmp
-  fi
-
-  # setup environment variables
+  mkdir -p $srcdir/sonnet/tensorflow
+  cp -r tensorflow-$tf_pkgver/* $srcdir/sonnet/tensorflow/
+  cp -r $srcdir/sonnet $srcdir/sonnet-cuda
   export PYTHON_BIN_PATH=/usr/bin/python
   export USE_DEFAULT_PYTHON_LIB_PATH=1
-  if (pacman -Q cuda &>/dev/null && pacman -Q cudnn &>/dev/null); then
-    msg2 "CUDA support enabled"
-    _build_opts="--config=cuda"
-    makedepends+=gcc-5
-    export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-5
-    export TF_NEED_CUDA=1
-    export TF_UNOFFICIAL_SETTING=1
-    export CUDA_TOOLKIT_PATH=/opt/cuda
-    export CUDNN_INSTALL_PATH=/opt/cuda
-    # adapt to your needs
-    export TF_CUDA_VERSION=$($CUDA_TOOLKIT_PATH/bin/nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')
-    export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' $CUDNN_INSTALL_PATH/include/cudnn.h)
-    export TF_CUDA_COMPUTE_CAPABILITIES=3.5,5.2
-  else
-    msg2 "CUDA support disabled"
-    export TF_NEED_CUDA=0
-  fi
-
-  # disable Google Cloud Platform support
+  export CC_OPT_FLAGS="-march=x86-64"
+  export TF_NEED_JEMALLOC=1
   export TF_NEED_GCP=0
-  # disable Hadoop File System support
   export TF_NEED_HDFS=0
-  # disable OpenCL support
-  export TF_NEED_OPENCL=0
-  # enable XLA JIT compiler
   export TF_ENABLE_XLA=1
-  # enable jemalloc support
-  export TF_NEED_JEMALLOC=1
-  # set up architecture dependent optimization flags
-  export CC_OPT_FLAGS="-march=native"
-  # use nvcc instead of clang to build CUDA
-  export TF_CUDA_CLANG=0
+  export TF_NEED_VERBS=0
+  export TF_NEED_OPENCL=0
+}
 
-  # make sure the proxy variables are in all caps, otherwise bazel ignores them
-  export HTTP_PROXY=`echo $http_proxy | sed -e 's/\/$//'`
-  export HTTPS_PROXY=`echo $https_proxy | sed -e 's/\/$//'`
+configure_tensorflow() {
+  cd $srcdir/sonnet/tensorflow
+  export TF_NEED_CUDA=0
   
   ./configure
 }
 
+configure_tensorflow_cuda() {
+  cd $srcdir/sonnet/tensorflow
+  export TF_NEED_CUDA=1
+  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-5
+  # For next version instead of the gcc-5 stuff:
+  # export TF_CUDA_CLANG=1
+  # export CLANG_CUDA_COMPILER_PATH=/usr/bin/clang
+  export CUDA_TOOLKIT_PATH=/opt/cuda
+  export TF_CUDA_VERSION=$($CUDA_TOOLKIT_PATH/bin/nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')
+  export CUDNN_INSTALL_PATH=/opt/cuda
+  export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' $CUDNN_INSTALL_PATH/include/cudnn.h)
+  export TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.1
+
+  ./configure
+}
+
 build() {
-  cd ${srcdir}/sonnet/tensorflow
+  # CPU only
+  cd $srcdir/sonnet/tensorflow
   msg2 "Configure tensorflow..."
   configure_tensorflow
-  
-  cd ${srcdir}/sonnet
-  msg2 "Building sonnet..."
+  cd $srcdir/sonnet
+  msg2 "Building sonnet ..."
   bazel build  --ignore_unsupported_sandboxing --config=opt :install 
-
   mkdir -p tmp
-  msg2 "Building pip package..."
-  ./bazel-bin/install $(pwd)
+  msg2 "Building pip package ..."
+  ./bazel-bin/install $srcdir/sonnet
+  
+  # CUDA 
+  # no such target '@org_tensorflow//tensorflow/tools/git:gen/spec.json'
+  # no such target '@org_tensorflow//tensorflow/tools/git:gen/head'
+  # no such target '@org_tensorflow//tensorflow/tools/git:gen/branch_ref'
+  # target '//:install' failed
+  # Looks like a upstream problem 
+  
+  # cd $srcdir/sonnet-cuda/tensorflow
+  # msg2 "Configure tensorflow-cuda ..."
+  # configure_tensorflow_cuda
+  # cd $srcdir/sonnet-cuda
+  # msg2 "Building sonnet-cuda ..."
+  # bazel build  --ignore_unsupported_sandboxing --config=opt :install 
+  # mkdir -p tmp
+  # msg2 "Building pip package ..."
+  # ./bazel-bin/install $srcdir/sonnet-cuda
 }
 
-package() {
-  cd ${srcdir}/sonnet
-  PKG=`find $srcdir -name "sonnet-*.whl"`
-  pip install --ignore-installed --upgrade --root $pkgdir/ $PKG --no-dependencies
+package_python-sonnet-git() {
+  cd "${srcdir}/sonnet"
+  PKG=$(find "$srcdir" -name "sonnet-*.whl")
+  pip install --ignore-installed --upgrade --root "$pkgdir/" "$PKG" --no-dependencies
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+package_python-sonnet-cuda-git(){
+  cd "${srcdir}/sonnet-cuda"
+  PKG=$(find "$srcdir" -name "sonnet-*.whl")
+  pip install --ignore-installed --upgrade --root "$pkgdir/" "$PKG" --no-dependencies
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
-
 # vim:set ts=2 sw=2 et:
+