Skip to content

Commit 692fad2

Browse files
ringwtensorflower-gardener
authored andcommitted
Merge changes from github.
Change: 155209832
1 parent b329dd8 commit 692fad2

101 files changed

Lines changed: 2167 additions & 1375 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ISSUE_TEMPLATE.md

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
1-
Please go to Stack Overflow for help and support. http://stackoverflow.com/questions/tagged/tensorflow
1+
Please go to Stack Overflow for help and support:
2+
3+
http://stackoverflow.com/questions/tagged/tensorflow
4+
25
If you open a GitHub issue, here is our policy:
36

4-
1. It must be a bug or feature request.
7+
1. It must be a bug or a feature request.
58
2. The form below must be filled out.
69

7-
**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g. fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
10+
**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g., fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
811

912
------------------------
1013

11-
Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
14+
### System information
15+
- **Have I written custom code (as opposed to using a stock example script provided in TensorFlow)**:
16+
- **OS Platform and Distribution (e.g., Linux Ubuntu 16.04)**:
17+
- **TensorFlow installed from (source or binary)**:
18+
- **TensorFlow version (use command below)**:
19+
- **Bazel version (if compiling from source)**:
20+
- **CUDA/cuDNN version**:
21+
- **GPU model and memory**:
22+
- **Exact command to reproduce**:
1223

13-
### System Information
14-
- *Have I written custom code (as opposed to using a stock example script provided in TensorFlow)?*:
15-
- *OS Platform and Distribution (i.e. Linux Ubuntu 16.0)*:
16-
- *TensorFlow installed from (source or binary)?*:
17-
- *TensorFlow version* (use command below):
18-
- *Bazel version (if compiling from source)*:
19-
- *CUDA/cuDNN version*:
20-
- *GPU Model and Memory*:
21-
- *Exact command to reproduce*:
24+
You can collect some of this information using our environment capture script:
2225

23-
You can collect some of this information using our environment capture script https://github.com/tensorflow/tensorflow/blob/master/tools/
24-
You can collect the TensorFlow version with
25-
```sh
26-
python -c "import tensorflow as tf; print (tf.GIT_VERSION, tf.VERSION)"
27-
```
26+
https://github.com/tensorflow/tensorflow/tree/master/tools/tf_env_collect.sh
2827

28+
You can obtain the TensorFlow version with
2929

30-
### Describe the problem clearly
30+
python -c "import tensorflow as tf; print(tf.GIT_VERSION, tf.VERSION)"
31+
32+
### Describe the problem
33+
Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
3134

32-
### Source Code / Logs
33-
Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full-traceback. Large logs and files should be attached. Try to reproducible test-case code the bare-minimum necessary to generate the problem
35+
### Source code / logs
36+
Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full traceback. Large logs and files should be attached. Try to provide a reproducible test case that is the bare minimum necessary to generate the problem.

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,20 @@ guidelines](CONTRIBUTING.md).**
2626

