aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2017-12-19 01:46:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-12-19 01:46:53 +0000
commit00175dcad8703b141e828263f0badb13a7235485 (patch)
treebcf6e873bd14ab7398ab44a9b13ac7f84b957005
parentbb839ac14c90a912161a7929e3cdc07a96ae434d (diff)
parent05fe67c386a82856cd937d5d3ba91e926d465817 (diff)
downloadeigen-00175dcad8703b141e828263f0badb13a7235485.tar.gz
Merge "Remove the workaround for Eigen sigmoid_op" am: ede6582296
am: 05fe67c386 Change-Id: I4c19021f7f8458035d166e17cf9476b339e151f9
-rw-r--r--Eigen/src/Core/functors/UnaryFunctors.h31
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
*