tensorflow version to 1.8.

added patch for fix building libpng without neon.
lhelontra · May 1, 2018 · 2512bfd · 2512bfd
1 parent a755faf
commit 2512bfd
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -9,10 +9,10 @@ apt-get install openjdk-8-jdk automake autoconf
 apt-get install curl zip unzip libtool swig libpng12-dev zlib1g-dev pkg-config git zip g++ unzip wget xz-utils
 
 # For python2.7
-apt-get install python-numpy python-dev python-pip
+apt-get install python-numpy python-dev python-pip python-mock
 
 # For python3
-apt-get install python3-numpy python3-dev python3-pip
+apt-get install python3-numpy python3-dev python3-pip python3-mock
 ```
 
 ## Cross-compilation

diff --git a/build_tensorflow/configs/beagle_black.conf b/build_tensorflow/configs/beagle_black.conf
@@ -1,6 +1,6 @@
-TF_PATCH="no"
+TF_PATCH="yes"
 TF_PYTHON_VERSION="3.5"
-TF_VERSION="v1.7.0"
+TF_VERSION="v1.8.0"
 
 # export tensorflow variables to configure
 TF_BUILD_VARS="TF_NEED_GDR=0"

diff --git a/build_tensorflow/configs/odroidc1.conf b/build_tensorflow/configs/odroidc1.conf
@@ -1,6 +1,6 @@
-TF_PATCH="no"
+TF_PATCH="yes"
 TF_PYTHON_VERSION="3.5"
-TF_VERSION="v1.7.0"
+TF_VERSION="v1.8.0"
 
 # export tensorflow variables to configure
 TF_BUILD_VARS="TF_NEED_GDR=0"

diff --git a/build_tensorflow/configs/odroidc2.conf b/build_tensorflow/configs/odroidc2.conf
@@ -1,6 +1,6 @@
-TF_PATCH="no"
+TF_PATCH="yes"
 TF_PYTHON_VERSION="3.5"
-TF_VERSION="v1.7.0"
+TF_VERSION="v1.8.0"
 
 # export tensorflow variables to configure
 TF_BUILD_VARS="TF_NEED_GDR=0"

diff --git a/build_tensorflow/configs/rpi.conf b/build_tensorflow/configs/rpi.conf
@@ -1,6 +1,6 @@
-TF_PATCH="no"
+TF_PATCH="yes"
 TF_PYTHON_VERSION="3.5"
-TF_VERSION="v1.7.0"
+TF_VERSION="v1.8.0"
 
 # export tensorflow variables to configure
 TF_BUILD_VARS="TF_NEED_GDR=0"

diff --git a/build_tensorflow/configs/rpi_one.conf b/build_tensorflow/configs/rpi_one.conf
@@ -1,6 +1,6 @@
-TF_PATCH="no"
+TF_PATCH="yes"
 TF_PYTHON_VERSION="3.5"
-TF_VERSION="v1.7.0"
+TF_VERSION="v1.8.0"
 
 # export tensorflow variables to configure
 TF_BUILD_VARS="TF_NEED_GDR=0"

diff --git a/build_tensorflow/configs/rpi_one_openblas.conf b/build_tensorflow/configs/rpi_one_openblas.conf
@@ -2,9 +2,9 @@
 # see: https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/ci_build/pi/build_raspberry_pi.sh
 OPENBLAS_PATH="/tmp/openblas_install"
 
-TF_PATCH="no"
+TF_PATCH="yes"
 TF_PYTHON_VERSION="3.5"
-TF_VERSION="v1.7.0"
+TF_VERSION="v1.8.0"
 
 # export tensorflow variables to configure
 TF_BUILD_VARS="TF_NEED_GDR=0"

diff --git a/build_tensorflow/patch/tensorflow/v1.8.0/0001-fix-png-neon.patch b/build_tensorflow/patch/tensorflow/v1.8.0/0001-fix-png-neon.patch
@@ -0,0 +1,24 @@
+From cb8f9ba2742db33b65f4dce1df865048bbbd0f30 Mon Sep 17 00:00:00 2001
+From: temp <[email protected]>
+Date: Mon, 30 Apr 2018 21:34:06 +0000
+Subject: [PATCH] fix png neon
+
+---
+ third_party/png.BUILD | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/png.BUILD b/third_party/png.BUILD
+index 76ab32d69c..bc4551a509 100644
+--- a/third_party/png.BUILD
++++ b/third_party/png.BUILD
+@@ -35,6 +35,7 @@ cc_library(
+     ],
+     includes = ["."],
+     linkopts = ["-lm"],
++    copts = ["-DPNG_ARM_NEON_OPT=0"],
+     visibility = ["//visibility:public"],
+     deps = ["@zlib_archive//:zlib"],
+ )
+-- 
+2.11.0
+