GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-08 17:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix integer shortening warnings in visitor tests.

Browse Source
This commit is contained in:
Rasmus Munk Larsen 2022-05-27 18:51:37 +00:00 committed by Antonio Sánchez
parent 705ae70646
commit 510f6b9f15
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
test/visitor.cpp
View File

@ -175,15 +175,15 @@ template<typename VectorType> void vectorVisitor(const VectorType& w)
template<typename T, bool Vectorizable> template<typename T, bool Vectorizable>
struct TrackedVisitor { struct TrackedVisitor {
void init(T v, int i, int j) { return this->operator()(v,i,j); } void init(T v, Index i, Index j) { return this->operator()(v,i,j); }
void operator()(T v, int i, int j) { void operator()(T v, Index i, Index j) {
EIGEN_UNUSED_VARIABLE(v) EIGEN_UNUSED_VARIABLE(v)
visited.push_back({i, j}); visited.push_back({i, j});
vectorized = false; vectorized = false;
} }
template<typename Packet> template<typename Packet>
void packet(Packet p, int i, int j) { void packet(Packet p, Index i, Index j) {
EIGEN_UNUSED_VARIABLE(p) EIGEN_UNUSED_VARIABLE(p)
visited.push_back({i, j}); visited.push_back({i, j});
vectorized = true; vectorized = true;
@ -210,9 +210,9 @@ void checkOptimalTraversal() {
Eigen::Matrix4f X = Eigen::Matrix4f::Random(); Eigen::Matrix4f X = Eigen::Matrix4f::Random();
TrackedVisitor<double, false> visitor; TrackedVisitor<double, false> visitor;
X.visit(visitor); X.visit(visitor);
int count = 0; Index count = 0;
for (int j=0; j<X.cols(); ++j) { for (Index j=0; j<X.cols(); ++j) {
for (int i=0; i<X.rows(); ++i) { for (Index i=0; i<X.rows(); ++i) {
VERIFY_IS_EQUAL(visitor.visited[count].first, i); VERIFY_IS_EQUAL(visitor.visited[count].first, i);
VERIFY_IS_EQUAL(visitor.visited[count].second, j); VERIFY_IS_EQUAL(visitor.visited[count].second, j);
++count; ++count;
@ -226,9 +226,9 @@ void checkOptimalTraversal() {
Matrix4fRowMajor X = Matrix4fRowMajor::Random(); Matrix4fRowMajor X = Matrix4fRowMajor::Random();
TrackedVisitor<double, false> visitor; TrackedVisitor<double, false> visitor;
X.visit(visitor); X.visit(visitor);
int count = 0; Index count = 0;
for (int i=0; i<X.rows(); ++i) { for (Index i=0; i<X.rows(); ++i) {
for (int j=0; j<X.cols(); ++j) { for (Index j=0; j<X.cols(); ++j) {
VERIFY_IS_EQUAL(visitor.visited[count].first, i); VERIFY_IS_EQUAL(visitor.visited[count].first, i);
VERIFY_IS_EQUAL(visitor.visited[count].second, j); VERIFY_IS_EQUAL(visitor.visited[count].second, j);
++count; ++count;
@ -241,9 +241,9 @@ void checkOptimalTraversal() {
Eigen::MatrixXf X = Eigen::MatrixXf::Random(4, 4); Eigen::MatrixXf X = Eigen::MatrixXf::Random(4, 4);
TrackedVisitor<double, false> visitor; TrackedVisitor<double, false> visitor;
X.visit(visitor); X.visit(visitor);
int count = 0; Index count = 0;
for (int j=0; j<X.cols(); ++j) { for (Index j=0; j<X.cols(); ++j) {
for (int i=0; i<X.rows(); ++i) { for (Index i=0; i<X.rows(); ++i) {
VERIFY_IS_EQUAL(visitor.visited[count].first, i); VERIFY_IS_EQUAL(visitor.visited[count].first, i);
VERIFY_IS_EQUAL(visitor.visited[count].second, j); VERIFY_IS_EQUAL(visitor.visited[count].second, j);
++count; ++count;
@ -257,9 +257,9 @@ void checkOptimalTraversal() {
MatrixXfRowMajor X = MatrixXfRowMajor::Random(4, 4); MatrixXfRowMajor X = MatrixXfRowMajor::Random(4, 4);
TrackedVisitor<double, false> visitor; TrackedVisitor<double, false> visitor;
X.visit(visitor); X.visit(visitor);
int count = 0; Index count = 0;
for (int i=0; i<X.rows(); ++i) { for (Index i=0; i<X.rows(); ++i) {
for (int j=0; j<X.cols(); ++j) { for (Index j=0; j<X.cols(); ++j) {
VERIFY_IS_EQUAL(visitor.visited[count].first, i); VERIFY_IS_EQUAL(visitor.visited[count].first, i);
VERIFY_IS_EQUAL(visitor.visited[count].second, j); VERIFY_IS_EQUAL(visitor.visited[count].second, j);
++count; ++count;
@ -274,11 +274,11 @@ void checkOptimalTraversal() {
Eigen::MatrixXf X = Eigen::MatrixXf::Random(4 * PacketSize, 4 * PacketSize); Eigen::MatrixXf X = Eigen::MatrixXf::Random(4 * PacketSize, 4 * PacketSize);
TrackedVisitor<double, true> visitor; TrackedVisitor<double, true> visitor;
X.visit(visitor); X.visit(visitor);
int previ = -1; Index previ = -1;
int prevj = 0; Index prevj = 0;
for (const auto& p : visitor.visited) { for (const auto& p : visitor.visited) {
int i = p.first; Index i = p.first;
int j = p.second; Index j = p.second;
VERIFY( VERIFY(
(j == prevj && i == previ + 1) // Advance single element (j == prevj && i == previ + 1) // Advance single element
|| (j == prevj && i == previ + PacketSize) // Advance packet || (j == prevj && i == previ + PacketSize) // Advance packet
@ -299,11 +299,11 @@ void checkOptimalTraversal() {
MatrixXfRowMajor X = MatrixXfRowMajor::Random(4 * PacketSize, 4 * PacketSize); MatrixXfRowMajor X = MatrixXfRowMajor::Random(4 * PacketSize, 4 * PacketSize);
TrackedVisitor<double, true> visitor; TrackedVisitor<double, true> visitor;
X.visit(visitor); X.visit(visitor);
int previ = 0; Index previ = 0;
int prevj = -1; Index prevj = -1;
for (const auto& p : visitor.visited) { for (const auto& p : visitor.visited) {
int i = p.first; Index i = p.first;
int j = p.second; Index j = p.second;
VERIFY( VERIFY(
(i == previ && j == prevj + 1) // Advance single element (i == previ && j == prevj + 1) // Advance single element
|| (i == previ && j == prevj + PacketSize) // Advance packet || (i == previ && j == prevj + PacketSize) // Advance packet
@ -316,7 +316,6 @@ void checkOptimalTraversal() {
VERIFY(visitor.vectorized); VERIFY(visitor.vectorized);
} }
} }
} }
EIGEN_DECLARE_TEST(visitor) EIGEN_DECLARE_TEST(visitor)