add release 1.13.1

PatWie · Jun 20, 2019 · 874dedf · 874dedf
1 parent f98883f
commit 874dedf
Show file tree

Hide file tree

Showing 6 changed files with 373 additions and 30 deletions.
diff --git a/.drone.script b/.drone.script
@@ -1,13 +1,16 @@
 def main():
   return [
+      # tf_version, ubuntu_version, cuda_version, bazel_version, go_version
+      build_pipeline_new("1.13.1", "16.04", "10.0", "0.19.2", "1.10"),
+      # old docker images are spearated
       build_pipeline("1.12.0", "16.04", "10.0", "0.16.1", "1.11"),
       build_pipeline("1.11.0", "16.04", "10.0", "0.16.1", "1.11"),
       build_pipeline("1.10.0", "16.04", "9.2", "0.16.1", "1.10"),
       build_pipeline("1.9.0", "16.04", "9.0", "0.11.0", "1.10"),
   ]
 
 
-def custom_op_step(image):
+def custom_op_step(image, src_dir):
   return {
       'name': 'custom_op',
       'pull': 'never',
@@ -21,7 +24,7 @@ def custom_op_step(image):
   }
 
 
-def inference_cc_step(image):
+def inference_cc_step(image, src_dir):
   return {
       'name': 'inference_cc',
       'pull': 'never',
@@ -34,12 +37,12 @@ def inference_cc_step(image):
       ],
       'environment': {
           'TENSORFLOW_BUILD_DIR': '/tensorflow_dist',
-          'TENSORFLOW_SOURCE_DIR': '/tensorflow'
+          'TENSORFLOW_SOURCE_DIR': src_dir
       }
   }
 
 
-def inference_c_step(image):
+def inference_c_step(image, src_dir):
   return {
       'name': 'inference_c',
       'pull': 'never',
@@ -52,16 +55,16 @@ def inference_c_step(image):
       ],
       'environment': {
           'TENSORFLOW_BUILD_DIR': '/tensorflow_dist',
-          'TENSORFLOW_SOURCE_DIR': '/tensorflow'
+          'TENSORFLOW_SOURCE_DIR': src_dir
       }
   }
 
 
-def inference_go_step(image, go_version, tf_version):
+def inference_go_step(image, tf_version, src_dir):
   return {
       'name': 'inference_go',
       'pull': 'never',
-      'image': '%s-go%s' % (image, go_version),
+      'image': image,
       'commands': [
           'export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}',
           'export LD_LIBRARY_PATH=/tensorflow_dist:$${LD_LIBRARY_PATH}',
@@ -77,12 +80,12 @@ def inference_go_step(image, go_version, tf_version):
       ],
       'environment': {
           'TENSORFLOW_BUILD_DIR': '/tensorflow_dist',
-          'TENSORFLOW_SOURCE_DIR': '/tensorflow'
+          'TENSORFLOW_SOURCE_DIR': src_dir
       }
   }
 
 
-def example_keras(image):
+def example_keras(image, src_dir):
   return {
       'name': 'example_keras',
       'pull': 'never',
@@ -95,12 +98,12 @@ def example_keras(image):
       ],
       'environment': {
           'TENSORFLOW_BUILD_DIR': '/tensorflow_dist',
-          'TENSORFLOW_SOURCE_DIR': '/tensorflow'
+          'TENSORFLOW_SOURCE_DIR': src_dir
       }
   }
 
 
-def example_simple(image):
+def example_simple(image, src_dir):
   return {
       'name': 'example_simple',
       'pull': 'never',
@@ -113,16 +116,16 @@ def example_simple(image):
       ],
       'environment': {
           'TENSORFLOW_BUILD_DIR': '/tensorflow_dist',
-          'TENSORFLOW_SOURCE_DIR': '/tensorflow'
+          'TENSORFLOW_SOURCE_DIR': src_dir
       }
   }
 
 
