diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2017-12-22 12:42:59 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-12-22 12:46:28 -0800 |
| commit | e4532d20973c4c00854492362665317551661c18 (patch) | |
| tree | 398527e29bd30d39237adb4785be5069fdb646fa /tensorflow/compiler/xla/util.h | |
| parent | 673641c2d6a27fa97ee05453d671853731a4c602 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 179953488
Diffstat (limited to 'tensorflow/compiler/xla/util.h')
| -rw-r--r-- | tensorflow/compiler/xla/util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tensorflow/compiler/xla/util.h b/tensorflow/compiler/xla/util.h index b722095d1f..277cc5ec86 100644 --- a/tensorflow/compiler/xla/util.h +++ b/tensorflow/compiler/xla/util.h @@ -239,11 +239,14 @@ std::vector<T> Permute(tensorflow::gtl::ArraySlice<int64> permutation, // Override of the above that works around compile failures with gcc 7.1.1. // For details see https://github.com/tensorflow/tensorflow/issues/10843 +// Hide this workaround from MSVC as it causes ambiguous error. +#ifndef _MSC_VER template <typename T> std::vector<T> Permute(tensorflow::gtl::ArraySlice<int64> permutation, const std::vector<T>& input) { return Permute<std::vector, T>(permutation, input); } +#endif // Inverts a permutation, i.e., output_permutation[input_permutation[i]] = i. std::vector<int64> InversePermutation( |