2727
**We use [GitHub issues](https://github.com/tensorflow/tensorflow/issues) for
2828
tracking requests and bugs, but please see
29-
[Community](tensorflow/docs_src/about/index.md#community) for general questions
29+
[Community](https://www.tensorflow.org/community/) for general questions
3030
and discussion.**
3131

3232
## Installation
3333
*See [Installing TensorFlow](https://www.tensorflow.org/install/) for instructions on how to install our release binaries or how to build from source.*
3434

3535
People who are a little more adventurous can also try our nightly binaries:
3636

37-
38-
* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
39-
* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
40-
* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
41-
* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
42-
* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
43-
* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
37+
* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
38+
* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
39+
* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
40+
* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
41+
* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
42+
* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
4443
* Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
4544
([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
4645

RELEASE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changes since the last release
22

33
## Major Features and Improvements
4+
* Added `tf.layers.conv3d_transpose` layer for spatio temporal deconvolution.
45
* Added `tf.Session.make_callable()`, which provides a lower overhead means of running a similar step multiple times.
56
* Added ibverbs-based RDMA support to contrib (courtesy @junshi15 from Yahoo).
67
* `RNNCell` objects now subclass `tf.layers._Layer`. The strictness described

configure

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,9 @@ function is_windows() {
3535
fi
3636
}
3737

38-
function sed_hyphen_i() {
39-
if is_macos; then
40-
sed -i '' "$@"
41-
else
42-
sed -i "$@"
43-
fi
38+
function sed_in_place() {
39+
sed -e $1 $2 > "$2.bak"
40+
mv "$2.bak" $2
4441
}
4542

4643
function write_to_bazelrc() {
@@ -170,7 +167,7 @@ function setup_python {
170167
rm -f .tf_configure.bazelrc
171168
touch .tf_configure.bazelrc
172169
touch .bazelrc
173-
sed_hyphen_i "/tf_configure/d" .bazelrc
170+
sed_in_place "/tf_configure/d" .bazelrc
174171
echo "import %workspace%/.tf_configure.bazelrc" >> .bazelrc
175172

176173
# Delete any leftover BUILD files from the Makefile build, which would interfere
@@ -409,31 +406,6 @@ done
409406
export TF_CUDA_CLANG
410407
write_action_env_to_bazelrc "TF_CUDA_CLANG" "$TF_CUDA_CLANG"
411408

412-
# Set up which gcc nvcc should use as the host compiler
413-
# No need to set this on Windows
414-
while [[ "$TF_CUDA_CLANG" != "1" ]] && ! is_windows && true; do
415-
fromuser=""
416-
if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
417-
default_gcc_host_compiler_path=$(which gcc || true)
418-
read -p "Please specify which gcc should be used by nvcc as the host compiler. [Default is $default_gcc_host_compiler_path]: " GCC_HOST_COMPILER_PATH
419-
fromuser="1"
420-
if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
421-
GCC_HOST_COMPILER_PATH="$default_gcc_host_compiler_path"
422-
fi
423-
fi
424-
if [ -e "$GCC_HOST_COMPILER_PATH" ]; then
425-
export GCC_HOST_COMPILER_PATH
426-
write_action_env_to_bazelrc "GCC_HOST_COMPILER_PATH" "$GCC_HOST_COMPILER_PATH"
427-
break
428-
fi
429-
echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2
430-
if [ -z "$fromuser" ]; then
431-
exit 1
432-
fi
433-
GCC_HOST_COMPILER_PATH=""
434-
# Retry
435-
done
436-
437409
# Set up which clang we should use as the cuda / host compiler.
438410
while [[ "$TF_CUDA_CLANG" == "1" ]] && true; do
439411
fromuser=""
@@ -474,6 +446,11 @@ while true; do
474446
else
475447
default_cuda_path="$(cygpath -m "$CUDA_PATH")"
476448
fi
449+
elif is_linux; then
450+
# If the default doesn't exist, try an alternative default.
451+
if [ ! -d $default_cuda_path ] && [ -d /opt/cuda ]; then
452+
default_cuda_path=/opt/cuda
453+
fi
477454
fi
478455
read -p "Please specify the location where CUDA $TF_CUDA_VERSION toolkit is installed. Refer to README.md for more details. [Default is $default_cuda_path]: " CUDA_TOOLKIT_PATH
479456
fromuser="1"
@@ -513,6 +490,35 @@ while true; do
513490
CUDA_TOOLKIT_PATH=""
514491
done
515492

493+
# Set up which gcc nvcc should use as the host compiler
494+
# No need to set this on Windows
495+
while [[ "$TF_CUDA_CLANG" != "1" ]] && ! is_windows && true; do
496+
fromuser=""
497+
if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
498+
default_gcc_host_compiler_path=$(which gcc || true)
499+
cuda_bin_symlink="$CUDA_TOOLKIT_PATH/bin/gcc"
500+
if [ -L "$cuda_bin_symlink" ]; then
501+
default_gcc_host_compiler_path=$(readlink $cuda_bin_symlink)
502+
fi
503+
read -p "Please specify which gcc should be used by nvcc as the host compiler. [Default is $default_gcc_host_compiler_path]: " GCC_HOST_COMPILER_PATH
504+
fromuser="1"
505+
if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
506+
GCC_HOST_COMPILER_PATH="$default_gcc_host_compiler_path"
507+
fi
508+
fi
509+
if [ -e "$GCC_HOST_COMPILER_PATH" ]; then
510+
export GCC_HOST_COMPILER_PATH
511+
write_action_env_to_bazelrc "GCC_HOST_COMPILER_PATH" "$GCC_HOST_COMPILER_PATH"
512+
break
513+
fi
514+
echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2
515+
if [ -z "$fromuser" ]; then
516+
exit 1
517+
fi
518+
GCC_HOST_COMPILER_PATH=""
519+
# Retry
520+
done
521+
516522
# Find out where the cuDNN library is installed
517523
while true; do
518524
# Configure the cuDNN version to use.

tensorflow/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ filegroup(
255255
"//tensorflow/contrib/seq2seq:all_files",
256256
"//tensorflow/contrib/session_bundle:all_files",
257257
"//tensorflow/contrib/session_bundle/example:all_files",
258+
"//tensorflow/contrib/signal:all_files",
258259
"//tensorflow/contrib/slim:all_files",
259260
"//tensorflow/contrib/slim/python/slim/data:all_files",
260261
"//tensorflow/contrib/slim/python/slim/nets:all_files",

tensorflow/contrib/batching/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ py_test(
181181
size = "small",
182182
srcs = ["python/ops/batch_ops_test.py"],
183183
srcs_version = "PY2AND3",
184+
tags = ["nomac"],
184185
deps = [
185186
":batch_py",
186187
"//tensorflow/python:framework_test_lib",

tensorflow/contrib/factorization/python/ops/gmm_ops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def _init_clusters_random(data, num_clusters, random_seed):
8585
maxval=math_ops.cast(num_data, dtypes.int64),
8686
seed=random_seed,
8787
dtype=dtypes.int64)
88-
indices = math_ops.cast(indices, dtypes.int32) % num_data
88+
indices %= math_ops.cast(num_data, dtypes.int64)
8989
clusters_init = embedding_lookup(data, indices, partition_strategy='div')
9090
return clusters_init
9191

0 commit comments

Comments
 (0)