From a7d60270d564a2aa7ece58f1c3d9fad8c7def594 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Wed, 29 Mar 2017 19:21:36 +0200 Subject: [PATCH] Replay of #8637: Add the corresponding --action_env to .bazelrc from ./configure The original PR got overriden by bc456e361d49d1d89a74b80060c70efb51fd7d87 This will make the fetch phase reproducible so the refetch does not happens unless people re-run configure (the environment variable are stored in the .bazelrc file). Fixes #8619. --- configure | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configure b/configure index 3a4c296f076..654436e2ab4 100755 --- a/configure +++ b/configure @@ -289,6 +289,7 @@ while ! is_windows && true; do fi if [ -e "$GCC_HOST_COMPILER_PATH" ]; then export GCC_HOST_COMPILER_PATH + echo "build --action_env GCC_HOST_COMPILER_PATH=$GCC_HOST_COMPILER_PATH" >>.bazelrc break fi echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2 @@ -339,7 +340,9 @@ while true; do if [ -e "${CUDA_TOOLKIT_PATH}/${CUDA_RT_LIB_PATH}" ]; then export CUDA_TOOLKIT_PATH + echo "build --action_env CUDA_TOOLKIT_PATH=$CUDA_TOOLKIT_PATH" >>.bazelrc export TF_CUDA_VERSION + echo "build --action_env TF_CUDA_VERSION=$TF_CUDA_VERSION" >>.bazelrc break fi echo "Invalid path to CUDA $TF_CUDA_VERSION toolkit. ${CUDA_TOOLKIT_PATH}/${CUDA_RT_LIB_PATH} cannot be found" @@ -391,7 +394,9 @@ while true; do if [ -e "$CUDNN_INSTALL_PATH/${CUDA_DNN_LIB_ALT_PATH}" -o -e "$CUDNN_INSTALL_PATH/${CUDA_DNN_LIB_PATH}" ]; then export TF_CUDNN_VERSION + echo "build --action_env TF_CUDNN_VERSION=$TF_CUDNN_VERSION" >>.bazelrc export CUDNN_INSTALL_PATH + echo "build --action_env CUDNN_INSTALL_PATH=$CUDNN_INSTALL_PATH" >>.bazelrc break fi @@ -404,7 +409,9 @@ while true; do CUDNN_PATH_FROM_LDCONFIG="$($LDCONFIG_BIN -p | sed -n 's/.*libcudnn.so .* => \(.*\)/\1/p')" if [ -e "${CUDNN_PATH_FROM_LDCONFIG}${TF_CUDNN_EXT}" ]; then export TF_CUDNN_VERSION + echo "build --action_env TF_CUDNN_VERSION=$TF_CUDNN_VERSION" >>.bazelrc export CUDNN_INSTALL_PATH="$(dirname ${CUDNN_PATH_FROM_LDCONFIG})" + echo "build --action_env CUDNN_INSTALL_PATH=$CUDNN_INSTALL_PATH" >>.bazelrc break fi fi @@ -456,6 +463,7 @@ EOF fi else export TF_CUDA_COMPUTE_CAPABILITIES + echo "build --action_env TF_CUDA_COMPUTE_CAPABILITIES=$TF_CUDA_COMPUTE_CAPABILITIES" >>.bazelrc break fi TF_CUDA_COMPUTE_CAPABILITIES=""