Skip to content

Commit 25931d6

Browse files
memomemo
committed
update headers to tensorflow r1.1
1 parent e26a874 commit 25931d6

File tree

340 files changed

+8613
-2386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

340 files changed

+8613
-2386
lines changed

‎libs/tensorflow/include/Eigen/PardisoSupport

100644100755
File mode changed.

‎libs/tensorflow/include/Eigen/src/Cholesky/LDLT.h

-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ template<typename _MatrixType, int _UpLo> class LDLT
258258

259259
#ifndef EIGEN_PARSED_BY_DOXYGEN
260260
template<typename RhsType, typename DstType>
261-
EIGEN_DEVICE_FUNC
262261
void _solve_impl(const RhsType &rhs, DstType &dst) const;
263262
#endif
264263

‎libs/tensorflow/include/Eigen/src/Cholesky/LLT.h

-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ template<typename _MatrixType, int _UpLo> class LLT
200200

201201
#ifndef EIGEN_PARSED_BY_DOXYGEN
202202
template<typename RhsType, typename DstType>
203-
EIGEN_DEVICE_FUNC
204203
void _solve_impl(const RhsType &rhs, DstType &dst) const;
205204
#endif
206205

‎libs/tensorflow/include/Eigen/src/Core/ArrayBase.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ template<typename Derived> class ArrayBase
175175
*/
176176
template<typename Derived>
177177
template<typename OtherDerived>
178-
EIGEN_STRONG_INLINE Derived &
178+
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived &
179179
ArrayBase<Derived>::operator-=(const ArrayBase<OtherDerived> &other)
180180
{
181181
call_assignment(derived(), other.derived(), internal::sub_assign_op<Scalar,typename OtherDerived::Scalar>());
@@ -188,7 +188,7 @@ ArrayBase<Derived>::operator-=(const ArrayBase<OtherDerived> &other)
188188
*/
189189
template<typename Derived>
190190
template<typename OtherDerived>
191-
EIGEN_STRONG_INLINE Derived &
191+
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived &
192192
ArrayBase<Derived>::operator+=(const ArrayBase<OtherDerived>& other)
193193
{
194194
call_assignment(derived(), other.derived(), internal::add_assign_op<Scalar,typename OtherDerived::Scalar>());
@@ -201,7 +201,7 @@ ArrayBase<Derived>::operator+=(const ArrayBase<OtherDerived>& other)
201201
*/
202202
template<typename Derived>
203203
template<typename OtherDerived>
204-
EIGEN_STRONG_INLINE Derived &
204+
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived &
205205
ArrayBase<Derived>::operator*=(const ArrayBase<OtherDerived>& other)
206206
{
207207
call_assignment(derived(), other.derived(), internal::mul_assign_op<Scalar,typename OtherDerived::Scalar>());
@@ -214,7 +214,7 @@ ArrayBase<Derived>::operator*=(const ArrayBase<OtherDerived>& other)
214214
*/
215215
template<typename Derived>
216216
template<typename OtherDerived>
217-
EIGEN_STRONG_INLINE Derived &
217+
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived &
218218
ArrayBase<Derived>::operator/=(const ArrayBase<OtherDerived>& other)
219219
{
220220
call_assignment(derived(), other.derived(), internal::div_assign_op<Scalar,typename OtherDerived::Scalar>());

‎libs/tensorflow/include/Eigen/src/Core/Assign.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Eigen {
1616

1717
template<typename Derived>
1818
template<typename OtherDerived>
19-
EIGEN_STRONG_INLINE Derived& DenseBase<Derived>
19+
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived& DenseBase<Derived>
2020
::lazyAssign(const DenseBase<OtherDerived>& other)
2121
{
2222
enum{

‎libs/tensorflow/include/Eigen/src/Core/Assign_MKL.h

100644100755
File mode changed.

‎libs/tensorflow/include/Eigen/src/Core/BooleanRedux.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct any_unroller<Derived, Dynamic, Rows>
7676
* \sa any(), Cwise::operator<()
7777
*/
7878
template<typename Derived>
79-
inline bool DenseBase<Derived>::all() const
79+
EIGEN_DEVICE_FUNC inline bool DenseBase<Derived>::all() const
8080
{
8181
typedef internal::evaluator<Derived> Evaluator;
8282
enum {
@@ -100,7 +100,7 @@ inline bool DenseBase<Derived>::all() const
100100
* \sa all()
101101
*/
102102
template<typename Derived>
103-
inline bool DenseBase<Derived>::any() const
103+
EIGEN_DEVICE_FUNC inline bool DenseBase<Derived>::any() const
104104
{
105105
typedef internal::evaluator<Derived> Evaluator;
106106
enum {
@@ -124,7 +124,7 @@ inline bool DenseBase<Derived>::any() const
124124
* \sa all(), any()
125125
*/
126126
template<typename Derived>
127-
inline Eigen::Index DenseBase<Derived>::count() const
127+
EIGEN_DEVICE_FUNC inline Eigen::Index DenseBase<Derived>::count() const
128128
{
129129
return derived().template cast<bool>().template cast<Index>().sum();
130130
}

‎libs/tensorflow/include/Eigen/src/Core/CommaInitializer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ struct CommaInitializer
141141
* \sa CommaInitializer::finished(), class CommaInitializer
142142
*/
143143
template<typename Derived>
144-
inline CommaInitializer<Derived> DenseBase<Derived>::operator<< (const Scalar& s)
144+
EIGEN_DEVICE_FUNC inline CommaInitializer<Derived> DenseBase<Derived>::operator<< (const Scalar& s)
145145
{
146146
return CommaInitializer<Derived>(*static_cast<Derived*>(this), s);
147147
}
148148

149149
/** \sa operator<<(const Scalar&) */
150150
template<typename Derived>
151151
template<typename OtherDerived>
152-
inline CommaInitializer<Derived>
152+
EIGEN_DEVICE_FUNC inline CommaInitializer<Derived>
153153
DenseBase<Derived>::operator<<(const DenseBase<OtherDerived>& other)
154154
{
155155
return CommaInitializer<Derived>(*static_cast<Derived *>(this), other);

‎libs/tensorflow/include/Eigen/src/Core/CoreEvaluators.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,19 @@ struct evaluator_base
134134
// this helper permits to completely eliminate m_outerStride if it is known at compiletime.
135135
template<typename Scalar,int OuterStride> class plainobjectbase_evaluator_data {
136136
public:
137-
plainobjectbase_evaluator_data(const Scalar* ptr, Index outerStride) : data(ptr)
137+
EIGEN_DEVICE_FUNC plainobjectbase_evaluator_data(const Scalar* ptr, Index outerStride) : data(ptr)
138138
{
139139
EIGEN_ONLY_USED_FOR_DEBUG(outerStride);
140140
eigen_internal_assert(outerStride==OuterStride);
141141
}
142-
Index outerStride() const { return OuterStride; }
142+
EIGEN_DEVICE_FUNC Index outerStride() const { return OuterStride; }
143143
const Scalar *data;
144144
};
145145

146146
template<typename Scalar> class plainobjectbase_evaluator_data<Scalar,Dynamic> {
147147
public:
148-
plainobjectbase_evaluator_data(const Scalar* ptr, Index outerStride) : data(ptr), m_outerStride(outerStride) {}
149-
Index outerStride() const { return m_outerStride; }
148+
EIGEN_DEVICE_FUNC plainobjectbase_evaluator_data(const Scalar* ptr, Index outerStride) : data(ptr), m_outerStride(outerStride) {}
149+
EIGEN_DEVICE_FUNC Index outerStride() const { return m_outerStride; }
150150
const Scalar *data;
151151
protected:
152152
Index m_outerStride;

‎libs/tensorflow/include/Eigen/src/Core/CwiseBinaryOp.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class CwiseBinaryOpImpl
158158
*/
159159
template<typename Derived>
160160
template<typename OtherDerived>
161-
EIGEN_STRONG_INLINE Derived &
161+
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived &
162162
MatrixBase<Derived>::operator-=(const MatrixBase<OtherDerived> &other)
163163
{
164164
call_assignment(derived(), other.derived(), internal::sub_assign_op<Scalar,typename OtherDerived::Scalar>());
@@ -171,7 +171,7 @@ MatrixBase<Derived>::operator-=(const MatrixBase<OtherDerived> &other)
171171
*/
172172
template<typename Derived>
173173
template<typename OtherDerived>
174-
EIGEN_STRONG_INLINE Derived &
174+
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Derived &
175175
MatrixBase<Derived>::operator+=(const MatrixBase<OtherDerived>& other)
176176
{
177177
call_assignment(derived(), other.derived(), internal::add_assign_op<Scalar,typename OtherDerived::Scalar>());
@@ -181,4 +181,3 @@ MatrixBase<Derived>::operator+=(const MatrixBase<OtherDerived>& other)
181181
} // end namespace Eigen
182182

183183
#endif // EIGEN_CWISE_BINARY_OP_H
184-

0 commit comments

Comments
 (0)