diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-28 02:32:46 -0800 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-28 02:32:46 -0800 |
commit | bb483313f6a9c69e15ad5e668368eb5f80adf8f7 (patch) | |
tree | e0e4f71ad3374cc903f172b2b2b3a33f29fa4c61 /unsupported/test | |
parent | fb53384b0f8e3d2ef6e7ec9a4e51c27142ef880c (diff) |
Fixed another batch of compilation warnings
Diffstat (limited to 'unsupported/test')
-rw-r--r-- | unsupported/test/cxx11_tensor_contraction.cpp | 8 | ||||
-rw-r--r-- | unsupported/test/cxx11_tensor_dimension.cpp | 4 | ||||
-rw-r--r-- | unsupported/test/cxx11_tensor_morphing.cpp | 20 | ||||
-rw-r--r-- | unsupported/test/cxx11_tensor_of_complex.cpp | 2 | ||||
-rw-r--r-- | unsupported/test/cxx11_tensor_simple.cpp | 6 |
5 files changed, 20 insertions, 20 deletions
diff --git a/unsupported/test/cxx11_tensor_contraction.cpp b/unsupported/test/cxx11_tensor_contraction.cpp index 2bcae90b8..f4acdc504 100644 --- a/unsupported/test/cxx11_tensor_contraction.cpp +++ b/unsupported/test/cxx11_tensor_contraction.cpp @@ -360,7 +360,7 @@ static void test_large_contraction() t_result = t_left.contract(t_right, dims); m_result = m_left * m_right; - for (size_t i = 0; i < t_result.dimensions().TotalSize(); i++) { + for (int i = 0; i < t_result.dimensions().TotalSize(); i++) { VERIFY(&t_result.data()[i] != &m_result.data()[i]); VERIFY_IS_APPROX(t_result.data()[i], m_result.data()[i]); } @@ -388,7 +388,7 @@ static void test_matrix_vector() t_result = t_left.contract(t_right, dims); m_result = m_left * m_right; - for (size_t i = 0; i < t_result.dimensions().TotalSize(); i++) { + for (int i = 0; i < t_result.dimensions().TotalSize(); i++) { VERIFY(internal::isApprox(t_result(i), m_result(i, 0), 1)); } } @@ -412,7 +412,7 @@ static void test_tensor_vector() MapXf m_right(t_right.data(), 1, 7); Eigen::Matrix<float, Dynamic, Dynamic, DataLayout> m_result = m_left.transpose() * m_right.transpose(); - for (size_t i = 0; i < t_result.dimensions().TotalSize(); i++) { + for (int i = 0; i < t_result.dimensions().TotalSize(); i++) { VERIFY(internal::isApprox(t_result(i), m_result(i, 0), 1)); } } @@ -443,7 +443,7 @@ static void test_small_blocking_factors() Map<Eigen::Matrix<float, Dynamic, Dynamic, DataLayout>> m_right(t_right.data(), 93, 140); Eigen::Matrix<float, Dynamic, Dynamic, DataLayout> m_result = m_left * m_right; - for (size_t i = 0; i < t_result.dimensions().TotalSize(); i++) { + for (int i = 0; i < t_result.dimensions().TotalSize(); i++) { VERIFY_IS_APPROX(t_result.data()[i], m_result.data()[i]); } } diff --git a/unsupported/test/cxx11_tensor_dimension.cpp b/unsupported/test/cxx11_tensor_dimension.cpp index 0cc4e86f7..247d312ae 100644 --- a/unsupported/test/cxx11_tensor_dimension.cpp +++ b/unsupported/test/cxx11_tensor_dimension.cpp @@ -21,7 +21,7 @@ static void test_dynamic_size() VERIFY_IS_EQUAL((int)Eigen::internal::array_get<0>(dimensions), 2); VERIFY_IS_EQUAL((int)Eigen::internal::array_get<1>(dimensions), 3); VERIFY_IS_EQUAL((int)Eigen::internal::array_get<2>(dimensions), 7); - VERIFY_IS_EQUAL(dimensions.TotalSize(), (size_t)2*3*7); + VERIFY_IS_EQUAL(dimensions.TotalSize(), 2*3*7); VERIFY_IS_EQUAL((int)dimensions[0], 2); VERIFY_IS_EQUAL((int)dimensions[1], 3); VERIFY_IS_EQUAL((int)dimensions[2], 7); @@ -34,7 +34,7 @@ static void test_fixed_size() VERIFY_IS_EQUAL((int)Eigen::internal::array_get<0>(dimensions), 2); VERIFY_IS_EQUAL((int)Eigen::internal::array_get<1>(dimensions), 3); VERIFY_IS_EQUAL((int)Eigen::internal::array_get<2>(dimensions), 7); - VERIFY_IS_EQUAL(dimensions.TotalSize(), (size_t)2*3*7); + VERIFY_IS_EQUAL(dimensions.TotalSize(), 2*3*7); } diff --git a/unsupported/test/cxx11_tensor_morphing.cpp b/unsupported/test/cxx11_tensor_morphing.cpp index 96364c101..733154543 100644 --- a/unsupported/test/cxx11_tensor_morphing.cpp +++ b/unsupported/test/cxx11_tensor_morphing.cpp @@ -221,33 +221,33 @@ static void test_slice_raw_data() Eigen::DSizes<ptrdiff_t, 4> extents(1,1,1,1); typedef TensorEvaluator<decltype(tensor.slice(offsets, extents)), DefaultDevice> SliceEvaluator; auto slice1 = SliceEvaluator(tensor.slice(offsets, extents), DefaultDevice()); - VERIFY_IS_EQUAL(slice1.dimensions().TotalSize(), 1ul); + VERIFY_IS_EQUAL(slice1.dimensions().TotalSize(), 1); VERIFY_IS_EQUAL(slice1.data()[0], tensor(1,2,3,4)); if (DataLayout == ColMajor) { extents = Eigen::DSizes<ptrdiff_t, 4>(2,1,1,1); auto slice2 = SliceEvaluator(tensor.slice(offsets, extents), DefaultDevice()); - VERIFY_IS_EQUAL(slice2.dimensions().TotalSize(), 2ul); + VERIFY_IS_EQUAL(slice2.dimensions().TotalSize(), 2); VERIFY_IS_EQUAL(slice2.data()[0], tensor(1,2,3,4)); VERIFY_IS_EQUAL(slice2.data()[1], tensor(2,2,3,4)); } else { extents = Eigen::DSizes<ptrdiff_t, 4>(1,1,1,2); auto slice2 = SliceEvaluator(tensor.slice(offsets, extents), DefaultDevice()); - VERIFY_IS_EQUAL(slice2.dimensions().TotalSize(), 2ul); + VERIFY_IS_EQUAL(slice2.dimensions().TotalSize(), 2); VERIFY_IS_EQUAL(slice2.data()[0], tensor(1,2,3,4)); VERIFY_IS_EQUAL(slice2.data()[1], tensor(1,2,3,5)); } extents = Eigen::DSizes<ptrdiff_t, 4>(1,2,1,1); auto slice3 = SliceEvaluator(tensor.slice(offsets, extents), DefaultDevice()); - VERIFY_IS_EQUAL(slice3.dimensions().TotalSize(), 2ul); + VERIFY_IS_EQUAL(slice3.dimensions().TotalSize(), 2); VERIFY_IS_EQUAL(slice3.data(), static_cast<float*>(0)); if (DataLayout == ColMajor) { offsets = Eigen::DSizes<ptrdiff_t, 4>(0,2,3,4); extents = Eigen::DSizes<ptrdiff_t, 4>(3,2,1,1); auto slice4 = SliceEvaluator(tensor.slice(offsets, extents), DefaultDevice()); - VERIFY_IS_EQUAL(slice4.dimensions().TotalSize(), 6ul); + VERIFY_IS_EQUAL(slice4.dimensions().TotalSize(), 6); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 2; ++j) { VERIFY_IS_EQUAL(slice4.data()[i+3*j], tensor(i,2+j,3,4)); @@ -257,7 +257,7 @@ static void test_slice_raw_data() offsets = Eigen::DSizes<ptrdiff_t, 4>(1,2,3,0); extents = Eigen::DSizes<ptrdiff_t, 4>(1,1,2,11); auto slice4 = SliceEvaluator(tensor.slice(offsets, extents), DefaultDevice()); - VERIFY_IS_EQUAL(slice4.dimensions().TotalSize(), 22ul); + VERIFY_IS_EQUAL(slice4.dimensions().TotalSize(), 22); for (int l = 0; l < 11; ++l) { for (int k = 0; k < 2; ++k) { VERIFY_IS_EQUAL(slice4.data()[l+11*k], tensor(1,2,3+k,l)); @@ -269,7 +269,7 @@ static void test_slice_raw_data() offsets = Eigen::DSizes<ptrdiff_t, 4>(0,0,0,4); extents = Eigen::DSizes<ptrdiff_t, 4>(3,5,7,2); auto slice5 = SliceEvaluator(tensor.slice(offsets, extents), DefaultDevice()); - VERIFY_IS_EQUAL(slice5.dimensions().TotalSize(), 210ul); + VERIFY_IS_EQUAL(slice5.dimensions().TotalSize(), 210); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 5; ++j) { for (int k = 0; k < 7; ++k) { @@ -284,7 +284,7 @@ static void test_slice_raw_data() offsets = Eigen::DSizes<ptrdiff_t, 4>(1,0,0,0); extents = Eigen::DSizes<ptrdiff_t, 4>(2,5,7,11); auto slice5 = SliceEvaluator(tensor.slice(offsets, extents), DefaultDevice()); - VERIFY_IS_EQUAL(slice5.dimensions().TotalSize(), 770ul); + VERIFY_IS_EQUAL(slice5.dimensions().TotalSize(), 770); for (int l = 0; l < 11; ++l) { for (int k = 0; k < 7; ++k) { for (int j = 0; j < 5; ++j) { @@ -301,7 +301,7 @@ static void test_slice_raw_data() offsets = Eigen::DSizes<ptrdiff_t, 4>(0,0,0,0); extents = Eigen::DSizes<ptrdiff_t, 4>(3,5,7,11); auto slice6 = SliceEvaluator(tensor.slice(offsets, extents), DefaultDevice()); - VERIFY_IS_EQUAL(slice6.dimensions().TotalSize(), 3ul*5*7*11); + VERIFY_IS_EQUAL(slice6.dimensions().TotalSize(), 3*5*7*11); VERIFY_IS_EQUAL(slice6.data(), tensor.data()); } @@ -315,7 +315,7 @@ static void test_composition() Eigen::Tensor<float, 3, DataLayout> tensor = matrix.slice(DSizes<ptrdiff_t, 2>(2, 0), DSizes<ptrdiff_t, 2>(1, 11)).reshape(newDims); - VERIFY_IS_EQUAL(tensor.dimensions().TotalSize(), 11ul); + VERIFY_IS_EQUAL(tensor.dimensions().TotalSize(), 11); VERIFY_IS_EQUAL(tensor.dimension(0), 1); VERIFY_IS_EQUAL(tensor.dimension(1), 1); VERIFY_IS_EQUAL(tensor.dimension(2), 11); diff --git a/unsupported/test/cxx11_tensor_of_complex.cpp b/unsupported/test/cxx11_tensor_of_complex.cpp index 24b2bcb58..8ad04f699 100644 --- a/unsupported/test/cxx11_tensor_of_complex.cpp +++ b/unsupported/test/cxx11_tensor_of_complex.cpp @@ -67,7 +67,7 @@ static void test_contractions() Eigen::array<DimPair, 2> dims({{DimPair(2, 0), DimPair(3, 1)}}); t_result = t_left.contract(t_right, dims); m_result = m_left * m_right; - for (size_t i = 0; i < t_result.dimensions().TotalSize(); i++) { + for (int i = 0; i < t_result.dimensions().TotalSize(); i++) { VERIFY_IS_APPROX(t_result.data()[i], m_result.data()[i]); } } diff --git a/unsupported/test/cxx11_tensor_simple.cpp b/unsupported/test/cxx11_tensor_simple.cpp index 23855fca0..8cd2ab7fd 100644 --- a/unsupported/test/cxx11_tensor_simple.cpp +++ b/unsupported/test/cxx11_tensor_simple.cpp @@ -267,21 +267,21 @@ static void test_resize() VERIFY_IS_EQUAL(epsilon.dimension(0), 2); VERIFY_IS_EQUAL(epsilon.dimension(1), 3); VERIFY_IS_EQUAL(epsilon.dimension(2), 7); - VERIFY_IS_EQUAL(epsilon.dimensions().TotalSize(), 2ul*3*7); + VERIFY_IS_EQUAL(epsilon.dimensions().TotalSize(), 2*3*7); const int* old_data = epsilon.data(); epsilon.resize(3,2,7); VERIFY_IS_EQUAL(epsilon.dimension(0), 3); VERIFY_IS_EQUAL(epsilon.dimension(1), 2); VERIFY_IS_EQUAL(epsilon.dimension(2), 7); - VERIFY_IS_EQUAL(epsilon.dimensions().TotalSize(), 2ul*3*7); + VERIFY_IS_EQUAL(epsilon.dimensions().TotalSize(), 2*3*7); VERIFY_IS_EQUAL(epsilon.data(), old_data); epsilon.resize(3,5,7); VERIFY_IS_EQUAL(epsilon.dimension(0), 3); VERIFY_IS_EQUAL(epsilon.dimension(1), 5); VERIFY_IS_EQUAL(epsilon.dimension(2), 7); - VERIFY_IS_EQUAL(epsilon.dimensions().TotalSize(), 3ul*5*7); + VERIFY_IS_EQUAL(epsilon.dimensions().TotalSize(), 3*5*7); VERIFY_IS_NOT_EQUAL(epsilon.data(), old_data); } |