Skip to content

Commit 3961abe

Browse files
author
Vijay Vasudevan
committed
Upstream a number of changes to git.
Changes: - Updates to README / os_setup for common installation issues by ebrevdo, vrv, wicke, anelia, dga - Add a test for backwards compatibility checks by Josh - Simplifications to tiling/padding of scalars by bsteiner - Improve listing of devices when no devices are known by Matthieu Base CL: 107607137
1 parent 9a00a61 commit 3961abe

File tree

9 files changed

+512
-15
lines changed

9 files changed

+512
-15
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ installing from source, GPU-enabled support, etc., see
3131

3232
## Binary Installation
3333

34-
The TensorFlow Python API requires Python 2.7.
34+
The TensorFlow Python API currently requires Python 2.7: we are
35+
[working](https://github.com/tensorflow/tensorflow/issues/1) on adding support
36+
for Python 3.0.
3537

3638
The simplest way to install TensorFlow is using
3739
[pip](https://pypi.python.org/pypi/pip) for both Linux and Mac.
@@ -40,7 +42,7 @@ For the GPU-enabled version, or if you encounter installation errors, or for
4042
more detailed installation instructions, see
4143
[here](tensorflow/g3doc/get_started/os_setup.md#detailed_install).
4244

43-
### Ubuntu/Linux
45+
### Ubuntu/Linux 64-bit
4446

4547
```bash
4648
# For CPU-only version

tensorflow/core/common_runtime/local_session.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ LocalSession::LocalSession(const SessionOptions& options,
103103
int devices_added = 0;
104104
if (options.config.log_device_placement()) {
105105
const string mapping_str = device_mgr_->DeviceMappingString();
106-
printf("Device mapping:\n%s", mapping_str.c_str());
106+
if (mapping_str.empty()) {
107+
printf("Device mapping: no known devices.\n");
108+
} else {
109+
printf("Device mapping:\n%s", mapping_str.c_str());
110+
}
107111
LOG(INFO) << "Device mapping:\n" << mapping_str;
108112
}
109113
for (auto d : device_mgr_->ListDevices()) {

0 commit comments

Comments
 (0)