-def example_resize(image):
+def example_resize(image, src_dir):
   return {
       'name': 'example_resize',
       'pull': 'never',
-      'image': '%s-opencv3.4.2' % image,
+      'image': image,
       'commands': [
           'export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}',
           'cd examples/resize/',
@@ -131,12 +134,12 @@ def example_resize(image):
       ],
       'environment': {
           'TENSORFLOW_BUILD_DIR': '/tensorflow_dist',
-          'TENSORFLOW_SOURCE_DIR': '/tensorflow'
+          'TENSORFLOW_SOURCE_DIR': src_dir
       }
   }
 
 
-def event_writer(image):
+def event_writer(image, src_dir):
   return {
       'name': 'event_writer',
       'pull': 'never',
@@ -149,14 +152,38 @@ def event_writer(image):
       ],
       'environment': {
           'TENSORFLOW_BUILD_DIR': '/tensorflow_dist',
-          'TENSORFLOW_SOURCE_DIR': '/tensorflow'
+          'TENSORFLOW_SOURCE_DIR': src_dir
       }
   }
 
 
 def build_pipeline(tf_version, ubuntu_version, cuda_version, bazel_version, go_version):
   img = 'tensorflow:ubuntu%s-cuda%s-bazel%s-tensorflow%s' % (
       ubuntu_version, cuda_version, bazel_version, tf_version)
+  img_opencv = '%s-opencv3.4.2' % img
+  img_go = '%s-go%s' % (img, go_version)
+  return {
+      'kind': 'pipeline',
+      'name': 'TensorFlow %s' % tf_version,
+      'platform': {
+          'os': "linux",
+          'arch': 'amd64',
+      },
+      'steps': [
+          custom_op_step(img, '/tensorflow'),
+          inference_cc_step(img, '/tensorflow'),
+          inference_c_step(img, '/tensorflow'),
+          inference_go_step(img_go, tf_version, '/tensorflow'),
+          example_keras(img, '/tensorflow'),
+          example_simple(img, '/tensorflow'),
+          example_resize(img_opencv, '/tensorflow'),
+          event_writer(img, '/tensorflow'),
+      ]
+  }
+
+
+def build_pipeline_new(tf_version, ubuntu_version, cuda_version, bazel_version, go_version):
+  img = 'tensorflow-cmake:%s-devel' % (tf_version)
   return {
       'kind': 'pipeline',
       'name': 'TensorFlow %s' % tf_version,
@@ -165,13 +192,13 @@ def build_pipeline(tf_version, ubuntu_version, cuda_version, bazel_version, go_v
           'arch': 'amd64',
       },
       'steps': [
-          custom_op_step(img),
-          inference_cc_step(img),
-          inference_c_step(img),
-          inference_go_step(img, go_version, tf_version),
-          example_keras(img),
-          example_simple(img),
-          example_resize(img),
-          event_writer(img),
+          custom_op_step(img, '/tensorflow_src'),
+          inference_cc_step(img, '/tensorflow_src'),
+          inference_c_step(img, '/tensorflow_src'),
+          inference_go_step(img, tf_version, '/tensorflow_src'),
+          example_keras(img, '/tensorflow_src'),
+          example_simple(img, '/tensorflow_src'),
+          example_resize(img, '/tensorflow_src'),
+          event_writer(img, '/tensorflow_src'),
       ]
   }
