Skip to content
Snippets Groups Projects
Commit 4fad1910 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fix of legacy CSR matrix unit tests.

parent 1ab7d46a
No related branches found
No related tags found
1 merge request!89To/matrices adaptive csr
...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats; ...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated // types for which MatrixTest is instantiated
using CSRMatrixTypes = ::testing::Types using CSRMatrixTypes = ::testing::Types
< <
Legacy::CSR< int, TNL::Devices::Host, int, Legacy::CSRAdaptive >,
Legacy::CSR< float, TNL::Devices::Host, int, Legacy::CSRAdaptive >,
Legacy::CSR< double, TNL::Devices::Host, int, Legacy::CSRAdaptive >,
Legacy::CSR< int, TNL::Devices::Host, long, Legacy::CSRAdaptive >,
Legacy::CSR< float, TNL::Devices::Host, long, Legacy::CSRAdaptive >,
Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRAdaptive >
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRAdaptive >, ,Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRAdaptive >,
Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRAdaptive >, Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRAdaptive >,
Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRAdaptive >, Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRAdaptive >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRAdaptive >, Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRAdaptive >,
......
...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats; ...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated // types for which MatrixTest is instantiated
using CSRMatrixTypes = ::testing::Types using CSRMatrixTypes = ::testing::Types
< <
Legacy::CSR< int, TNL::Devices::Host, int, Legacy::CSRLight >,
Legacy::CSR< float, TNL::Devices::Host, int, Legacy::CSRLight >,
Legacy::CSR< double, TNL::Devices::Host, int, Legacy::CSRLight >,
Legacy::CSR< int, TNL::Devices::Host, long, Legacy::CSRLight >,
Legacy::CSR< float, TNL::Devices::Host, long, Legacy::CSRLight >,
Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRLight >
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRLight >, ,Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRLight >,
Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRLight >, Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRLight >,
Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRLight >, Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRLight >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRLight >, Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRLight >,
......
...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats; ...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated // types for which MatrixTest is instantiated
using CSRMatrixTypes = ::testing::Types using CSRMatrixTypes = ::testing::Types
< <
Legacy::CSR< int, TNL::Devices::Host, int, Legacy::CSRLightWithoutAtomic >,
Legacy::CSR< float, TNL::Devices::Host, int, Legacy::CSRLightWithoutAtomic >,
Legacy::CSR< double, TNL::Devices::Host, int, Legacy::CSRLightWithoutAtomic >,
Legacy::CSR< int, TNL::Devices::Host, long, Legacy::CSRLightWithoutAtomic >,
Legacy::CSR< float, TNL::Devices::Host, long, Legacy::CSRLightWithoutAtomic >,
Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRLightWithoutAtomic >
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRLightWithoutAtomic >, ,Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRLightWithoutAtomic >,
Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRLightWithoutAtomic >, Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRLightWithoutAtomic >,
Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRLightWithoutAtomic >, Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRLightWithoutAtomic >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRLightWithoutAtomic >, Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRLightWithoutAtomic >,
......
...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats; ...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated // types for which MatrixTest is instantiated
using CSRMatrixTypes = ::testing::Types using CSRMatrixTypes = ::testing::Types
< <
Legacy::CSR< int, TNL::Devices::Host, int, Legacy::CSRMultiVector >,
Legacy::CSR< float, TNL::Devices::Host, int, Legacy::CSRMultiVector >,
Legacy::CSR< double, TNL::Devices::Host, int, Legacy::CSRMultiVector >,
Legacy::CSR< int, TNL::Devices::Host, long, Legacy::CSRMultiVector >,
Legacy::CSR< float, TNL::Devices::Host, long, Legacy::CSRMultiVector >,
Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRMultiVector >
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRMultiVector >, ,Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRMultiVector >,
Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRMultiVector >, Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRMultiVector >,
Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRMultiVector >, Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRMultiVector >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRMultiVector >, Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRMultiVector >,
......
...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats; ...@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated // types for which MatrixTest is instantiated
using CSRMatrixTypes = ::testing::Types using CSRMatrixTypes = ::testing::Types
< <
Legacy::CSR< int, TNL::Devices::Host, int, Legacy::CSRVector >,
Legacy::CSR< float, TNL::Devices::Host, int, Legacy::CSRVector >,
Legacy::CSR< double, TNL::Devices::Host, int, Legacy::CSRVector >,
Legacy::CSR< int, TNL::Devices::Host, long, Legacy::CSRVector >,
Legacy::CSR< float, TNL::Devices::Host, long, Legacy::CSRVector >,
Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRVector >
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRVector >, ,Legacy::CSR< int, TNL::Devices::Cuda, int, Legacy::CSRVector >,
Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRVector >, Legacy::CSR< float, TNL::Devices::Cuda, int, Legacy::CSRVector >,
Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRVector >, Legacy::CSR< double, TNL::Devices::Cuda, int, Legacy::CSRVector >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRVector >, Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRVector >,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment