diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2018-08-15 16:19:19 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-08-15 16:26:59 -0700 |
| commit | 698c9a1b6344af44e92eb7fbd2a656d7a19b43d3 (patch) | |
| tree | 9a619109b984551aabedd3eb2861c8c0775c9a00 /tensorflow/contrib/nccl | |
| parent | 82820a6b6263525781a16c9d5fbf745d3f24ebd7 (diff) | |
Make sure tensorrt and nccl kernels compile with newer versions of Eigen.
PiperOrigin-RevId: 208902416
Diffstat (limited to 'tensorflow/contrib/nccl')
| -rw-r--r-- | tensorflow/contrib/nccl/kernels/nccl_manager.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tensorflow/contrib/nccl/kernels/nccl_manager.h b/tensorflow/contrib/nccl/kernels/nccl_manager.h index 57a96c5d33..09fad35d23 100644 --- a/tensorflow/contrib/nccl/kernels/nccl_manager.h +++ b/tensorflow/contrib/nccl/kernels/nccl_manager.h @@ -20,6 +20,13 @@ limitations under the License. #include <unordered_map> #include <vector> +// TODO(rmlarsen): Get rid of this workaround. "gpu_assert" is defined when +// setting EIGEN_USE_THREADS. But when defining EIGEN_USE_THREADS here, +// incAtomic and other CUDA specific symbols are no longer recognized. +#ifndef gpu_assert +#define gpu_assert(x) +#endif + #include "third_party/nccl/nccl.h" #include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h" #include "tensorflow/core/framework/tensor.h" |