aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
diff options
context:
space:
mode:
authorGravatar Rasmus Munk Larsen <rmlarsen@google.com>2018-05-16 14:04:48 -0700
committerGravatar Rasmus Munk Larsen <rmlarsen@google.com>2018-05-16 14:04:48 -0700
commitb8d36774faafa89ffc016c2c35f7e906035b2fa5 (patch)
tree6a5997c5e458ca98aa83bc7d66bbdd5091318f6e /unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
parent812480baa340f2d8b0bc21b3f2d227168280ad06 (diff)
Rename clip2 to clamp.
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h')
-rw-r--r--unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
index adadb5afc..0efcd6253 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
@@ -488,8 +488,8 @@ struct functor_traits<GaussianGenerator<T, Index, NumDims> > {
};
template <typename Scalar>
-struct scalar_clip2_op {
- EIGEN_DEVICE_FUNC inline scalar_clip2_op(const Scalar& _min, const Scalar& _max) : m_min(_min), m_max(_max) {}
+struct scalar_clamp_op {
+ EIGEN_DEVICE_FUNC inline scalar_clamp_op(const Scalar& _min, const Scalar& _max) : m_min(_min), m_max(_max) {}
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar
operator()(const Scalar& x) const {
return numext::mini(numext::maxi(x, m_min), m_max);
@@ -503,7 +503,7 @@ struct scalar_clip2_op {
const Scalar m_max;
};
template<typename Scalar>
-struct functor_traits<scalar_clip2_op<Scalar> >
+struct functor_traits<scalar_clamp_op<Scalar> >
{ enum { Cost = 2 * NumTraits<Scalar>::AddCost, PacketAccess = (packet_traits<Scalar>::HasMin && packet_traits<Scalar>::HasMax)}; };
} // end namespace internal