mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
clean up intel packet reductions
This commit is contained in:
committed by
Rasmus Munk Larsen
parent
a7f183cadb
commit
4fdf87bbf5
@@ -37,12 +37,9 @@ void matrixRedux(const MatrixType& m) {
|
||||
m2.array() = m2.array() - kMaxVal * (m2.array() / kMaxVal);
|
||||
}
|
||||
|
||||
VERIFY_IS_MUCH_SMALLER_THAN(MatrixType::Zero(rows, cols).sum(), Scalar(1));
|
||||
VERIFY_IS_APPROX(
|
||||
MatrixType::Ones(rows, cols).sum(),
|
||||
Scalar(float(
|
||||
rows *
|
||||
cols))); // the float() here to shut up excessive MSVC warning about int->complex conversion being lossy
|
||||
VERIFY_IS_EQUAL(MatrixType::Zero(rows, cols).sum(), Scalar(0));
|
||||
Scalar sizeAsScalar = internal::cast<Index, Scalar>(rows * cols);
|
||||
VERIFY_IS_APPROX(MatrixType::Ones(rows, cols).sum(), sizeAsScalar);
|
||||
Scalar s(0), p(1), minc(numext::real(m1.coeff(0))), maxc(numext::real(m1.coeff(0)));
|
||||
for (int j = 0; j < cols; j++)
|
||||
for (int i = 0; i < rows; i++) {
|
||||
@@ -160,6 +157,10 @@ EIGEN_DECLARE_TEST(redux) {
|
||||
int maxsize = (std::min)(100, EIGEN_TEST_MAX_SIZE);
|
||||
TEST_SET_BUT_UNUSED_VARIABLE(maxsize);
|
||||
for (int i = 0; i < g_repeat; i++) {
|
||||
int rows = internal::random<int>(1, maxsize);
|
||||
int cols = internal::random<int>(1, maxsize);
|
||||
EIGEN_UNUSED_VARIABLE(rows);
|
||||
EIGEN_UNUSED_VARIABLE(cols);
|
||||
CALL_SUBTEST_1(matrixRedux(Matrix<float, 1, 1>()));
|
||||
CALL_SUBTEST_1(matrixRedux(Array<float, 1, 1>()));
|
||||
CALL_SUBTEST_2(matrixRedux(Matrix2f()));
|
||||
@@ -168,19 +169,37 @@ EIGEN_DECLARE_TEST(redux) {
|
||||
CALL_SUBTEST_3(matrixRedux(Matrix4d()));
|
||||
CALL_SUBTEST_3(matrixRedux(Array4d()));
|
||||
CALL_SUBTEST_3(matrixRedux(Array44d()));
|
||||
CALL_SUBTEST_4(matrixRedux(MatrixXcf(internal::random<int>(1, maxsize), internal::random<int>(1, maxsize))));
|
||||
CALL_SUBTEST_4(matrixRedux(ArrayXXcf(internal::random<int>(1, maxsize), internal::random<int>(1, maxsize))));
|
||||
CALL_SUBTEST_5(matrixRedux(MatrixXd(internal::random<int>(1, maxsize), internal::random<int>(1, maxsize))));
|
||||
CALL_SUBTEST_5(matrixRedux(ArrayXXd(internal::random<int>(1, maxsize), internal::random<int>(1, maxsize))));
|
||||
CALL_SUBTEST_6(matrixRedux(MatrixXi(internal::random<int>(1, maxsize), internal::random<int>(1, maxsize))));
|
||||
CALL_SUBTEST_6(matrixRedux(ArrayXXi(internal::random<int>(1, maxsize), internal::random<int>(1, maxsize))));
|
||||
CALL_SUBTEST_4(matrixRedux(MatrixXf(rows, cols)));
|
||||
CALL_SUBTEST_4(matrixRedux(ArrayXXf(rows, cols)));
|
||||
CALL_SUBTEST_4(matrixRedux(MatrixXd(rows, cols)));
|
||||
CALL_SUBTEST_4(matrixRedux(ArrayXXd(rows, cols)));
|
||||
/* TODO: fix test for boolean */
|
||||
/*CALL_SUBTEST_5(matrixRedux(MatrixX<bool>(rows, cols)));*/
|
||||
/*CALL_SUBTEST_5(matrixRedux(ArrayXX<bool>(rows, cols)));*/
|
||||
CALL_SUBTEST_5(matrixRedux(MatrixXi(rows, cols)));
|
||||
CALL_SUBTEST_5(matrixRedux(ArrayXXi(rows, cols)));
|
||||
CALL_SUBTEST_5(matrixRedux(MatrixX<int64_t>(rows, cols)));
|
||||
CALL_SUBTEST_5(matrixRedux(ArrayXX<int64_t>(rows, cols)));
|
||||
CALL_SUBTEST_6(matrixRedux(MatrixXcf(rows, cols)));
|
||||
CALL_SUBTEST_6(matrixRedux(ArrayXXcf(rows, cols)));
|
||||
CALL_SUBTEST_6(matrixRedux(MatrixXcd(rows, cols)));
|
||||
CALL_SUBTEST_6(matrixRedux(ArrayXXcd(rows, cols)));
|
||||
}
|
||||
for (int i = 0; i < g_repeat; i++) {
|
||||
CALL_SUBTEST_7(vectorRedux(Vector4f()));
|
||||
CALL_SUBTEST_7(vectorRedux(Array4f()));
|
||||
CALL_SUBTEST_5(vectorRedux(VectorXd(internal::random<int>(1, maxsize))));
|
||||
CALL_SUBTEST_5(vectorRedux(ArrayXd(internal::random<int>(1, maxsize))));
|
||||
CALL_SUBTEST_8(vectorRedux(VectorXf(internal::random<int>(1, maxsize))));
|
||||
CALL_SUBTEST_8(vectorRedux(ArrayXf(internal::random<int>(1, maxsize))));
|
||||
int size = internal::random<int>(1, maxsize);
|
||||
EIGEN_UNUSED_VARIABLE(size);
|
||||
CALL_SUBTEST_8(vectorRedux(Vector4f()));
|
||||
CALL_SUBTEST_8(vectorRedux(Array4f()));
|
||||
CALL_SUBTEST_9(vectorRedux(VectorXf(size)));
|
||||
CALL_SUBTEST_9(vectorRedux(ArrayXf(size)));
|
||||
CALL_SUBTEST_10(vectorRedux(VectorXd(size)));
|
||||
CALL_SUBTEST_10(vectorRedux(ArrayXd(size)));
|
||||
/* TODO: fix test for boolean */
|
||||
/*CALL_SUBTEST_10(vectorRedux(VectorX<bool>(size)));*/
|
||||
/*CALL_SUBTEST_10(vectorRedux(ArrayX<bool>(size)));*/
|
||||
CALL_SUBTEST_10(vectorRedux(VectorXi(size)));
|
||||
CALL_SUBTEST_10(vectorRedux(ArrayXi(size)));
|
||||
CALL_SUBTEST_10(vectorRedux(VectorX<int64_t>(size)));
|
||||
CALL_SUBTEST_10(vectorRedux(ArrayX<int64_t>(size)));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user