diff options
| author |  Vijay Vasudevan <vrv@google.com> | 2015-11-11 18:45:21 -0800 |
|---|---|---|
| committer | Vijay Vasudevan <vrv@google.com> | 2015-11-11 18:45:21 -0800 |
| commit | f2102f4e2c1c87f1d1bf9ab856a2849c54478760 (patch) | |
| tree | 54ffdbb4081d6e75d4e626682ea9c70e6866599b /tensorflow/core/platform/test.cc | |
| parent | 3961abed9560cd852fff4add393b451483bbc3af (diff) | |
TensorFlow: upstream changes from the afternoon.
Changes:
- futurize --stage2 changes for Python 3 compatibility by @girving.
- Small updates to documentation by @vrv, schuster and others
- Account for failure of std::thread::hardware_concurrency by @ebrevdo.
- More changes for backwards-compatibility tests by Josh
- Updates to python op doc generation by Josh
- Added support for using the best-fit allocator via ConfigProto by @vrv.
- Rename LocalSession to DirectSession, since local was a bad name for
it.
- Enable tf.nn.moments() to work with tensors of unknown shape by @mrry.
GITHUB_ISSUE: 139
- Changes for Android build by Andrew.
Base CL: 107645181
Diffstat (limited to 'tensorflow/core/platform/test.cc')
| -rw-r--r-- | tensorflow/core/platform/test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tensorflow/core/platform/test.cc b/tensorflow/core/platform/test.cc index 21c6905683..afc5cc57be 100644 --- a/tensorflow/core/platform/test.cc +++ b/tensorflow/core/platform/test.cc @@ -8,8 +8,7 @@ namespace tensorflow { namespace testing { -#if defined(PLATFORM_GOOGLE) || defined(PLATFORM_POSIX_ANDROID) || \ - defined(PLATFORM_GOOGLE_ANDROID) +#if defined(PLATFORM_GOOGLE) || defined(__ANDROID__) string TmpDir() { return FLAGS_test_tmpdir; } int RandomSeed() { return FLAGS_test_random_seed; } #else |