Skip to content

Commit

Permalink
TensorFlow: Upstream changes to git.
Browse files Browse the repository at this point in the history
Changes:
- Correct number of CPUs reported on mac.
- Doc updates.

Base CL: 107355041
  • Loading branch information
keveman committed Nov 9, 2015
1 parent 2d6c1bf commit 430a054
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
11 changes: 11 additions & 0 deletions navbar.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# TensorFlow

* [Home][home]
* [Getting Started](/tensorflow/g3doc/get_started/index.md)
* [Mechanics](/tensorflow/g3doc/how_tos/index.md)
* [Tutorials](/tensorflow/g3doc/tutorials/index.md)
* [Python API](/tensorflow/g3doc/api_docs/python/index.md)
* [C++ API](/tensorflow/g3doc/api_docs/cc/index.md)
* [Other Resources](/tensorflow/g3doc/resources/index.md)

[home]: /tensorflow/g3doc/index.md
6 changes: 6 additions & 0 deletions tensorflow/core/platform/posix/port.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
#ifdef SNAPPY
#include <snappy.h>
#endif
#if defined(__APPLE__) && defined(__MACH__)
#include <thread>
#endif

namespace tensorflow {
namespace port {
Expand All @@ -29,6 +32,9 @@ int NumSchedulableCPUs() {
return CPU_COUNT(&cpuset);
}
perror("sched_getaffinity");
#endif
#if defined(__APPLE__) && defined(__MACH__)
return std::thread::hardware_concurrency();
#endif
const int kDefaultCores = 4; // Semi-conservative guess
fprintf(stderr, "can't determine number of CPU cores: assuming %d\n",
Expand Down
11 changes: 0 additions & 11 deletions tensorflow/g3doc/navbar.md

This file was deleted.

0 comments on commit 430a054

Please sign in to comment.