diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2018-05-16 09:49:24 -0700 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2018-05-16 09:49:24 -0700 |
| commit | 812480baa340f2d8b0bc21b3f2d227168280ad06 (patch) | |
| tree | c489a6dee8aa4544fde47032c5bae183d4897997 /unsupported/Eigen/CXX11/src/Tensor/TensorBase.h | |
| parent | afec3021f731d053254fe64983fc0623fff507f9 (diff) | |
Rename scalar_clip_op to scalar_clip2_op to prevent collision with existing functor in TensorFlow.
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorBase.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h index c8dc3bbc5..497e2a797 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h @@ -210,9 +210,9 @@ class TensorBase<Derived, ReadOnlyAccessors> } EIGEN_DEVICE_FUNC - EIGEN_STRONG_INLINE const TensorCwiseUnaryOp<internal::scalar_clip_op<Scalar>, const Derived> + EIGEN_STRONG_INLINE const TensorCwiseUnaryOp<internal::scalar_clip2_op<Scalar>, const Derived> clip(Scalar min, Scalar max) const { - return unaryExpr(internal::scalar_clip_op<Scalar>(min, max)); + return unaryExpr(internal::scalar_clip2_op<Scalar>(min, max)); } EIGEN_DEVICE_FUNC |