diff --git a/.drone.yml b/.drone.yml
@@ -1,3 +1,112 @@
+---
+kind: pipeline
+name: TensorFlow 1.13.1
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: custom_op
+  pull: never
+  image: tensorflow-cmake:1.13.1-devel
+  commands:
+  - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}"
+  - cd custom_op/user_ops
+  - cmake . -DPYTHON_EXECUTABLE=python2
+  - make
+
+- name: inference_cc
+  pull: never
+  image: tensorflow-cmake:1.13.1-devel
+  commands:
+  - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}"
+  - cd inference/cc/
+  - cmake . -DPYTHON_EXECUTABLE=python2
+  - make
+  environment:
+    TENSORFLOW_BUILD_DIR: /tensorflow_dist
+    TENSORFLOW_SOURCE_DIR: /tensorflow_src
+
+- name: inference_c
+  pull: never
+  image: tensorflow-cmake:1.13.1-devel
+  commands:
+  - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}"
+  - cd inference/c/
+  - cmake . -DPYTHON_EXECUTABLE=python2
+  - make
+  environment:
+    TENSORFLOW_BUILD_DIR: /tensorflow_dist
+    TENSORFLOW_SOURCE_DIR: /tensorflow_src
+
+- name: inference_go
+  pull: never
+  image: tensorflow-cmake:1.13.1-devel
+  commands:
+  - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}"
+  - "export LD_LIBRARY_PATH=/tensorflow_dist:$${LD_LIBRARY_PATH}"
+  - "export LD_LIBRARY_PATH=$${TENSORFLOW_BUILD_DIR}/:$${LD_LIBRARY_PATH}"
+  - "export LIBRARY_PATH=$${TENSORFLOW_BUILD_DIR}/:$${LIBRARY_PATH}"
+  - WDIR=$PWD
+  - mkdir -p $GOPATH/src/github.com/tensorflow
+  - cd $GOPATH/src/github.com/tensorflow
+  - git clone -b v1.13.1 --single-branch --depth 1 https://github.com/tensorflow/tensorflow.git
+  - cd $WDIR
+  - cd inference/go/
+  - ./build.sh
+  environment:
+    TENSORFLOW_BUILD_DIR: /tensorflow_dist
+    TENSORFLOW_SOURCE_DIR: /tensorflow_src
+
+- name: example_keras
+  pull: never
+  image: tensorflow-cmake:1.13.1-devel
+  commands:
+  - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}"
+  - cd examples/keras/
+  - cmake . -DPYTHON_EXECUTABLE=python2
+  - make
+  environment:
+    TENSORFLOW_BUILD_DIR: /tensorflow_dist
+    TENSORFLOW_SOURCE_DIR: /tensorflow_src
+
+- name: example_simple
+  pull: never
+  image: tensorflow-cmake:1.13.1-devel
+  commands:
+  - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}"
+  - cd examples/simple/
+  - cmake . -DPYTHON_EXECUTABLE=python2
+  - make
+  environment:
+    TENSORFLOW_BUILD_DIR: /tensorflow_dist
+    TENSORFLOW_SOURCE_DIR: /tensorflow_src
+
+- name: example_resize
+  pull: never
+  image: tensorflow-cmake:1.13.1-devel
+  commands:
+  - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}"
+  - cd examples/resize/
+  - cmake . -DPYTHON_EXECUTABLE=python2
+  - make
+  environment:
+    TENSORFLOW_BUILD_DIR: /tensorflow_dist
+    TENSORFLOW_SOURCE_DIR: /tensorflow_src
+
+- name: event_writer
+  pull: never
+  image: tensorflow-cmake:1.13.1-devel
+  commands:
+  - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$${LD_LIBRARY_PATH}"
+  - cd examples/event_writer/
+  - cmake . -DPYTHON_EXECUTABLE=python2
+  - make
+  environment:
+    TENSORFLOW_BUILD_DIR: /tensorflow_dist
+    TENSORFLOW_SOURCE_DIR: /tensorflow_src
+
 ---
 kind: pipeline
 name: TensorFlow 1.12.0
@@ -436,6 +545,6 @@ steps:
 
 ---
 kind: signature
-hmac: ec5f915cb3b7a78e5589858f8c040f7ea20b25864f9dcf8f189d4b2bc6caa642
+hmac: b15900693226398445e907aa7854bfee88fbcb3a6feb8862bcd76fd2e40185e0
 
 ...
diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@ This collection contains **reliable** and **dead-simple** examples to use Tensor
 
 The implementation is tested against the following versions
 
