Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
码匠许师傅
Tensorflow
提交
1b26bb5f
T
Tensorflow
项目概览
码匠许师傅
/
Tensorflow
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Tensorflow
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1b26bb5f
编写于
12月 22, 2016
作者:
G
gunan
提交者:
GitHub
12月 22, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6463 from gunan/cp
Cherrypick doc updates to r0.12 branch.
上级
c62a66bc
50bef44c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
18 deletion
+25
-18
tensorflow/contrib/learn/python/learn/monitors.py
tensorflow/contrib/learn/python/learn/monitors.py
+2
-0
tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py
...orflow/contrib/slim/python/slim/data/tfexample_decoder.py
+9
-6
tensorflow/g3doc/api_docs/python/contrib.learn.monitors.md
tensorflow/g3doc/api_docs/python/contrib.learn.monitors.md
+2
-0
tensorflow/g3doc/get_started/os_setup.md
tensorflow/g3doc/get_started/os_setup.md
+12
-12
未找到文件。
tensorflow/contrib/learn/python/learn/monitors.py
浏览文件 @
1b26bb5f
...
...
@@ -68,6 +68,8 @@ Example:
x, y, steps=2, batch_size=1, monitors=[example_monitor])
```
## Ops
@@get_default_monitors
@@BaseMonitor
@@CaptureVariable
...
...
tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py
浏览文件 @
1b26bb5f
...
...
@@ -273,9 +273,10 @@ class Image(ItemHandler):
is stored.
format_key: the name of the TF-Example feature in which the image format
is stored.
shape: the output shape of the image. If provided, the image is reshaped
accordingly. If left as None, no reshaping is done. A shape should be
supplied only if all the stored images have the same shape.
shape: the output shape of the image as 1-D `Tensor`
[height, width, channels]. If provided, the image is reshaped
accordingly. If left as None, no reshaping is done. A shape should
be supplied only if all the stored images have the same shape.
channels: the number of channels in the image.
"""
if
not
image_key
:
...
...
@@ -300,11 +301,12 @@ class Image(ItemHandler):
"""Decodes the image buffer.
Args:
image_buffer: T tensor representing the encoded image tensor.
image_buffer: T
he
tensor representing the encoded image tensor.
image_format: The image format for the image in `image_buffer`.
Returns:
A decoder image.
A tensor that represents decoded image of self._shape, or
(?, ?, self._channels) if self._shape is not specified.
"""
def
decode_png
():
return
image_ops
.
decode_png
(
image_buffer
,
self
.
_channels
)
...
...
@@ -329,7 +331,8 @@ class Image(ItemHandler):
}
default_decoder
=
decode_jpg
image
=
control_flow_ops
.
case
(
pred_fn_pairs
,
default
=
default_decoder
,
exclusive
=
True
)
image
=
control_flow_ops
.
case
(
pred_fn_pairs
,
default
=
default_decoder
,
exclusive
=
True
)
image
.
set_shape
([
None
,
None
,
self
.
_channels
])
if
self
.
_shape
is
not
None
:
...
...
tensorflow/g3doc/api_docs/python/contrib.learn.monitors.md
浏览文件 @
1b26bb5f
...
...
@@ -58,6 +58,8 @@ Example:
x
,
y
,
steps
=
2
,
batch_size
=
1
,
monitors
=
[
example_monitor
])
```
## Ops
- - -
### `tf.contrib.learn.monitors.get_default_monitors(loss_op=None, summary_op=None, save_summary_steps=100, output_dir=None, summary_writer=None)` {#get_default_monitors}
...
...
tensorflow/g3doc/get_started/os_setup.md
浏览文件 @
1b26bb5f
...
...
@@ -8,11 +8,11 @@ github source.
The TensorFlow Python API supports Python 2.7 and Python 3.3+.
The GPU version works best with Cuda Toolkit 8.0 and
cuDNN v5. Other versions are supported (Cuda toolkit >= 7.0 and
cuDNN v5.
1.
Other versions are supported (Cuda toolkit >= 7.0 and
cuDNN >= v3) only when installing from sources.
Please see
[
Cuda installation
](
#optional-install-cuda-gpus-on-linux
)
for
details. For Mac OS X, please see
[
Setup GPU for
Mac
](
#optional-setup-gpu-for-mac
)
.
details. For Mac OS X, please see
[
Setup GPU for
Mac
](
#optional-setup-gpu-for-mac
)
.
## Overview
...
...
@@ -43,8 +43,8 @@ If you encounter installation errors, see
[
Pip
](
https://en.wikipedia.org/wiki/Pip_(package_manager
)
) is a package
management system used to install and manage software packages written in
Python. We provide pip packages for TensorFlow on Linux, Mac OS X, and
Windows. For Windows instructions, please see
[
Pip installation on
Windows
](
#pip-installation-on-windows
)
.
Windows. For Windows instructions, please see
[
Pip installation on
Windows
](
#pip-installation-on-windows
)
.
The packages that will be installed or upgraded during the pip install are
listed in the
[
REQUIRED_PACKAGES section of
...
...
@@ -507,7 +507,7 @@ the Docker container.
### (Optional, Linux) Enable GPU Support
If you installed the GPU version of TensorFlow, you must also install the Cuda
Toolkit 8.0 and cuDNN v5. Please see
[
Cuda
Toolkit 8.0 and cuDNN v5.
1.
Please see
[
Cuda
installation
](
#optional-install-cuda-gpus-on-linux
)
.
You also need to set the
`LD_LIBRARY_PATH`
and
`CUDA_HOME`
environment
...
...
@@ -661,7 +661,7 @@ Install the toolkit into e.g. `/usr/local/cuda`.
[
https://developer.nvidia.com/cudnn
](
https://developer.nvidia.com/cudnn
)
Download cuDNN v5.
Download cuDNN v5.
1.
Uncompress and copy the cuDNN files into the toolkit directory. Assuming the
toolkit is installed in
`/usr/local/cuda`
, run the following commands (edited
...
...
@@ -937,20 +937,20 @@ package:
```
bash
# Ubuntu/Linux 64-bit:
$
pip
install
--upgrade
https://storage.googleapis.com/tensorflow/linux/cpu/protobuf-3.
0
.0-cp27-none-linux_x86_64.whl
$
pip
install
--upgrade
https://storage.googleapis.com/tensorflow/linux/cpu/protobuf-3.
1
.0-cp27-none-linux_x86_64.whl
# Mac OS X:
$
pip
install
--upgrade
https://storage.googleapis.com/tensorflow/mac/cpu/protobuf-3.
0.0-cp27-cp27m
-macosx_10_11_x86_64.whl
$
pip
install
--upgrade
https://storage.googleapis.com/tensorflow/mac/cpu/protobuf-3.
1.0-cp27-none
-macosx_10_11_x86_64.whl
```
And for Python 3.5:
```
bash
# Ubuntu/Linux 64-bit:
$
pip3
install
--upgrade
https://storage.googleapis.com/tensorflow/linux/cpu/protobuf-3.
0.0-cp35-cp35m
-linux_x86_64.whl
$
pip3
install
--upgrade
https://storage.googleapis.com/tensorflow/linux/cpu/protobuf-3.
1.0-cp35-none
-linux_x86_64.whl
# Mac OS X:
$
pip3
install
--upgrade
https://storage.googleapis.com/tensorflow/mac/cpu/protobuf-3.
0.0-cp35-cp35m
-macosx_10_11_x86_64.whl
$
pip3
install
--upgrade
https://storage.googleapis.com/tensorflow/mac/cpu/protobuf-3.
1.0-cp35-none
-macosx_10_11_x86_64.whl
```
If your system/configuration is not listed above, you can use the following
...
...
@@ -1126,7 +1126,7 @@ Traceback (most recent call last):
TypeError: __init__() got an unexpected keyword argument 'syntax'
```
This is due to a conflict between protobuf versions (we require protobuf 3.
0
.0).
This is due to a conflict between protobuf versions (we require protobuf 3.
1
.0).
The best current solution is to make sure older versions of protobuf are not
installed, such as:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录