component/tensorflow: version up 1.0.1.

component/tensorflow/buildout.cfg

@@ -26,28 +26,16 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 recipe = plone.recipe.command
 stop-on-error = true
 repository = https://github.com/tensorflow/tensorflow
-tag = v0.12.0
+tag = v1.0.1
 git-binary = ${git:location}/bin/git
 patch-binary = ${patch:location}/bin/patch
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = export HOME=${:location}; (${:git-binary} clone --recurse-submodules --quiet -b ${:tag} ${:repository} ${:location}; cd ${buildout:parts-directory} ; ${:patch-binary} -p1 -d ${:_buildout_section_name_} < ${:_profile_base_location_}/tensorflow-v0.12.0.patch ) || (rm -fr ${:location}; exit 1)
-
-[template-tensorflow-bzl]
-recipe = slapos.recipe.template:jinja2
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 640
-filename = tensorflow.bzl
-template = ${:_profile_base_location_}/${:filename}.in
-rendered = ${:location}/${:filename}
-tf_extension_linkopts = '-lrt', '-Wl,-rpath=${gcc:location}/lib64'
-context =
-    key tf_extension_linkopts template-tensorflow-bzl:tf_extension_linkopts
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = export HOME=${:location}; (${:git-binary} clone --recurse-submodules --quiet -b ${:tag} ${:repository} ${:location}; cd ${buildout:parts-directory} ; ${:patch-binary} -p1 -d ${:_buildout_section_name_} < ${:_profile_base_location_}/tensorflow-v1.0.1.patch ) || (rm -fr ${:location}; exit 1)
 
 [cuda]
 tf_need_cuda = 1
 tf_cuda_version = 8.0
-tf_cudnn_version = 6.5
+tf_cudnn_version = 5.1.10
 tf_cuda_compute_capabilities = 5.2,6.1
 cuda_toolkit_path = /usr/local/cuda
 cudnn_install_path = /usr/local/cuda
@@ -55,7 +43,6 @@ cudnn_install_path = /usr/local/cuda
 [tensorflow-build]
 recipe = slapos.recipe.build
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-tensorflow-bzl-file-path = ${template-tensorflow-bzl:rendered}
 workdir = ${tensorflow-repository:location}
 gcc-bin = ${gcc:location}/bin
 gcc-lib = ${gcc:location}/lib
@@ -79,6 +66,9 @@ script =
                                   os.environ.get('LIBRARY_PATH') or '']),
          'PYTHON_BIN_PATH':self.options['numpy-python-command'],
          'PYTHON_LIB_PATH':self.options['python27-lib'],
+         'CC_OPT_FLAGS':'-march=native',
+         'TF_NEED_JEMALLOC':'1',
+         'TF_ENABLE_XLA':'0',
          'TF_NEED_GCP':'0',
          'TF_NEED_HDFS':'0',
          'TF_NEED_OPENCL':'0',
@@ -96,8 +86,6 @@ script =
   if not os.path.exists(env['CUDA_TOOLKIT_PATH']): env['TF_NEED_CUDA'] = '0'
   env['LD_LIBRARY_PATH'] = env['LIBRARY_PATH']
   env['LDFLAGS'] = '-lW,-rpath='+self.options['gcc-lib64']
