aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-12-11 12:24:50 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-12-11 12:24:50 +0000
commite3e8059989ea103cda4492e4280d879dcadbd7a5 (patch)
treebcf6e873bd14ab7398ab44a9b13ac7f84b957005
parent5c1e4908e0f06aea5354a296d1195c5bff7a321e (diff)
parent27ef72d57481d30746748836996881b7b359e0dc (diff)
downloadeigen-e3e8059989ea103cda4492e4280d879dcadbd7a5.tar.gz
Snap for 4496165 from 27ef72d57481d30746748836996881b7b359e0dc to pi-release
Change-Id: I311ef41b561dd8d0632f4c9cfe78aa15cbd42aa9
-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
*