diff options
author | Gael Guennebaud <g.gael@free.fr> | 2018-08-13 21:28:20 +0000 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2018-08-13 21:28:20 +0000 |
commit | 3ec60215dfd010ecc3777e707d045a0f144304aa (patch) | |
tree | 279560d1ed0d807fa17f449994091163e789c3b0 /unsupported/Eigen/CXX11/src/Tensor/TensorBase.h | |
parent | 26239ee580e5ffbdcad657c291bf4f49e6b297cf (diff) | |
parent | 0f1b2e08a5d5ed9158435d12da60dfaa5e8b2803 (diff) |
Merged in rmlarsen/eigen2 (pull request PR-466)
Move sigmoid functor to core and rename it to 'logistic'.
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 ab3731952..9b9d330c1 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h @@ -200,9 +200,9 @@ class TensorBase<Derived, ReadOnlyAccessors> } EIGEN_DEVICE_FUNC - EIGEN_STRONG_INLINE const TensorCwiseUnaryOp<internal::scalar_sigmoid_op<Scalar>, const Derived> + EIGEN_STRONG_INLINE const TensorCwiseUnaryOp<internal::scalar_logistic_op<Scalar>, const Derived> sigmoid() const { - return unaryExpr(internal::scalar_sigmoid_op<Scalar>()); + return unaryExpr(internal::scalar_logistic_op<Scalar>()); } EIGEN_DEVICE_FUNC |