diff options
author | 2016-11-01 15:46:11 -0800 | |
---|---|---|
committer | 2016-11-01 17:02:01 -0700 | |
commit | a95f95a60b20fb48fbfcae8da4afaa9412582746 (patch) | |
tree | a57f39bd94502a01347f1055b86816b29c95ac68 /tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h | |
parent | 82afa4b515720a5413fde6ff9ce74c58622b41de (diff) |
Remove references to gcudacc.
Change: 137888607
Diffstat (limited to 'tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h')
-rw-r--r-- | tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h index 6106328e7e..3bec4ce5f2 100644 --- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h +++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h @@ -55,34 +55,13 @@ EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T MaybeConj(T v) { return v; } -#ifdef __GCUDACC__ -// TODO(ebrevdo): remove this once a bugfix is in. -#define MAYBE_CONJ(T) \ - template <> \ - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T MaybeConj<T>(T v) { \ - assert(false && "Conjugation not supported"); \ - } -#else -#define MAYBE_CONJ(T) \ - template <> \ - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T MaybeConj<T>(T v) { \ - return Eigen::numext::conj(v); \ - } -#endif - -MAYBE_CONJ(std::complex<float>); -MAYBE_CONJ(std::complex<double>); -MAYBE_CONJ(std::complex<long double>); - -#undef MAYBE_CONJ - template <typename MATRIX> class MaybeAdjoint<MATRIX, true> { public: EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE MaybeAdjoint(MATRIX m) : m_(m) {} EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE typename MATRIX::Scalar operator()( const typename MATRIX::Index i, const typename MATRIX::Index j) const { - return MaybeConj(m_(j, i)); + return Eigen::numext::conj(m_(j, i)); } private: |