diff options
| author |  Akshay Modi <nareshmodi@google.com> | 2018-06-11 15:04:30 -0700 |
|---|---|---|
| committer | Akshay Modi <nareshmodi@google.com> | 2018-06-11 15:04:30 -0700 |
| commit | 6d9c0ba224f5903375ae26f582ef233740477e29 (patch) | |
| tree | bfcaef48a56c6d3900d1db5a248e9d9f155c48e1 /third_party | |
| parent | a4b390bffbcb01d8f57f25c007277d457f752a69 (diff) | |
| parent | ab51450c817674c8ff08a7ae4f8ac50cdc4bed8b (diff) | |
Merge commit for internal changes
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/eigen_fix_cuda_compilation.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/third_party/eigen_fix_cuda_compilation.patch b/third_party/eigen_fix_cuda_compilation.patch deleted file mode 100644 index b921a7c31d..0000000000 --- a/third_party/eigen_fix_cuda_compilation.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h ---- a/Eigen/src/Core/ProductEvaluators.h -+++ b/Eigen/src/Core/ProductEvaluators.h -@@ -137,7 +137,7 @@ struct Assignment<DstXprType, Product<Lh - typename enable_if<(Options==DefaultProduct || Options==AliasFreeProduct)>::type> - { - typedef Product<Lhs,Rhs,Options> SrcXprType; -- static EIGEN_STRONG_INLINE -+ static EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<Scalar,Scalar> &) - { - Index dstRows = src.rows(); -@@ -390,7 +390,7 @@ struct generic_product_impl<Lhs,Rhs,Dens - typedef typename Product<Lhs,Rhs>::Scalar Scalar; - - template<typename Dst> -- static EIGEN_STRONG_INLINE void evalTo(Dst& dst, const Lhs& lhs, const Rhs& rhs) -+ static EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void evalTo(Dst& dst, const Lhs& lhs, const Rhs& rhs) - { - // Same as: dst.noalias() = lhs.lazyProduct(rhs); - // but easier on the compiler side -@@ -398,14 +398,14 @@ struct generic_product_impl<Lhs,Rhs,Dens - } - - template<typename Dst> -- static EIGEN_STRONG_INLINE void addTo(Dst& dst, const Lhs& lhs, const Rhs& rhs) -+ static EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void addTo(Dst& dst, const Lhs& lhs, const Rhs& rhs) - { - // dst.noalias() += lhs.lazyProduct(rhs); - call_assignment_no_alias(dst, lhs.lazyProduct(rhs), internal::add_assign_op<typename Dst::Scalar,Scalar>()); - } - - template<typename Dst> -- static EIGEN_STRONG_INLINE void subTo(Dst& dst, const Lhs& lhs, const Rhs& rhs) -+ static EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void subTo(Dst& dst, const Lhs& lhs, const Rhs& rhs) - { - // dst.noalias() -= lhs.lazyProduct(rhs); - call_assignment_no_alias(dst, lhs.lazyProduct(rhs), internal::sub_assign_op<typename Dst::Scalar,Scalar>()); |