-| TensorFlow  v1.9.0 | TensorFlow  v1.10.0 | TensorFlow  v1.11.0 | TensorFlow  v1.12.0 |
-| ------ | ------ | ------ | ------ |
-| [![Build Status TensorFlow](https://ci.patwie.com/api/badges/PatWie/tensorflow-cmake/TensorFlow%201.9.0/status.svg)](http://ci.patwie.com/PatWie/tensorflow-cmake) | [![Build Status TensorFlow](https://ci.patwie.com/api/badges/PatWie/tensorflow-cmake/TensorFlow%201.10.0/status.svg)](http://ci.patwie.com/PatWie/tensorflow-cmake) | [![Build Status TensorFlow](https://ci.patwie.com/api/badges/PatWie/tensorflow-cmake/TensorFlow%201.11.0/status.svg)](http://ci.patwie.com/PatWie/tensorflow-cmake) | [![Build Status TensorFlow](https://ci.patwie.com/api/badges/PatWie/tensorflow-cmake/TensorFlow%201.12.0/status.svg)](http://ci.patwie.com/PatWie/tensorflow-cmake) |
+| TensorFlow  v1.9.0 | TensorFlow  v1.10.0 | TensorFlow  v1.11.0 | TensorFlow  v1.12.0 | TensorFlow  v1.13.1 |
+| ------ | ------ | ------ | ------ | ------ |
+| [![Build Status TensorFlow](https://ci.patwie.com/api/badges/PatWie/tensorflow-cmake/TensorFlow%201.9.0/status.svg)](http://ci.patwie.com/PatWie/tensorflow-cmake) | [![Build Status TensorFlow](https://ci.patwie.com/api/badges/PatWie/tensorflow-cmake/TensorFlow%201.10.0/status.svg)](http://ci.patwie.com/PatWie/tensorflow-cmake) | [![Build Status TensorFlow](https://ci.patwie.com/api/badges/PatWie/tensorflow-cmake/TensorFlow%201.11.0/status.svg)](http://ci.patwie.com/PatWie/tensorflow-cmake) | [![Build Status TensorFlow](https://ci.patwie.com/api/badges/PatWie/tensorflow-cmake/TensorFlow%201.12.0/status.svg)](http://ci.patwie.com/PatWie/tensorflow-cmake) | [![Build Status TensorFlow](https://ci.patwie.com/api/badges/PatWie/tensorflow-cmake/TensorFlow%201.13.1/status.svg)](http://ci.patwie.com/PatWie/tensorflow-cmake) |
 
 The repository contains the following examples.
 

diff --git a/cmake/modules/FindTensorFlow.cmake b/cmake/modules/FindTensorFlow.cmake
@@ -123,7 +123,7 @@ else()
     # However, only TensorFlow versions 1.9, 1.10 support all header files
     # for custom ops.
     set(_TensorFlow_KNOWN_VERSIONS ${TensorFlow_ADDITIONAL_VERSIONS}
-        "1.9" "1.9.0" "1.10" "1.10.0" "1.11" "1.11.0" "1.12" "1.12.0")
+        "1.9" "1.9.0" "1.10" "1.10.0" "1.11" "1.11.0" "1.12" "1.12.0" "1.13" "1.13.1")
     set(_TensorFlow_TEST_VERSIONS)
 
     if(TF_FIND_VERSION)
@@ -180,6 +180,14 @@ else()
     set(TF_DISABLE_ASSERTS "TRUE")
   endif()
 
+  if("${TF_DETECTED_VERSION}" VERSION_EQUAL "1.13")
+    set(TF_DISABLE_ASSERTS "TRUE")
+  endif()
+
+  if("${TF_DETECTED_VERSION}" VERSION_EQUAL "1.13.1")
+    set(TF_DISABLE_ASSERTS "TRUE")
+  endif()
+
 endif()
 
 

diff --git a/dockerfiles/Makefile b/dockerfiles/Makefile
@@ -0,0 +1,6 @@
+
+t13:
+	sudo docker build \
+	  --build-arg CHECKOUT_TF_SRC=1 \
+	  -t tensorflow-cmake:1.13.1-devel \
+	  -f tensorflow-cmake-1.13.1-devel.Dockerfile .