Merge pull request tensorflow#54 from lissyx/mmap-master

Add GraphDef Memmapped conversion tool
lissyx · Feb 15, 2018 · 1cab2eb · 1cab2eb
2 parents af77743 + 68c2993
commit 1cab2eb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/tc-build.sh b/tc-build.sh
@@ -21,7 +21,7 @@ pushd ${DS_ROOT_TASK}/DeepSpeech/tf/
 
     # Pure amd64 CPU-only build
     if [ "${build_gpu}" = "no" -a "${build_arm}" = "no" ]; then
-        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_OPT_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_GRAPH_TRANSFORMS} ${BUILD_TARGET_GRAPH_SUMMARIZE} ${BUILD_TARGET_GRAPH_BENCHMARK} ${BUILD_TARGET_AOT_DEPS}
+        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_OPT_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_GRAPH_TRANSFORMS} ${BUILD_TARGET_GRAPH_SUMMARIZE} ${BUILD_TARGET_GRAPH_BENCHMARK} ${BUILD_TARGET_CONVERT_MMAP} ${BUILD_TARGET_AOT_DEPS}
     fi
 
     # Cross RPi3 CPU-only build

diff --git a/tc-package.sh b/tc-package.sh
@@ -13,6 +13,10 @@ cp ${DS_ROOT_TASK}/DeepSpeech/tf/bazel-bin/tensorflow/tools/graph_transforms/tra
 cp ${DS_ROOT_TASK}/DeepSpeech/tf/bazel-bin/tensorflow/tools/graph_transforms/summarize_graph ${TASKCLUSTER_ARTIFACTS}
 cp ${DS_ROOT_TASK}/DeepSpeech/tf/bazel-bin/tensorflow/tools/benchmark/benchmark_model ${TASKCLUSTER_ARTIFACTS}
 
+if [ -f "${DS_ROOT_TASK}/DeepSpeech/tf/bazel-bin/tensorflow/contrib/util/convert_graphdef_memmapped_format" ]; then
+    cp ${DS_ROOT_TASK}/DeepSpeech/tf/bazel-bin/tensorflow/contrib/util/convert_graphdef_memmapped_format ${TASKCLUSTER_ARTIFACTS}
+fi;
+
 # It seems that bsdtar and gnutar are behaving a bit differently on the way
 # they deal with --exclude="./public/*" ; this caused ./DeepSpeech/tensorflow/core/public/
 # to be ditched when we just wanted to get rid of ./public/ on OSX.

diff --git a/tc-vars.sh b/tc-vars.sh
@@ -105,6 +105,7 @@ BUILD_TARGET_LIB_CPP_API="//tensorflow:libtensorflow_cc.so"
 BUILD_TARGET_GRAPH_TRANSFORMS="//tensorflow/tools/graph_transforms:transform_graph"
 BUILD_TARGET_GRAPH_SUMMARIZE="//tensorflow/tools/graph_transforms:summarize_graph"
 BUILD_TARGET_GRAPH_BENCHMARK="//tensorflow/tools/benchmark:benchmark_model"
+BUILD_TARGET_CONVERT_MMAP="//tensorflow/contrib/util:convert_graphdef_memmapped_format"
 
 ## Use lstm_layer_inference as a pre-building target. This is a tf_library
 ## code-path, so it should build us everything to get tfcompile ready to run