mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
Clang-format tests, examples, libraries, benchmarks, etc.
This commit is contained in:
committed by
Rasmus Munk Larsen
parent
3252ecc7a4
commit
46e9cdb7fe
@@ -9,7 +9,6 @@
|
||||
|
||||
#define EIGEN_USE_THREADS
|
||||
|
||||
|
||||
#include "main.h"
|
||||
#include <iostream>
|
||||
#include <Eigen/CXX11/Tensor>
|
||||
@@ -36,8 +35,7 @@ class TestAllocator : public Allocator {
|
||||
int dealloc_count_ = 0;
|
||||
};
|
||||
|
||||
void test_multithread_elementwise()
|
||||
{
|
||||
void test_multithread_elementwise() {
|
||||
Tensor<float, 3> in1(200, 30, 70);
|
||||
Tensor<float, 3> in2(200, 30, 70);
|
||||
Tensor<double, 3> out(200, 30, 70);
|
||||
@@ -58,8 +56,7 @@ void test_multithread_elementwise()
|
||||
}
|
||||
}
|
||||
|
||||
void test_async_multithread_elementwise()
|
||||
{
|
||||
void test_async_multithread_elementwise() {
|
||||
Tensor<float, 3> in1(200, 30, 70);
|
||||
Tensor<float, 3> in2(200, 30, 70);
|
||||
Tensor<double, 3> out(200, 30, 70);
|
||||
@@ -83,11 +80,10 @@ void test_async_multithread_elementwise()
|
||||
}
|
||||
}
|
||||
|
||||
void test_multithread_compound_assignment()
|
||||
{
|
||||
Tensor<float, 3> in1(2,3,7);
|
||||
Tensor<float, 3> in2(2,3,7);
|
||||
Tensor<float, 3> out(2,3,7);
|
||||
void test_multithread_compound_assignment() {
|
||||
Tensor<float, 3> in1(2, 3, 7);
|
||||
Tensor<float, 3> in2(2, 3, 7);
|
||||
Tensor<float, 3> out(2, 3, 7);
|
||||
|
||||
in1.setRandom();
|
||||
in2.setRandom();
|
||||
@@ -100,15 +96,14 @@ void test_multithread_compound_assignment()
|
||||
for (int i = 0; i < 2; ++i) {
|
||||
for (int j = 0; j < 3; ++j) {
|
||||
for (int k = 0; k < 7; ++k) {
|
||||
VERIFY_IS_APPROX(out(i,j,k), in1(i,j,k) + in2(i,j,k) * 3.14f);
|
||||
VERIFY_IS_APPROX(out(i, j, k), in1(i, j, k) + in2(i, j, k) * 3.14f);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template<int DataLayout>
|
||||
void test_multithread_contraction()
|
||||
{
|
||||
template <int DataLayout>
|
||||
void test_multithread_contraction() {
|
||||
Tensor<float, 4, DataLayout> t_left(30, 50, 37, 31);
|
||||
Tensor<float, 5, DataLayout> t_right(37, 31, 70, 2, 10);
|
||||
Tensor<float, 5, DataLayout> t_result(30, 50, 70, 2, 10);
|
||||
@@ -132,7 +127,7 @@ void test_multithread_contraction()
|
||||
t_result.device(thread_pool_device) = t_left.contract(t_right, dims);
|
||||
m_result = m_left * m_right;
|
||||
|
||||
for (ptrdiff_t i = 0; i < t_result.size(); i++) {
|
||||
for (ptrdiff_t i = 0; i < t_result.size(); i++) {
|
||||
VERIFY(&t_result.data()[i] != &m_result.data()[i]);
|
||||
if (fabsf(t_result(i) - m_result(i)) < 1e-4f) {
|
||||
continue;
|
||||
@@ -140,18 +135,16 @@ void test_multithread_contraction()
|
||||
if (Eigen::internal::isApprox(t_result(i), m_result(i), 1e-4f)) {
|
||||
continue;
|
||||
}
|
||||
std::cout << "mismatch detected at index " << i << ": " << t_result(i)
|
||||
<< " vs " << m_result(i) << std::endl;
|
||||
std::cout << "mismatch detected at index " << i << ": " << t_result(i) << " vs " << m_result(i) << std::endl;
|
||||
assert(false);
|
||||
}
|
||||
}
|
||||
|
||||
template<int DataLayout>
|
||||
void test_contraction_corner_cases()
|
||||
{
|
||||
template <int DataLayout>
|
||||
void test_contraction_corner_cases() {
|
||||
Tensor<float, 2, DataLayout> t_left(32, 500);
|
||||
Tensor<float, 2, DataLayout> t_right(32, 28*28);
|
||||
Tensor<float, 2, DataLayout> t_result(500, 28*28);
|
||||
Tensor<float, 2, DataLayout> t_right(32, 28 * 28);
|
||||
Tensor<float, 2, DataLayout> t_result(500, 28 * 28);
|
||||
|
||||
t_left = (t_left.constant(-0.5f) + t_left.random()) * 2.0f;
|
||||
t_right = (t_right.constant(-0.6f) + t_right.random()) * 2.0f;
|
||||
@@ -163,8 +156,8 @@ void test_contraction_corner_cases()
|
||||
|
||||
typedef Map<Matrix<float, Dynamic, Dynamic, DataLayout>> MapXf;
|
||||
MapXf m_left(t_left.data(), 32, 500);
|
||||
MapXf m_right(t_right.data(), 32, 28*28);
|
||||
Matrix<float, Dynamic, Dynamic, DataLayout> m_result(500, 28*28);
|
||||
MapXf m_right(t_right.data(), 32, 28 * 28);
|
||||
Matrix<float, Dynamic, Dynamic, DataLayout> m_result(500, 28 * 28);
|
||||
|
||||
Eigen::ThreadPool tp(12);
|
||||
Eigen::ThreadPoolDevice thread_pool_device(&tp, 12);
|
||||
@@ -176,22 +169,23 @@ void test_contraction_corner_cases()
|
||||
for (ptrdiff_t i = 0; i < t_result.size(); i++) {
|
||||
assert(!(numext::isnan)(t_result.data()[i]));
|
||||
if (fabsf(t_result.data()[i] - m_result.data()[i]) >= 1e-4f) {
|
||||
std::cout << "mismatch detected at index " << i << " : " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
|
||||
std::cout << "mismatch detected at index " << i << " : " << t_result.data()[i] << " vs " << m_result.data()[i]
|
||||
<< std::endl;
|
||||
assert(false);
|
||||
}
|
||||
}
|
||||
|
||||
t_left.resize(32, 1);
|
||||
t_left = (t_left.constant(-0.5f) + t_left.random()) * 2.0f;
|
||||
t_result.resize (1, 28*28);
|
||||
t_result.resize(1, 28 * 28);
|
||||
t_result = t_result.constant(NAN);
|
||||
t_result.device(thread_pool_device) = t_left.contract(t_right, dims);
|
||||
new(&m_left) MapXf(t_left.data(), 32, 1);
|
||||
new (&m_left) MapXf(t_left.data(), 32, 1);
|
||||
m_result = m_left.transpose() * m_right;
|
||||
for (ptrdiff_t i = 0; i < t_result.size(); i++) {
|
||||
assert(!(numext::isnan)(t_result.data()[i]));
|
||||
if (fabsf(t_result.data()[i] - m_result.data()[i]) >= 1e-4f) {
|
||||
std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
|
||||
std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
|
||||
assert(false);
|
||||
}
|
||||
}
|
||||
@@ -200,16 +194,16 @@ void test_contraction_corner_cases()
|
||||
t_right.resize(32, 4);
|
||||
t_left = (t_left.constant(-0.5f) + t_left.random()) * 2.0f;
|
||||
t_right = (t_right.constant(-0.6f) + t_right.random()) * 2.0f;
|
||||
t_result.resize (500, 4);
|
||||
t_result.resize(500, 4);
|
||||
t_result = t_result.constant(NAN);
|
||||
t_result.device(thread_pool_device) = t_left.contract(t_right, dims);
|
||||
new(&m_left) MapXf(t_left.data(), 32, 500);
|
||||
new(&m_right) MapXf(t_right.data(), 32, 4);
|
||||
new (&m_left) MapXf(t_left.data(), 32, 500);
|
||||
new (&m_right) MapXf(t_right.data(), 32, 4);
|
||||
m_result = m_left.transpose() * m_right;
|
||||
for (ptrdiff_t i = 0; i < t_result.size(); i++) {
|
||||
assert(!(numext::isnan)(t_result.data()[i]));
|
||||
if (fabsf(t_result.data()[i] - m_result.data()[i]) >= 1e-4f) {
|
||||
std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
|
||||
std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
|
||||
assert(false);
|
||||
}
|
||||
}
|
||||
@@ -218,32 +212,28 @@ void test_contraction_corner_cases()
|
||||
t_right.resize(32, 4);
|
||||
t_left = (t_left.constant(-0.5f) + t_left.random()) * 2.0f;
|
||||
t_right = (t_right.constant(-0.6f) + t_right.random()) * 2.0f;
|
||||
t_result.resize (1, 4);
|
||||
t_result.resize(1, 4);
|
||||
t_result = t_result.constant(NAN);
|
||||
t_result.device(thread_pool_device) = t_left.contract(t_right, dims);
|
||||
new(&m_left) MapXf(t_left.data(), 32, 1);
|
||||
new(&m_right) MapXf(t_right.data(), 32, 4);
|
||||
new (&m_left) MapXf(t_left.data(), 32, 1);
|
||||
new (&m_right) MapXf(t_right.data(), 32, 4);
|
||||
m_result = m_left.transpose() * m_right;
|
||||
for (ptrdiff_t i = 0; i < t_result.size(); i++) {
|
||||
assert(!(numext::isnan)(t_result.data()[i]));
|
||||
if (fabsf(t_result.data()[i] - m_result.data()[i]) >= 1e-4f) {
|
||||
std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
|
||||
std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
|
||||
assert(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template<int DataLayout>
|
||||
template <int DataLayout>
|
||||
void test_multithread_contraction_agrees_with_singlethread() {
|
||||
int contract_size = internal::random<int>(1, 5000);
|
||||
|
||||
Tensor<float, 3, DataLayout> left(internal::random<int>(1, 80),
|
||||
contract_size,
|
||||
internal::random<int>(1, 100));
|
||||
Tensor<float, 3, DataLayout> left(internal::random<int>(1, 80), contract_size, internal::random<int>(1, 100));
|
||||
|
||||
Tensor<float, 4, DataLayout> right(internal::random<int>(1, 25),
|
||||
internal::random<int>(1, 37),
|
||||
contract_size,
|
||||
Tensor<float, 4, DataLayout> right(internal::random<int>(1, 25), internal::random<int>(1, 37), contract_size,
|
||||
internal::random<int>(1, 51));
|
||||
|
||||
left.setRandom();
|
||||
@@ -278,10 +268,9 @@ void test_multithread_contraction_agrees_with_singlethread() {
|
||||
// Apply Sqrt to all output elements.
|
||||
struct SqrtOutputKernel {
|
||||
template <typename Index, typename Scalar>
|
||||
EIGEN_ALWAYS_INLINE void operator()(
|
||||
const internal::blas_data_mapper<Scalar, Index, ColMajor>& output_mapper,
|
||||
const TensorContractionParams&, Index, Index, Index num_rows,
|
||||
Index num_cols) const {
|
||||
EIGEN_ALWAYS_INLINE void operator()(const internal::blas_data_mapper<Scalar, Index, ColMajor>& output_mapper,
|
||||
const TensorContractionParams&, Index, Index, Index num_rows,
|
||||
Index num_cols) const {
|
||||
for (int i = 0; i < num_rows; ++i) {
|
||||
for (int j = 0; j < num_cols; ++j) {
|
||||
output_mapper(i, j) = std::sqrt(output_mapper(i, j));
|
||||
@@ -330,18 +319,14 @@ static void test_multithread_contraction_with_output_kernel() {
|
||||
}
|
||||
}
|
||||
|
||||
template<int DataLayout>
|
||||
void test_async_multithread_contraction_agrees_with_singlethread()
|
||||
{
|
||||
template <int DataLayout>
|
||||
void test_async_multithread_contraction_agrees_with_singlethread() {
|
||||
int contract_size = internal::random<int>(100, 500);
|
||||
|
||||
Tensor<float, 3, DataLayout> left(internal::random<int>(10, 40),
|
||||
contract_size,
|
||||
internal::random<int>(10, 40));
|
||||
Tensor<float, 3, DataLayout> left(internal::random<int>(10, 40), contract_size, internal::random<int>(10, 40));
|
||||
|
||||
Tensor<float, 4, DataLayout> right(
|
||||
internal::random<int>(1, 20), internal::random<int>(1, 20), contract_size,
|
||||
internal::random<int>(1, 20));
|
||||
Tensor<float, 4, DataLayout> right(internal::random<int>(1, 20), internal::random<int>(1, 20), contract_size,
|
||||
internal::random<int>(1, 20));
|
||||
|
||||
left.setRandom();
|
||||
right.setRandom();
|
||||
@@ -362,8 +347,7 @@ void test_async_multithread_contraction_agrees_with_singlethread()
|
||||
Tensor<float, 5, DataLayout> tp_result(st_result.dimensions());
|
||||
|
||||
Eigen::Barrier barrier(1);
|
||||
tp_result.device(thread_pool_device, [&barrier]() { barrier.Notify(); }) =
|
||||
left.contract(right, dims);
|
||||
tp_result.device(thread_pool_device, [&barrier]() { barrier.Notify(); }) = left.contract(right, dims);
|
||||
barrier.Wait();
|
||||
|
||||
VERIFY(dimensions_match(st_result.dimensions(), tp_result.dimensions()));
|
||||
@@ -378,8 +362,7 @@ void test_async_multithread_contraction_agrees_with_singlethread()
|
||||
|
||||
// We are triggering 'evalShardedByInnerDim' optimization.
|
||||
template <int DataLayout>
|
||||
static void test_sharded_by_inner_dim_contraction()
|
||||
{
|
||||
static void test_sharded_by_inner_dim_contraction() {
|
||||
typedef Tensor<float, 1>::DimensionPair DimPair;
|
||||
|
||||
const int num_threads = internal::random<int>(4, 16);
|
||||
@@ -418,8 +401,7 @@ static void test_sharded_by_inner_dim_contraction()
|
||||
|
||||
// We are triggering 'evalShardedByInnerDim' optimization with output kernel.
|
||||
template <int DataLayout>
|
||||
static void test_sharded_by_inner_dim_contraction_with_output_kernel()
|
||||
{
|
||||
static void test_sharded_by_inner_dim_contraction_with_output_kernel() {
|
||||
typedef Tensor<float, 1>::DimensionPair DimPair;
|
||||
|
||||
const int num_threads = internal::random<int>(4, 16);
|
||||
@@ -458,8 +440,7 @@ static void test_sharded_by_inner_dim_contraction_with_output_kernel()
|
||||
|
||||
// We are triggering 'evalShardedByInnerDim' optimization.
|
||||
template <int DataLayout>
|
||||
static void test_async_sharded_by_inner_dim_contraction()
|
||||
{
|
||||
static void test_async_sharded_by_inner_dim_contraction() {
|
||||
typedef Tensor<float, 1>::DimensionPair DimPair;
|
||||
|
||||
const int num_threads = internal::random<int>(4, 16);
|
||||
@@ -489,8 +470,7 @@ static void test_async_sharded_by_inner_dim_contraction()
|
||||
|
||||
// compute results by separate methods
|
||||
Eigen::Barrier barrier(1);
|
||||
t_result.device(device, [&barrier]() { barrier.Notify(); }) =
|
||||
t_left.contract(t_right, dims);
|
||||
t_result.device(device, [&barrier]() { barrier.Notify(); }) = t_left.contract(t_right, dims);
|
||||
barrier.Wait();
|
||||
|
||||
m_result = m_left * m_right;
|
||||
@@ -502,8 +482,7 @@ static void test_async_sharded_by_inner_dim_contraction()
|
||||
|
||||
// We are triggering 'evalShardedByInnerDim' optimization with output kernel.
|
||||
template <int DataLayout>
|
||||
static void test_async_sharded_by_inner_dim_contraction_with_output_kernel()
|
||||
{
|
||||
static void test_async_sharded_by_inner_dim_contraction_with_output_kernel() {
|
||||
typedef Tensor<float, 1>::DimensionPair DimPair;
|
||||
|
||||
const int num_threads = internal::random<int>(4, 16);
|
||||
@@ -533,8 +512,7 @@ static void test_async_sharded_by_inner_dim_contraction_with_output_kernel()
|
||||
|
||||
// compute results by separate methods
|
||||
Eigen::Barrier barrier(1);
|
||||
t_result.device(device, [&barrier]() { barrier.Notify(); }) =
|
||||
t_left.contract(t_right, dims, SqrtOutputKernel());
|
||||
t_result.device(device, [&barrier]() { barrier.Notify(); }) = t_left.contract(t_right, dims, SqrtOutputKernel());
|
||||
barrier.Wait();
|
||||
m_result = m_left * m_right;
|
||||
|
||||
@@ -543,15 +521,13 @@ static void test_async_sharded_by_inner_dim_contraction_with_output_kernel()
|
||||
}
|
||||
}
|
||||
|
||||
template<int DataLayout>
|
||||
template <int DataLayout>
|
||||
void test_full_contraction() {
|
||||
int contract_size1 = internal::random<int>(1, 500);
|
||||
int contract_size2 = internal::random<int>(1, 500);
|
||||
|
||||
Tensor<float, 2, DataLayout> left(contract_size1,
|
||||
contract_size2);
|
||||
Tensor<float, 2, DataLayout> right(contract_size1,
|
||||
contract_size2);
|
||||
Tensor<float, 2, DataLayout> left(contract_size1, contract_size2);
|
||||
Tensor<float, 2, DataLayout> right(contract_size1, contract_size2);
|
||||
left.setRandom();
|
||||
right.setRandom();
|
||||
|
||||
@@ -579,7 +555,7 @@ void test_full_contraction() {
|
||||
}
|
||||
}
|
||||
|
||||
template<int DataLayout>
|
||||
template <int DataLayout>
|
||||
void test_multithreaded_reductions() {
|
||||
const int num_threads = internal::random<int>(3, 11);
|
||||
ThreadPool thread_pool(num_threads);
|
||||
@@ -601,9 +577,7 @@ void test_multithreaded_reductions() {
|
||||
VERIFY_IS_APPROX(full_redux(), full_redux_tp());
|
||||
}
|
||||
|
||||
|
||||
void test_memcpy() {
|
||||
|
||||
for (int i = 0; i < 5; ++i) {
|
||||
const int num_threads = internal::random<int>(3, 11);
|
||||
Eigen::ThreadPool tp(num_threads);
|
||||
@@ -613,49 +587,45 @@ void test_memcpy() {
|
||||
Tensor<float, 1> t1(size);
|
||||
t1.setRandom();
|
||||
std::vector<float> result(size);
|
||||
thread_pool_device.memcpy(&result[0], t1.data(), size*sizeof(float));
|
||||
thread_pool_device.memcpy(&result[0], t1.data(), size * sizeof(float));
|
||||
for (int j = 0; j < size; j++) {
|
||||
VERIFY_IS_EQUAL(t1(j), result[j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void test_multithread_random()
|
||||
{
|
||||
void test_multithread_random() {
|
||||
Eigen::ThreadPool tp(2);
|
||||
Eigen::ThreadPoolDevice device(&tp, 2);
|
||||
Tensor<float, 1> t(1 << 20);
|
||||
t.device(device) = t.random<Eigen::internal::NormalRandomGenerator<float>>();
|
||||
}
|
||||
|
||||
template<int DataLayout>
|
||||
void test_multithread_shuffle(Allocator* allocator)
|
||||
{
|
||||
Tensor<float, 4, DataLayout> tensor(17,5,7,11);
|
||||
template <int DataLayout>
|
||||
void test_multithread_shuffle(Allocator* allocator) {
|
||||
Tensor<float, 4, DataLayout> tensor(17, 5, 7, 11);
|
||||
tensor.setRandom();
|
||||
|
||||
const int num_threads = internal::random<int>(2, 11);
|
||||
ThreadPool threads(num_threads);
|
||||
Eigen::ThreadPoolDevice device(&threads, num_threads, allocator);
|
||||
|
||||
Tensor<float, 4, DataLayout> shuffle(7,5,11,17);
|
||||
array<ptrdiff_t, 4> shuffles = {{2,1,3,0}};
|
||||
Tensor<float, 4, DataLayout> shuffle(7, 5, 11, 17);
|
||||
array<ptrdiff_t, 4> shuffles = {{2, 1, 3, 0}};
|
||||
shuffle.device(device) = tensor.shuffle(shuffles);
|
||||
|
||||
for (int i = 0; i < 17; ++i) {
|
||||
for (int j = 0; j < 5; ++j) {
|
||||
for (int k = 0; k < 7; ++k) {
|
||||
for (int l = 0; l < 11; ++l) {
|
||||
VERIFY_IS_EQUAL(tensor(i,j,k,l), shuffle(k,j,l,i));
|
||||
VERIFY_IS_EQUAL(tensor(i, j, k, l), shuffle(k, j, l, i));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void test_threadpool_allocate(TestAllocator* allocator)
|
||||
{
|
||||
void test_threadpool_allocate(TestAllocator* allocator) {
|
||||
const int num_threads = internal::random<int>(2, 11);
|
||||
const int num_allocs = internal::random<int>(2, 11);
|
||||
ThreadPool threads(num_threads);
|
||||
@@ -670,8 +640,7 @@ void test_threadpool_allocate(TestAllocator* allocator)
|
||||
VERIFY_IS_EQUAL(allocator->dealloc_count(), num_allocs);
|
||||
}
|
||||
|
||||
EIGEN_DECLARE_TEST(cxx11_tensor_thread_pool)
|
||||
{
|
||||
EIGEN_DECLARE_TEST(cxx11_tensor_thread_pool) {
|
||||
CALL_SUBTEST_1(test_multithread_elementwise());
|
||||
CALL_SUBTEST_1(test_async_multithread_elementwise());
|
||||
CALL_SUBTEST_1(test_multithread_compound_assignment());
|
||||
|
||||
Reference in New Issue
Block a user