diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-19 01:39:08 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-19 01:39:08 +0000 |
commit | ede65822961df0d338afadbf52035ffad4092aff (patch) | |
tree | bcf6e873bd14ab7398ab44a9b13ac7f84b957005 | |
parent | 92c16a1393d199de10c88b960bdd7c7e58b76210 (diff) | |
parent | 0079d84c19827463adbdff5d17c9ad86c89556b0 (diff) | |
download | eigen-ede65822961df0d338afadbf52035ffad4092aff.tar.gz |
Merge "Remove the workaround for Eigen sigmoid_op"
-rw-r--r-- | Eigen/src/Core/functors/UnaryFunctors.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/Eigen/src/Core/functors/UnaryFunctors.h b/Eigen/src/Core/functors/UnaryFunctors.h index 581a3c93a..2e6a00ffd 100644 --- a/Eigen/src/Core/functors/UnaryFunctors.h +++ b/Eigen/src/Core/functors/UnaryFunctors.h @@ -14,37 +14,6 @@ namespace Eigen { namespace internal { -// Copied from unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h -// TODO: remove or update after upstream -/** \internal - * \brief Template functor to compute the sigmoid of a scalar - * \sa class CwiseUnaryOp, ArrayBase::sigmoid() - */ -template <typename T> -struct scalar_sigmoid_op { - EIGEN_EMPTY_STRUCT_CTOR(scalar_sigmoid_op) - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T operator()(const T& x) const { - const T one = T(1); - return one / (one + numext::exp(-x)); - } - - template <typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - Packet packetOp(const Packet& x) const { - const Packet one = pset1<Packet>(T(1)); - return pdiv(one, padd(one, pexp(pnegate(x)))); - } -}; - -template <typename T> -struct functor_traits<scalar_sigmoid_op<T> > { - enum { - Cost = NumTraits<T>::AddCost * 2 + NumTraits<T>::MulCost * 6, - PacketAccess = packet_traits<T>::HasAdd && packet_traits<T>::HasDiv && - packet_traits<T>::HasNegate && packet_traits<T>::HasExp - }; -}; - - /** \internal * \brief Template functor to compute the opposite of a scalar * |