Skip to content

Commit

Permalink
Upstream a number of changes to git.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Vijay Vasudevan committed Nov 11, 2015
1 parent 9a00a61 commit 3961abe
Show file tree
Hide file tree
Showing 9 changed files with 512 additions and 15 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ installing from source, GPU-enabled support, etc., see

## Binary Installation

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

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

### Ubuntu/Linux
### Ubuntu/Linux 64-bit

```bash
# For CPU-only version
Expand Down
6 changes: 5 additions & 1 deletion tensorflow/core/common_runtime/local_session.cc
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@ LocalSession::LocalSession(const SessionOptions& options,
int devices_added = 0;
if (options.config.log_device_placement()) {
const string mapping_str = device_mgr_->DeviceMappingString();
printf("Device mapping:\n%s", mapping_str.c_str());
if (mapping_str.empty()) {
printf("Device mapping: no known devices.\n");
} else {
printf("Device mapping:\n%s", mapping_str.c_str());
}
LOG(INFO) << "Device mapping:\n" << mapping_str;
}
for (auto d : device_mgr_->ListDevices()) {
Expand Down
Loading

0 comments on commit 3961abe

Please sign in to comment.