From 4fad19108ff846fc8655e0ea83b04ded044e3c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Sun, 31 Jan 2021 20:24:58 +0100
Subject: [PATCH] Fix of legacy CSR matrix unit tests.
---
.../Matrices/Legacy/Legacy_SparseMatrixTest_CSRAdaptive.h | 8 +++++++-
.../Matrices/Legacy/Legacy_SparseMatrixTest_CSRLight.h | 8 +++++++-
.../Legacy_SparseMatrixTest_CSRLightWithoutAtomic.h | 8 +++++++-
.../Legacy/Legacy_SparseMatrixTest_CSRMultiVector.h | 8 +++++++-
.../Matrices/Legacy/Legacy_SparseMatrixTest_CSRVector.h | 8 +++++++-
5 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRAdaptive.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRAdaptive.h
index 5a245390d5..bea051e725 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRAdaptive.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRAdaptive.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated
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
- 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< double, TNL::Devices::Cuda, int, Legacy::CSRAdaptive >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRAdaptive >,
diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLight.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLight.h
index 9c495da01e..db55ae72e7 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLight.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLight.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated
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
- 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< double, TNL::Devices::Cuda, int, Legacy::CSRLight >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRLight >,
diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLightWithoutAtomic.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLightWithoutAtomic.h
index 553bda6643..f8ad09c49c 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLightWithoutAtomic.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLightWithoutAtomic.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated
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
- 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< double, TNL::Devices::Cuda, int, Legacy::CSRLightWithoutAtomic >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRLightWithoutAtomic >,
diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRMultiVector.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRMultiVector.h
index fbab0318c6..e96aed736a 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRMultiVector.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRMultiVector.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated
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
- 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< double, TNL::Devices::Cuda, int, Legacy::CSRMultiVector >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRMultiVector >,
diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRVector.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRVector.h
index 34329467aa..461053df06 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRVector.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRVector.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
// types for which MatrixTest is instantiated
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
- 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< double, TNL::Devices::Cuda, int, Legacy::CSRVector >,
Legacy::CSR< int, TNL::Devices::Cuda, long, Legacy::CSRVector >,
--
GitLab