Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 56f1d64

Browse files
ebrevdotensorflower-gardener
ebrevdo
authored and
tensorflower-gardener
committed
Fix dependencies bugs
Change: 116925769
1 parent 64dd5b5 commit 56f1d64

143 files changed

Lines changed: 4130 additions & 800 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: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
For bugs/issues, please fill in the following. The more information you
2-
provide, the more likely we can help you.
1+
GitHub issues are for bugs / installation problems / feature requests.
2+
For general support from the community, see [StackOverflow](https://stackoverflow.com/questions/tagged/tensorflow).
3+
To make bugs and feature requests more easy to find and organize, we close issues that are deemed
4+
out of scope for GitHub Issues and point people to StackOverflow.
5+
6+
For bugs or installation issues, please provide the following information.
7+
The more information you provide, the more easily we will be able to offer
8+
help and advice.
39

410
### Environment info
511
Operating System:

‎README.md‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
| **`Linux CPU`** | **`Linux GPU PIP`** | **`Mac OS CPU`** | **`Android`** |
77
|-------------------|----------------------|------------------|----------------|
8-
| [![Build Status](http://ci.tensorflow.org/buildStatus/icon?job=tensorflow-master)](http://ci.tensorflow.org/job/tensorflow-master) | [![Build Status](http://ci.tensorflow.org/buildStatus/icon?job=tensorflow-master-gpu_pip)](http://ci.tensorflow.org/job/tensorflow-master-gpu_pip) | [![Build Status](http://ci.tensorflow.org/buildStatus/icon?job=tensorflow-master-mac)](http://ci.tensorflow.org/job/tensorflow-master-mac) | [![Build Status](http://ci.tensorflow.org/buildStatus/icon?job=tensorflow-master-android)](http://ci.tensorflow.org/job/tensorflow-master-android) |
8+
| [![Build Status](http://ci.tensorflow.org/buildStatus/icon?job=tensorflow-master-cpu)](http://ci.tensorflow.org/job/tensorflow-master-cpu) | [![Build Status](http://ci.tensorflow.org/buildStatus/icon?job=tensorflow-master-gpu_pip)](http://ci.tensorflow.org/job/tensorflow-master-gpu_pip) | [![Build Status](http://ci.tensorflow.org/buildStatus/icon?job=tensorflow-master-mac)](http://ci.tensorflow.org/job/tensorflow-master-mac) | [![Build Status](http://ci.tensorflow.org/buildStatus/icon?job=tensorflow-master-android)](http://ci.tensorflow.org/job/tensorflow-master-android) |
99

1010
**TensorFlow** is an open source software library for numerical computation using
1111
data flow graphs. Nodes in the graph represent mathematical operations, while
@@ -27,7 +27,14 @@ tracking requests and bugs, but please see
2727
and discussion.**
2828

2929
## Installation
30-
*See [Download and Setup](tensorflow/g3doc/get_started/os_setup.md).*
30+
*See [Download and Setup](tensorflow/g3doc/get_started/os_setup.md) for instructions on how to install our release binaries or how to build from source.*
31+
32+
People who are a little bit adventurous can also try our nightly binaries:
33+
34+
* Linux CPU only: [Python 2](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=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-0.7.1-cp27-none-linux_x86_64.whl) ([build history](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/)) / [Python 3](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=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-0.7.1-py3-none-any.whl) ([build history](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/))
35+
* Linux GPU: [Python 2](http://ci.tensorflow.org/view/Nightly/job/nigntly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.7.1-py2-none-any.whl) ([build history](http://ci.tensorflow.org/view/Nightly/job/nigntly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-slave/)) / [Python 3](http://ci.tensorflow.org/view/Nightly/job/nigntly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.7.1-py3-none-any.whl) ([build history](http://ci.tensorflow.org/view/Nightly/job/nigntly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-slave/))
36+
* Mac CPU only: [Python 2](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=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-0.7.1-py2-none-any.whl) ([build history](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=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-0.7.1-py3-none-any.whl) ([build history](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
37+
* [Android](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-android/TF_BUILD_CONTAINER_TYPE=ANDROID,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=NO_PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=android-slave/lastSuccessfulBuild/artifact/bazel-out/local_linux/bin/tensorflow/examples/android/tensorflow_demo.apk) ([build history](http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-android/TF_BUILD_CONTAINER_TYPE=ANDROID,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=NO_PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=android-slave/))
3138

3239
#### *Try your first TensorFlow program*
3340
```python
@@ -46,6 +53,9 @@ Hello, TensorFlow!
4653
```
4754

4855
##For more information
56+
4957
* [TensorFlow website](http://tensorflow.org)
5058
* [TensorFlow whitepaper](http://download.tensorflow.org/paper/whitepaper2015.pdf)
51-
* [Tensorflow MOOC on Udacity] (https://www.udacity.com/course/deep-learning--ud730)
59+
* [TensorFlow MOOC on Udacity] (https://www.udacity.com/course/deep-learning--ud730)
60+
61+
The TensorFlow community has created amazing things with TensorFlow, please see the [resources section of tensorflow.org](https://www.tensorflow.org/versions/master/resources#community) for an incomplete list.

‎RELEASE.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# Release 0.7.1
2+
3+
## Bug Fixes and Other Changes
4+
5+
* Added gfile.Open and gfile.Copy, used by input_data.py.
6+
* Fixed Saver bug when MakeDirs tried to create empty directory.
7+
* GPU Pip wheels are built with cuda 7.5 and cudnn-v4, making them
8+
required for the binary releases. Lower versions of cuda/cudnn can
9+
be supported by installing from sources and setting the options
10+
during ./configure
11+
* Fix dataset encoding example for Python3 (@danijar)
12+
* Fix PIP installation by not packaging protobuf as part of wheel,
13+
require protobuf 3.0.0b2.
14+
* Fix Mac pip installation of numpy by requiring pip >= 1.10.1.
15+
* Improvements and fixes to Docker image.
16+
17+
118
# Release 0.7.0
219

320
## Major Features and Improvements

‎configure‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,18 @@ while true; do
9999
else
100100
TF_CUDNN_EXT=".$TF_CUDNN_VERSION"
101101
fi
102-
if [ -e "$CUDNN_INSTALL_PATH/libcudnn.so${CUDNNEXT}" -o -e "$CUDNN_INSTALL_PATH/lib64/libcudnn.so${TF_CUDNN_EXT}" ]; then
102+
if [ -e "$CUDNN_INSTALL_PATH/libcudnn.so${TF_CUDNN_EXT}" -o -e "$CUDNN_INSTALL_PATH/lib64/libcudnn.so${TF_CUDNN_EXT}" ]; then
103+
break
104+
fi
105+
CUDNN_PATH_FROM_LDCONFIG="$(ldconfig -p | sed -n 's/.*libcudnn.so .* => \(.*\)/\1/p')"
106+
if [ -e "${CUDNN_PATH_FROM_LDCONFIG}${TF_CUDNN_EXT}" ]; then
107+
CUDNN_INSTALL_PATH="$(dirname ${CUDNN_PATH_FROM_LDCONFIG})"
103108
break
104109
fi
105110
echo "Invalid path to cuDNN ${TF_CUDNN_VERSION} toolkit. Neither of the following two files can be found:"
106111
echo "$CUDNN_INSTALL_PATH/lib64/libcudnn.so${TF_CUDNN_EXT}"
107112
echo "$CUDNN_INSTALL_PATH/libcudnn.so${TF_CUDNN_EXT}"
113+
echo "${CUDNN_PATH_FROM_LDCONFIG}${TF_CUDNN_EXT}"
108114
if [ -z "$fromuser" ]; then
109115
exit 1
110116
fi

‎tensorflow/BUILD‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ cc_binary(
5454
],
5555
)
5656

57+
cc_binary(
58+
name = "libtensorflow_cc.so",
59+
linkshared = 1,
60+
deps = [
61+
"//tensorflow/cc:cc_ops",
62+
"//tensorflow/core:tensorflow",
63+
],
64+
)
65+
5766
py_library(
5867
name = "tensorflow_py",
5968
srcs = ["__init__.py"],

‎tensorflow/contrib/cmake/CMakeLists.txt‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Minimum CMake required
2+
cmake_minimum_required(VERSION 2.8)
3+
4+
# Project
5+
project(tensorflow C CXX)
6+
7+
# Actual source is the ../../.. directory
8+
get_filename_component(tf_contrib_source_dir ${tensorflow_SOURCE_DIR} PATH)
9+
get_filename_component(tf_tf_source_dir ${tf_contrib_source_dir} PATH)
10+
get_filename_component(tensorflow_source_dir ${tf_tf_source_dir} PATH)
11+
12+
# [CLEANUP] Not sure if this is needed (copied from Protobuf)
13+
# CMake policies
14+
cmake_policy(SET CMP0022 NEW)
15+
16+
# Options
17+
option(tensorflow_VERBOSE "Enable for verbose output" OFF)
18+
option(tensorflow_BUILD_TESTS "Build tests" ON)
19+
20+
#Threads: defines CMAKE_THREAD_LIBS_INIT and adds -pthread compile option for
21+
# targets that link ${CMAKE_THREAD_LIBS_INIT}.
22+
find_package (Threads)
23+
24+
# [CLEANUP] Remove when done
25+
# For debugging
26+
function(SHOW_VARIABLES)
27+
get_cmake_property(_variableNames VARIABLES)
28+
foreach (_variableName ${_variableNames})
29+
message(STATUS "${_variableName}=${${_variableName}}")
30+
endforeach()
31+
endfunction()
32+
33+
# External dependencies
34+
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/external)
35+
36+
# Location where external projects will be downloaded
37+
set (DOWNLOAD_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/downloads"
38+
CACHE PATH "Location where external projects will be downloaded.")
39+
mark_as_advanced(DOWNLOAD_LOCATION)
40+
41+
# External dependencies
42+
include(png)
43+
include(jpeg)
44+
include(re2)
45+
include(eigen)
46+
47+
# Let's get to work!
48+
include(tf_core_framework.cmake)
49+
include(tf_stream_executor.cmake)
50+
include(tf_core_cpu.cmake)
51+
include(tf_models.cmake)
52+
include(tf_core_ops.cmake)
53+
include(tf_core_direct_session.cmake)
54+
include(tf_core_kernels.cmake)
55+
include(tf_cc_ops.cmake)
56+
include(tf_tutorials.cmake)
57+
58+
if (tensorflow_BUILD_TESTS)
59+
include(tests.cmake)
60+
endif (tensorflow_BUILD_TESTS)
61+
62+
include(install.cmake)

0 commit comments

Comments
 (0)