diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceType.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceType.h index b9c8c19fe..ef5e11537 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceType.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceType.h @@ -27,6 +27,10 @@ struct DefaultDevice { EIGEN_STRONG_INLINE void memset(void* buffer, int c, size_t n) const { ::memset(buffer, c, n); } + + EIGEN_STRONG_INLINE size_t numThreads() const { + return 1; + } }; @@ -115,6 +119,11 @@ struct GpuDevice { cudaMemsetAsync(buffer, c, n, *stream_); } + EIGEN_STRONG_INLINE size_t numThreads() const { + // Fixme: + return 32; + } + private: // TODO: multigpu. const cudaStream_t* stream_; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h index 3b169a06f..5a113dc19 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h @@ -195,6 +195,32 @@ struct DSizes : array { } EIGEN_DEVICE_FUNC explicit DSizes(const array& a) : Base(a) { } + EIGEN_DEVICE_FUNC explicit DSizes(const DenseIndex i0) { + (*this)[0] = i0; + } + EIGEN_DEVICE_FUNC explicit DSizes(const DenseIndex i0, const DenseIndex i1) { + (*this)[0] = i0; + (*this)[1] = i1; + } + EIGEN_DEVICE_FUNC explicit DSizes(const DenseIndex i0, const DenseIndex i1, const DenseIndex i2) { + (*this)[0] = i0; + (*this)[1] = i1; + (*this)[2] = i2; + } + EIGEN_DEVICE_FUNC explicit DSizes(const DenseIndex i0, const DenseIndex i1, const DenseIndex i2, const DenseIndex i3) { + (*this)[0] = i0; + (*this)[1] = i1; + (*this)[2] = i2; + (*this)[3] = i3; + } + EIGEN_DEVICE_FUNC explicit DSizes(const DenseIndex i0, const DenseIndex i1, const DenseIndex i2, const DenseIndex i3, const DenseIndex i4) { + (*this)[0] = i0; + (*this)[1] = i1; + (*this)[2] = i2; + (*this)[3] = i3; + (*this)[4] = i4; + } + DSizes& operator = (const array& other) { *static_cast(this) = other; return *this; diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 164388746..615ff3e6d 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -110,7 +110,7 @@ if(EIGEN_TEST_CXX11) ei_add_test(cxx11_tensor_lvalue "-std=c++0x") ei_add_test(cxx11_tensor_map "-std=c++0x") ei_add_test(cxx11_tensor_broadcasting "-std=c++0x") -# ei_add_test(cxx11_tensor_morphing "-std=c++0x") + ei_add_test(cxx11_tensor_morphing "-std=c++0x") ei_add_test(cxx11_tensor_padding "-std=c++0x") # ei_add_test(cxx11_tensor_shuffling "-std=c++0x") ei_add_test(cxx11_tensor_striding "-std=c++0x") diff --git a/unsupported/test/cxx11_tensor_morphing.cpp b/unsupported/test/cxx11_tensor_morphing.cpp index fbfdaadb7..2a6a97856 100644 --- a/unsupported/test/cxx11_tensor_morphing.cpp +++ b/unsupported/test/cxx11_tensor_morphing.cpp @@ -52,7 +52,7 @@ static void test_reshape_in_expr() { TensorMap> tensor2(m2.data(), 3,5,7,11,13); Tensor::Dimensions newDims1{{2,3*5*7*11}}; Tensor::Dimensions newDims2{{3*5*7*11,13}}; - array::DimensionPair, 1> contract_along{{1, 0}}; + array::DimensionPair, 1> contract_along{{std::make_pair(1, 0)}}; Tensor tensor3(2,13); tensor3 = tensor1.reshape(newDims1).contract(tensor2.reshape(newDims2), contract_along); @@ -74,7 +74,8 @@ static void test_reshape_as_lvalue() Tensor::Dimensions dim{{2,3,7}}; tensor2d.reshape(dim) = tensor; - Tensor tensor5d(2,3,1,7,1); + float scratch[2*3*1*7*1]; + TensorMap> tensor5d(scratch, 2,3,1,7,1); tensor5d.reshape(dim).device(Eigen::DefaultDevice()) = tensor; for (int i = 0; i < 2; ++i) { @@ -94,14 +95,14 @@ static void test_simple_slice() tensor.setRandom(); Tensor slice1(1,1,1,1,1); - Eigen::DSizes indices(Eigen::array(1,2,3,4,5)); - Eigen::DSizes sizes(Eigen::array(1,1,1,1,1)); + Eigen::DSizes indices(1,2,3,4,5); + Eigen::DSizes sizes(1,1,1,1,1); slice1 = tensor.slice(indices, sizes); VERIFY_IS_EQUAL(slice1(0,0,0,0,0), tensor(1,2,3,4,5)); Tensor slice2(1,1,2,2,3); - Eigen::DSizes indices2(Eigen::array(1,1,3,4,5)); - Eigen::DSizes sizes2(Eigen::array(1,1,2,2,3)); + Eigen::DSizes indices2(1,1,3,4,5); + Eigen::DSizes sizes2(1,1,2,2,3); slice2 = tensor.slice(indices2, sizes2); for (int i = 0; i < 2; ++i) { for (int j = 0; j < 2; ++j) { @@ -124,12 +125,12 @@ static void test_slice_in_expr() { TensorMap> tensor1(m1.data(), 7, 7); TensorMap> tensor2(m2.data(), 3, 3); Tensor tensor3(3,1); - array::DimensionPair, 1> contract_along{{1, 0}}; + array::DimensionPair, 1> contract_along{{std::make_pair(1, 0)}}; - Eigen::DSizes indices1(Eigen::array(1,2)); - Eigen::DSizes sizes1(Eigen::array(3,3)); - Eigen::DSizes indices2(Eigen::array(0,2)); - Eigen::DSizes sizes2(Eigen::array(3,1)); + Eigen::DSizes indices1(1,2); + Eigen::DSizes sizes1(3,3); + Eigen::DSizes indices2(0,2); + Eigen::DSizes sizes2(3,1); tensor3 = tensor1.slice(indices1, sizes1).contract(tensor2.slice(indices2, sizes2), contract_along); Map res(tensor3.data(), 3, 1); @@ -153,18 +154,18 @@ static void test_slice_as_lvalue() tensor4.setRandom(); Tensor result(4,5,7); - Eigen::DSizes sizes12(Eigen::array(2,2,7)); - Eigen::DSizes first_slice(Eigen::array(0,0,0)); + Eigen::DSizes sizes12(2,2,7); + Eigen::DSizes first_slice(0,0,0); result.slice(first_slice, sizes12) = tensor1; - Eigen::DSizes second_slice(Eigen::array(2,0,0)); + Eigen::DSizes second_slice(2,0,0); result.slice(second_slice, sizes12).device(Eigen::DefaultDevice()) = tensor2; - Eigen::DSizes sizes3(Eigen::array(4,3,5)); - Eigen::DSizes third_slice(Eigen::array(0,2,0)); + Eigen::DSizes sizes3(4,3,5); + Eigen::DSizes third_slice(0,2,0); result.slice(third_slice, sizes3) = tensor3; - Eigen::DSizes sizes4(Eigen::array(4,3,2)); - Eigen::DSizes fourth_slice(Eigen::array(0,2,5)); + Eigen::DSizes sizes4(4,3,2); + Eigen::DSizes fourth_slice(0,2,5); result.slice(fourth_slice, sizes4) = tensor4; for (int j = 0; j < 2; ++j) {