Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Print default when CUDA and CuDNN versions are not specified #11460

Merged
merged 4 commits into from Jul 13, 2017
Merged

Print default when CUDA and CuDNN versions are not specified #11460

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43484cc
Fix sanity status reporting.
yifeif Jun 16, 2017
8861888
Merge branch 'master' of https://github.com/tensorflow/tensorflow
yifeif Jul 12, 2017
8dc8930
Print default when CUDA and CuDNN versions are not specified.
yifeif Jul 12, 2017
6ad2642
Simplify setting variables.
yifeif Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 6 additions & 10 deletions configure
View file
Open in desktop
Expand Up @@ -492,6 +492,8 @@ while true; do
if [ -z "$TF_CUDA_VERSION" ]; then
read -p "Please specify the CUDA SDK version you want to use, e.g. 7.0. [Leave empty to default to CUDA 8.0]: " TF_CUDA_VERSION
fi
# Set default CUDA version if not set
TF_CUDA_VERSION=${TF_CUDA_VERSION:-8.0}

fromuser=""
if [ -z "$CUDA_TOOLKIT_PATH" ]; then
Expand Down Expand Up @@ -545,11 +547,7 @@ while true; do
CUDA_TOOLKIT_PATH=""
done

# Set default CUDA version if not set
if [ -z "$TF_CUDA_VERSION" ]; then
TF_CUDA_VERSION="8.0"
export TF_CUDA_VERSION
fi
export TF_CUDA_VERSION
write_action_env_to_bazelrc "TF_CUDA_VERSION" "$TF_CUDA_VERSION"

# Set up which gcc nvcc should use as the host compiler
Expand Down Expand Up @@ -587,6 +585,8 @@ while true; do
if [ -z "$TF_CUDNN_VERSION" ]; then
read -p "Please specify the cuDNN version you want to use. [Leave empty to default to cuDNN 6.0]: " TF_CUDNN_VERSION
fi
# Set default CUDNN version if not set
TF_CUDNN_VERSION=${TF_CUDNN_VERSION:-6}

fromuser=""
if [ -z "$CUDNN_INSTALL_PATH" ]; then
Expand Down Expand Up @@ -659,11 +659,7 @@ while true; do
CUDNN_INSTALL_PATH=""
done

# Set default CUDNN version if not set
if [ -z "$TF_CUDNN_VERSION" ]; then
TF_CUDNN_VERSION="6"
export TF_CUDNN_VERSION
fi
export TF_CUDNN_VERSION
write_action_env_to_bazelrc "TF_CUDNN_VERSION" "$TF_CUDNN_VERSION"

# Configure the compute capabilities that TensorFlow builds for.
Expand Down