Merge pull request tensorflow#48 from lissyx/monolithics

Add monolithic build flag and hide symbols
lissyx · Jan 18, 2018 · 7d79b8f · 7d79b8f
2 parents 1390dc1 + d2524f1
commit 7d79b8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/tc-build.sh b/tc-build.sh
@@ -17,7 +17,7 @@ if [ "$1" = "--arm" ]; then
 fi
 
 pushd ${DS_ROOT_TASK}/DeepSpeech/tf/
-    BAZEL_BUILD="bazel ${BAZEL_OUTPUT_USER_ROOT} build"
+    BAZEL_BUILD="bazel ${BAZEL_OUTPUT_USER_ROOT} build --config=monolithic"
 
     # We don't produce Python package for RPi3, so don't give a Python version there
     if [ ! -z "${PYENV_VERSION}" ]; then
@@ -28,17 +28,17 @@ 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} ${BUILD_TARGET_PIP} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LIB_FRAMEWORK} ${BUILD_TARGET_GRAPH_TRANSFORMS} ${BUILD_TARGET_GRAPH_SUMMARIZE} ${BUILD_TARGET_GRAPH_BENCHMARK} ${BUILD_TARGET_AOT_DEPS} && ./tensorflow/tools/pip_package/build_pip_package.sh ${TASKCLUSTER_ARTIFACTS}
+        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_OPT_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_PIP} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LIB_FRAMEWORK} ${BUILD_TARGET_GRAPH_TRANSFORMS} ${BUILD_TARGET_GRAPH_SUMMARIZE} ${BUILD_TARGET_GRAPH_BENCHMARK} ${BUILD_TARGET_AOT_DEPS} && ./tensorflow/tools/pip_package/build_pip_package.sh ${TASKCLUSTER_ARTIFACTS}
     fi
 
     # Cross RPi3 CPU-only build
     if [ "${build_gpu}" = "no" -a "${build_arm}" = "yes" ]; then
-        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_ARM_FLAGS} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LIB_FRAMEWORK} ${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_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LIB_FRAMEWORK} ${BUILD_TARGET_GRAPH_TRANSFORMS} ${BUILD_TARGET_GRAPH_SUMMARIZE} ${BUILD_TARGET_GRAPH_BENCHMARK} ${BUILD_TARGET_AOT_DEPS}
     fi
 
     # Pure amd64 GPU-enabled build
     if [ "${build_gpu}" = "yes" -a "${build_arm}" = "no" ]; then
-        eval "export ${TF_CUDA_FLAGS}" && (echo "" | TF_NEED_CUDA=1 ./configure) && ${BAZEL_BUILD} -c opt ${BAZEL_CUDA_FLAGS} ${BAZEL_OPT_FLAGS} ${BUILD_TARGET_PIP} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LIB_FRAMEWORK} ${BUILD_TARGET_GRAPH_TRANSFORMS} ${BUILD_TARGET_GRAPH_SUMMARIZE} ${BUILD_TARGET_GRAPH_BENCHMARK} && ./tensorflow/tools/pip_package/build_pip_package.sh ${TASKCLUSTER_ARTIFACTS} --gpu
+        eval "export ${TF_CUDA_FLAGS}" && (echo "" | TF_NEED_CUDA=1 ./configure) && ${BAZEL_BUILD} -c opt ${BAZEL_CUDA_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BAZEL_OPT_FLAGS} ${BUILD_TARGET_PIP} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LIB_FRAMEWORK} ${BUILD_TARGET_GRAPH_TRANSFORMS} ${BUILD_TARGET_GRAPH_SUMMARIZE} ${BUILD_TARGET_GRAPH_BENCHMARK} && ./tensorflow/tools/pip_package/build_pip_package.sh ${TASKCLUSTER_ARTIFACTS} --gpu
     fi
 
     if [ $? -ne 0 ]; then

diff --git a/tc-vars.sh b/tc-vars.sh
@@ -103,6 +103,7 @@ fi;
 TF_CUDA_FLAGS="TF_CUDA_CLANG=0 TF_CUDA_VERSION=8.0 TF_CUDNN_VERSION=6 CUDA_TOOLKIT_PATH=${DS_ROOT_TASK}/DeepSpeech/CUDA CUDNN_INSTALL_PATH=${DS_ROOT_TASK}/DeepSpeech/CUDA TF_CUDA_COMPUTE_CAPABILITIES=\"3.0,3.5,3.7,5.2,6.0,6.1\""
 BAZEL_ARM_FLAGS="--config=rpi3"
 BAZEL_CUDA_FLAGS="--config=cuda"
+BAZEL_EXTRA_FLAGS="--copt=-fvisibility=hidden"
 
 ### Define build targets that we will re-ues in sourcing scripts.
 BUILD_TARGET_PIP="//tensorflow/tools/pip_package:build_pip_package"