-  shutil.copy(self.options['tensorflow-bzl-file-path'],
-              os.path.join(workdir, 'tensorflow', 'tensorflow.bzl'))
   call(['./configure'], cwd=workdir, env=env)
   bazel_command = (env['TF_NEED_CUDA'] == '1' and
     ['bazel', 'build', '-c', 'opt', '--copt', '-march=native', '--config', 'cuda', '-s', '--verbose_failures', '//tensorflow/tools/pip_package:build_pip_package']
@@ -116,7 +104,7 @@ egg = tensorflow
 script =
   os.makedirs(location)
   workdir = self.options['tensorflow-repository-path']
-  egg_name = 'tensorflow-0.12.0-py2.7-linux-x86_64.egg'
+  egg_name = 'tensorflow-1.0.1-py2.7-linux-x86_64.egg'
   dist_dir = os.path.join(workdir, 'dist')
   dest_dir = os.path.join(self.buildout['buildout']['eggs-directory'], egg_name)
   call(['bazel-bin/tensorflow/tools/pip_package/build_pip_package', dist_dir], cwd=workdir)

component/tensorflow/tensorflow-v0.12.0.patch

-diff -N -u -r tensorflow.orig/tensorflow/tools/pip_package/build_pip_package.sh tensorflow/tensorflow/tools/pip_package/build_pip_package.sh
---- tensorflow.orig/tensorflow/tools/pip_package/build_pip_package.sh   2017-01-04 12:16:06.540748399 +0900
-+++ tensorflow/tensorflow/tools/pip_package/build_pip_package.sh        2017-01-04 12:16:19.852748187 +0900
-@@ -136,7 +136,7 @@
-   pushd ${TMPDIR}
-   rm -f MANIFEST
-   echo $(date) : "=== Building wheel"
--  "${PYTHON_BIN_PATH:-python}" setup.py bdist_wheel ${GPU_FLAG} >/dev/null
-+  "${PYTHON_BIN_PATH:-python}" setup.py bdist_egg ${GPU_FLAG} >/dev/null
-   mkdir -p ${DEST}
-   cp dist/* ${DEST}
-   popd
-diff -N -u -r tensorflow.orig/tensorflow/tools/pip_package/setup.py tensorflow/tensorflow/tools/pip_package/setup.py
---- tensorflow.orig/tensorflow/tools/pip_package/setup.py       2017-01-04 12:16:06.540748399 +0900
-+++ tensorflow/tensorflow/tools/pip_package/setup.py    2017-01-04 12:17:29.836747073 +0900
-@@ -34,7 +34,7 @@
- REQUIRED_PACKAGES = [
-     'numpy >= 1.11.0',
-     'six >= 1.10.0',
--    'protobuf == 3.1.0',
-+    'protobuf == 3.1.0.post1',
- ]
- 
- project_name = 'tensorflow'
-diff -N -u -r tensorflow.orig/tensorflow/workspace.bzl tensorflow/tensorflow/workspace.bzl
---- tensorflow.orig/tensorflow/workspace.bzl    2017-01-04 12:16:06.568748399 +0900
-+++ tensorflow/tensorflow/workspace.bzl 2017-01-04 12:16:19.852748187 +0900
-@@ -228,9 +228,9 @@
- 
-   native.new_http_archive(
-     name = "zlib_archive",
--    url = "http://zlib.net/zlib-1.2.8.tar.gz",
--    sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
--    strip_prefix = "zlib-1.2.8",
-+    url = "https://github.com/madler/zlib/archive/v1.2.9.zip",
-+    sha256 = "819936ec260b679726f21dd9c1ef9c553ce0281988842c24a9c42652cbca698a",
-+    strip_prefix = "zlib-1.2.9",
-     build_file = str(Label("//:zlib.BUILD")),
-   )
- 

component/tensorflow/tensorflow-v1.0.1.patch

+diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh
+index e2bee21..1df90c1 100755
+--- a/tensorflow/tools/pip_package/build_pip_package.sh
++++ b/tensorflow/tools/pip_package/build_pip_package.sh
+@@ -136,7 +136,7 @@ function main() {
+   pushd ${TMPDIR}
+   rm -f MANIFEST
+   echo $(date) : "=== Building wheel"
+-  "${PYTHON_BIN_PATH:-python}" setup.py bdist_wheel ${GPU_FLAG} >/dev/null
++  "${PYTHON_BIN_PATH:-python}" setup.py bdist_egg ${GPU_FLAG} >/dev/null
+   mkdir -p ${DEST}
+   cp dist/* ${DEST}
+   popd