mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-21 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation errors.

Browse Source
This commit is contained in:
Benoit Steiner 2018-08-06 13:40:51 -07:00
parent 36e7e7dd8f
commit d011d05fd6
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
unsupported/Eigen/CXX11/src/Tensor/TensorBase.h
View File

@ -538,8 +538,8 @@ class TensorBase<Derived, ReadOnlyAccessors>
// Fourier transforms // Fourier transforms
template <int FFTDataType, int FFTDirection, typename FFT> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE template <int FFTDataType, int FFTDirection, typename FFT> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
const TensorFFTOp<const FFT, const Derived, FFTDataType, FFTDirection> const TensorFFTOp<const FFT, const Derived, FFTDataType, FFTDirection>
fft(const FFT& fft) const { fft(const FFT& dims) const {
return TensorFFTOp<const FFT, const Derived, FFTDataType, FFTDirection>(derived(), fft); return TensorFFTOp<const FFT, const Derived, FFTDataType, FFTDirection>(derived(), dims);
} }
// Scan. // Scan.
@ -723,8 +723,8 @@ class TensorBase<Derived, ReadOnlyAccessors>
template <typename Broadcast> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE template <typename Broadcast> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
const TensorBroadcastingOp<const Broadcast, const Derived> const TensorBroadcastingOp<const Broadcast, const Derived>
broadcast(const Broadcast& broadcast) const { broadcast(const Broadcast& bcast) const {
return TensorBroadcastingOp<const Broadcast, const Derived>(derived(), broadcast); return TensorBroadcastingOp<const Broadcast, const Derived>(derived(), bcast);
} }
template <typename Axis, typename OtherDerived> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE template <typename Axis, typename OtherDerived> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
@ -832,8 +832,8 @@ class TensorBase<Derived, ReadOnlyAccessors>
} }
template <typename Shuffle> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE template <typename Shuffle> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
const TensorShufflingOp<const Shuffle, const Derived> const TensorShufflingOp<const Shuffle, const Derived>
shuffle(const Shuffle& shuffle) const { shuffle(const Shuffle& shfl) const {
return TensorShufflingOp<const Shuffle, const Derived>(derived(), shuffle); return TensorShufflingOp<const Shuffle, const Derived>(derived(), shfl);
} }
template <typename Strides> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE template <typename Strides> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
const TensorStridingOp<const Strides, const Derived> const TensorStridingOp<const Strides, const Derived>
@ -1030,13 +1030,13 @@ class TensorBase : public TensorBase<Derived, ReadOnlyAccessors> {
template <typename Shuffle> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE template <typename Shuffle> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
const TensorShufflingOp<const Shuffle, const Derived> const TensorShufflingOp<const Shuffle, const Derived>
shuffle(const Shuffle& shuffle) const { shuffle(const Shuffle& shfl) const {
return TensorShufflingOp<const Shuffle, const Derived>(derived(), shuffle); return TensorShufflingOp<const Shuffle, const Derived>(derived(), shfl);
} }
template <typename Shuffle> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE template <typename Shuffle> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
TensorShufflingOp<const Shuffle, Derived> TensorShufflingOp<const Shuffle, Derived>
shuffle(const Shuffle& shuffle) { shuffle(const Shuffle& shfl) {
return TensorShufflingOp<const Shuffle, Derived>(derived(), shuffle); return TensorShufflingOp<const Shuffle, Derived>(derived(), shfl);
} }
template <typename Strides> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE template <typename Strides> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
@ -1052,8 +1052,8 @@ class TensorBase : public TensorBase<Derived, ReadOnlyAccessors> {
// Select the device on which to evaluate the expression. // Select the device on which to evaluate the expression.
template <typename DeviceType> template <typename DeviceType>
TensorDevice<Derived, DeviceType> device(const DeviceType& device) { TensorDevice<Derived, DeviceType> device(const DeviceType& dev) {
return TensorDevice<Derived, DeviceType>(device, derived()); return TensorDevice<Derived, DeviceType>(dev, derived());
} }
protected: protected:

4
unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h
View File

@ -527,8 +527,8 @@ struct TensorEvaluator<const TensorConvolutionOp<Indices, InputArgType, KernelAr
Scalar* local = (Scalar*)m_device.allocate(kernel_sz); Scalar* local = (Scalar*)m_device.allocate(kernel_sz);
typedef TensorEvalToOp<const KernelArgType> EvalTo; typedef TensorEvalToOp<const KernelArgType> EvalTo;
EvalTo evalToTmp(local, m_kernelArg); EvalTo evalToTmp(local, m_kernelArg);
const bool PacketAccess = internal::IsVectorizable<Device, KernelArgType>::value; const bool Vectorize = internal::IsVectorizable<Device, KernelArgType>::value;
internal::TensorExecutor<const EvalTo, Device, PacketAccess>::run(evalToTmp, m_device); internal::TensorExecutor<const EvalTo, Device, Vectorize>::run(evalToTmp, m_device);
m_kernel = local; m_kernel = local;
m_local_kernel = true; m_local_kernel = true;

4
unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h
View File

@ -126,7 +126,7 @@ struct TensorEvaluator
} }
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void getResourceRequirements( EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void getResourceRequirements(
std::vector<internal::TensorOpResourceRequirements>* resources) const {} std::vector<internal::TensorOpResourceRequirements>*) const {}
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void block(TensorBlock* block) const { EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void block(TensorBlock* block) const {
assert(m_data != NULL); assert(m_data != NULL);
@ -255,7 +255,7 @@ struct TensorEvaluator<const Derived, Device>
} }
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void getResourceRequirements( EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void getResourceRequirements(
std::vector<internal::TensorOpResourceRequirements>* resources) const {} std::vector<internal::TensorOpResourceRequirements>*) const {}
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void block(TensorBlock* block) const { EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void block(TensorBlock* block) const {
assert(m_data != NULL); assert(m_data != NULL);

4
unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h
View File

@ -124,8 +124,8 @@ struct TensorEvaluator<const TensorForcedEvalOp<ArgType>, Device>
} }
typedef TensorEvalToOp< const typename internal::remove_const<ArgType>::type > EvalTo; typedef TensorEvalToOp< const typename internal::remove_const<ArgType>::type > EvalTo;
EvalTo evalToTmp(m_buffer, m_op); EvalTo evalToTmp(m_buffer, m_op);
const bool PacketAccess = internal::IsVectorizable<Device, const ArgType>::value; const bool Vectorize = internal::IsVectorizable<Device, const ArgType>::value;
internal::TensorExecutor<const EvalTo, typename internal::remove_const<Device>::type, PacketAccess>::run(evalToTmp, m_device); internal::TensorExecutor<const EvalTo, typename internal::remove_const<Device>::type, Vectorize>::run(evalToTmp, m_device);
return true; return true;
} }
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void cleanup() { EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void cleanup() {